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

58 commits

Author SHA1 Message Date
Matej Zrimšek 0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek 854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Matej Zrimšek 13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
Oleksii Kriuchykhin c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
Oleksii Kriuchykhin 6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Mojca Lorber f8f6a5f63a fix bug edit canvas not working and fix positioning of cloned task/workflow 2017-05-04 10:54:50 +02:00
Matej Zrimšek a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02: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
okriuchykhin 02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
Oleksii Kriuchykhin 75031e17b9 Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin 0350f2f792 Add html escaping to name filelds in the views [SCI-102] 2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin 0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
Matej Zrimšek 4b0f47675a Fixes experiment button not being clicable in project overview page. [SCI-849] 2017-01-05 14:42:52 +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 a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Oleksii Kriuchykhin b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin a3b00d0ff8 Fixes issue with zoom buttons on canvas [fixes SCI-451] 2016-09-16 16:27:54 +02:00
Zmago Devetak d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +02:00
Zmago Devetak 1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Mojca Lorber 302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
zmagod d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
zmagod b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod 9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak 9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
Mojca Lorber 47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
zmagod 667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
zmagod d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
mlorb c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
mlorb 0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Mojca Lorber 2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
Mojca Lorber 0558d49e26 buttons update on experiment overview 2016-08-24 13:50:25 +02:00
Mojca Lorber f554dc6018 add move experiment instructions 2016-08-24 11:36:50 +02:00
Jure Grabnar 3e5e9aed22 Fix 404 on move experiment 
[fixes SCI-378]
 2016-08-24 11:09:03 +02:00
zmagod cc2ed32ccb fixes canvas bug when no actions are available for the viewer 2016-08-17 13:29:22 +02:00
Jure Grabnar 275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +02:00
Jure Grabnar e55c66b3d0 Add query for moveable projects 2016-08-16 08:47:04 +02:00
Jure Grabnar c387439fb2 Fix projects query for experiments 
Remove unneeded word in view
 2016-08-12 11:36:52 +02:00
Jure Grabnar d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar 555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
Jure Grabnar 9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar 5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +02:00
Jure Grabnar a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
Jure Grabnar 2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
zmagod 04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00