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

25 commits

Author SHA1 Message Date
mlorb f791234ec7 changes on Zmago's request 2018-05-28 11:36:37 +02:00
mlorb 099cc29abb fix tests 2018-05-28 09:29:46 +02:00
mlorb f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
zmagod c026044322 fixes flash message [fixes SCI-2142] 2018-04-25 07:32:49 +02:00
zmagod 233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
zmagod cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
zmagod 311b2dac5a Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142 2018-03-16 16:21:47 +01:00
mlorb 9fd845c478 fix failing cucumber tests 2018-03-14 17:55:04 +01:00
mlorb 9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod 51af74071c remove comments and activity modal 2018-03-13 10:52:53 +01:00
zmagod b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
Luka Murn 3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
zmagod 72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +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
zmagod a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
Luka Murn 7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +01:00
Oleksii Kriuchykhin cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Mojca Lorber beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
zmagod 01b27e9e6d added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
zmagod 32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00