scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
13638 commits 70 branches 179 tags 165 MiB
Commit graph

317 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 6c914d2a73 Upgrade Rails to version 5.1.6, Sprockets to 3.7.2 2018-06-20 10:46:41 +02:00
zmagod b13e39a0d9 adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448] 2018-05-24 14:39:25 +02:00
Oleksii Kriuchykhin 39d594b0da Disable some validations in repository import to improve speed [SCI-2404] 2018-05-15 11:14:43 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
Luka Murn 159078170a Update Paperclip library to 5.3 version 2018-04-05 13:23:34 +02:00
Luka Murn dd961c408f Remove remotipart from Gemfile.lock 
This was forgotten when fixing SCI-2270.
 2018-04-04 15:56:08 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin 8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +02:00
okriuchykhin 145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
Oleksii Kriuchykhin 83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
zmagod 41db1a9ab3 update bootstrap to v 3.3.7 2018-03-12 08:57:02 +01:00
mlorb d4e62c3c13 add Gemfile.lock 2018-03-01 18:03:13 +01:00
Oleksii Kriuchykhin 16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +01:00
zmagod c6f44e799c fixes JWT dependency issues 2018-01-23 16:25:59 +01:00
zmagod 88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Matej Zrimšek 9ef04a6a2b Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version. 2018-01-16 17:01:44 +01:00
Oleksii Kriuchykhin b98241ef61 Fix bootstrap select dropdown [SCI-1895][SCI-1896] 2017-12-22 09:52:00 +01:00
Luka Murn 704bd31fef Set wicked_pdf version to ~> 1.0.6 2017-12-20 10:53:53 +01:00
Oleksii Kriuchykhin 1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00
Oleksii Kriuchykhin 99de5550b0 Fix gem dependencies [SCI-1891] 2017-12-19 14:18:29 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
mlorb f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
Oleksii Kriuchykhin 9408b29768 Update Rails version to 4.2.10 [SCI-1845] 2017-11-29 16:49:50 +01:00
zmagod 331823c2fb upgrade capybara_email gem 2017-11-23 16:27:49 +01:00
Luka Murn c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795 
Setup main architecture for permissions refactoring [SCI-1795]
 2017-11-23 12:32:49 +01:00
Luka Murn 28cadb987e Update revision of canaid Gem 2017-11-20 18:16:05 +01:00
Luka Murn ccef5571f1 Add dependency to Canaid, the permission helper library 2017-11-16 15:49:13 +01:00
zmagod ed50466acd fixes dependencies issue [fix SCI-1817] 2017-11-16 09:49:42 +01:00
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
zmagod 327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +01:00
zmagod 9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
zmagod b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
mlorb 1c3c822796 change drivers for browser 2017-11-06 14:26:01 +01:00
zmagod e0323a0a46 fixes failing tests 2017-10-27 09:35:39 +02:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod 4de335d189 add whacamole configuration [fixes SCI-1683] 2017-10-25 09:47:26 +02:00
Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-10-23 10:59:10 +02:00
Luka Murn e740e586e8 Additional fixes required by latest merge from master (nr. 2) 2017-10-23 10:43:32 +02:00
Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
okriuchykhin 8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
zmagod dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
mlorb c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
Oleksii Kriuchykhin faaa016267 Update AWS SDK v2 [SCI-1623] 2017-09-26 13:41:53 +02:00
mlorb 48c8922604 adds invite users modal 2017-09-21 10:45:35 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
zmagod ee054f91b8 adds bullet gem [fixes SCI-1578] 2017-08-30 09:29:45 +02:00
Luka Murn b6eb46471a Merge pull request #753 from Ducz0r/lm-remove-some-code 
Remove some code we're no longer maintaining
 2017-08-22 14:04:04 +02:00
Luka Murn 90188c89c9 Update delayed_paperclip library 
Closes SCI-1376.
 2017-08-22 08:34:58 +02:00
