scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
1481 commits 69 branches 179 tags 165 MiB
Commit graph

51 commits

Author SHA1 Message Date
zmagod 61b260fb8a fixes bug in protocol management 2017-01-27 11:01:44 +01:00
zmagod 0a6bb958a5 renamed organization to teams in migrations/rake tasks 2017-01-27 10:39:57 +01:00
zmagod c7b03926c0 rename migrations part 1 2017-01-26 16:30:31 +01:00
zmagod 883a6ea544 rename organizations in test/ 2017-01-25 13:56:43 +01:00
zmagod 9624a17298 rename database tables, columns 2017-01-24 16:07:22 +01:00
Luka Murn 53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
Mojca Lorber 6653f0d4c1 small fixes 2017-01-19 16:42:14 +01:00
Mojca Lorber b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +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
Luka Murn 488613afcc Add index to users' full name attribute 2017-01-05 16:26:49 +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 de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Mojca Lorber 7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
Mojca Lorber 195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +01:00
Mojca Lorber 39b6fa66fe add SamplesTable for new users 2016-12-07 14:14:32 +01:00
Mojca Lorber 332b6c58da fix hound 2016-12-05 11:44:47 +01:00
Mojca Lorber 01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +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 5035ec338b Code style fix 2016-11-28 13:51:28 +01:00
Luka Murn a7f8aad62c Fix Hound errors 2016-11-25 16:53:38 +01:00
Luka Murn c1c73ad804 Update schema.rb 2016-11-25 16:51:39 +01:00
Luka Murn 7658ae264a Add uniqueness to sample_type & sample_group name 
Closes SCI-720.
 2016-11-25 16:15:05 +01:00
Luka Murn d255e12f90 Migration hotfix 2016-10-18 12:52:14 +02:00
mz3944 47707779c0 Merge pull request #221 from mz3944/mz_migration_constant_qfix 
Fixed missing namespace in constant in migration.
 2016-10-18 11:42:08 +02:00
Matej Zrimšek 796e7da133 Fixed missing namespace in constant in migration. 2016-10-18 11:36:33 +02:00
zmagod 557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod e85ed788f2 fixed user_generator 2016-10-17 15:10:26 +02:00
zmagod e092679ef6 fixes schema 2016-10-17 15:10:26 +02:00
zmagod d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Matej Zrimšek 0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Luka Murn c37885692d Add DB index onto checked field of user_notifications 2016-10-05 16:21:13 +02:00
zmagod 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
zmagod 485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Luka Murn bd414c8b4f Update a problematic migration 2016-08-31 11:46:27 +02:00
zmagod 7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
Jure Grabnar 9865ad80f9 Fix migration for adding attachment to experiment 2016-08-10 08:53:59 +02:00
scibb 5dd5f1cc28 another tab replaced with 2-spaces... 2016-08-10 08:49:18 +02:00
scibb 6b0b2b0df7 tabs replaced with 2-spaces 2016-08-10 08:36:58 +02:00
scibb a6d39762db the migration to update canvas coordinates 2016-08-09 10:04:10 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar 8b2b134614 Migrate old reports to new experiment level reports 2016-08-04 13:19:46 +02:00
Jure Grabnar 964b51f84a Add experiment reports element 2016-08-03 12:52:52 +02:00
Luka Murn 3187843d14 Change updated_by -> last_modified_by 2016-07-25 14:47:13 +02:00
Luka Murn 785fb2cba1 Initial migration & changes in ActiveRecords 2016-07-22 10:43:55 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00