zmagod c5e32c4ea0 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch 2017-08-21 09:52:14 +02:00
Luka Murn 13eae287bb Revert "Add core API using JWT authentication and tests for it [SCI-1507]" 2017-08-07 11:54:45 +02:00
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin e958410261 Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
zmagod 6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
Luka Murn 03a7440136 Remove SkyLight stuff (we're not using it any more) 2017-07-27 14:26:44 +02:00
zmagod 416ab8eee3 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400 2017-07-26 16:20:09 +02:00
Oleksii Kriuchykhin 6c33b46f6a Improve import of repository records plus tsv file import fixes [SCI-1487] 2017-07-20 11:44:10 +02:00
Oleksii Kriuchykhin ece27b2652 Fix importing files with empty header cells and error messages improvements [SCI-1484] 2017-07-18 14:54:35 +02:00
Oleksii Kriuchykhin b8e93ee883 Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00
zmagod 6636190442 removes unneeded gems, adds validation test to models 2017-07-06 17:37:29 +02:00
zmagod 234ca71f0a removes unneded gems, fixes hound 2017-07-06 09:45:59 +02:00
zmagod 750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
zmagod 71aa05bb0e refactor 2017-06-27 14:58:49 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod 1b21f073d7 Rails 5.1.1 2017-06-23 10:34:46 +02:00
zmagod 909a114418 Rails 5.0.0.rc2 2017-06-23 10:08:54 +02:00
zmagod 75507107fd migrate to 4.2.9 2017-06-23 08:50:12 +02:00
rekonder ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +02:00
zmagod 10db322307 fixes input sanitize method [fixes SCI-1248] 2017-05-10 14:57:11 +02:00
Zmago Devetak 4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod d6f303581f refactor 2017-05-08 12:56:33 +02:00
Matej Zrimšek 79b0d9c120 Updated rubocop and scss-lint gems. 2017-04-28 14:05:00 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
Zmago Devetak 9c31239318 Merge pull request #552 from biosistemika/release-1.9.0 
Release 1.9.1
 2017-04-12 13:08:37 +02:00
Luka Murn e656101c47 Revert Wicked PDF Gem version 2017-04-12 09:27:31 +02:00
zmagod 9a17648eee Adds new relic in sciNote [fixes SCI-1183] 2017-04-07 11:23:45 +02:00
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
Luka Murn 49c01b0a3c Update Gemfile.lock 2017-01-26 16:35:53 +01:00
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00
zmagod a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
Zmago Devetak c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
zmagod 62e4d32221 updated gemfile 2016-12-16 10:45:14 +01:00
zmagod ac52e643be cleanup direct upload 2016-12-08 11:26:13 +01:00
Zmago Devetak 91f29745c4 Merge pull request #314 from ZmagoD/zd_SCI_643 
adds autolink
 2016-12-05 10:47:23 +01:00
Matej Zrimšek 46465060d0 Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689] 2016-11-30 16:56:56 +01:00
Luka Murn de7c0ad641 Remove commit reference to quill-rails in Gemfile 2016-11-24 09:19:43 +01:00
zmagod fafecce264 adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 14:18:50 +01:00
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Luka Murn fa6d8d3020 Save first time tutorial Activity-s without callbacks 
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
 2016-11-14 15:55:44 +01:00
zmagod df43614f00 swithced quill gem to master branch 2016-11-10 14:15:39 +01:00
zmagod 7c7106d8ff included updated guill-rails version [fixes SCI-639] 2016-11-10 14:04:22 +01:00
Mojca Lorber c44e25d72e add gemfile.lock 2016-11-09 17:08:50 +01:00
Luka Murn 02d3e03f75 Bugfix for notification emails 
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
 2016-10-13 12:12:28 +02:00
zmagod 32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Jure Grabnar 1bdbc00e8c Update Gemfile.lock 2016-09-28 11:56:19 +02:00
Jure Grabnar b51f2a3027 Add basic WOPI proof checking 
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
 2016-09-28 09:33:44 +02:00
Jure Grabnar 0e9756ad94 Fix bad step view rebase 2016-09-28 09:33:44 +02:00
Jure Grabnar 9a8d49d513 Update Gemfile.lock 2016-09-28 09:33:44 +02:00
Nejc Bernot b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
zmagod ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
Jure Grabnar c801e7b7e3 Add old Gemfile.lock with graphviz 2016-08-10 15:43:15 +02:00
Jure Grabnar ef608d18e7 Add missing Gemfile.lock 2016-08-10 08:30:58 +02:00
Jure Grabnar b402d67f24 Add rubocop gem to development env 2016-08-03 12:52:51 +02:00
zmagod 0955d1c66a 1. Fixed fixtures 
2. Added shoulda matcher gem
3. Added Experiment test suite
4. Fixed failing tests
 2016-07-27 10:49:13 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00