Oleksii Kriuchykhin
a99599efea
Merge branch 'features/new_permissions' into develop
2021-10-29 15:16:30 +02:00
artoscinote
f68d724202
Rework experiment permissions [SCI-6054] ( #3538 )
...
* Rework experiment permissions [SCI-6054]
2021-09-30 11:32:11 +02:00
aignatov-bio
c248e87adb
Add permissions checks for results controllers [SCI-6071] ( #3555 )
...
* Add permission tests for results controller [SCI-6071]
* Update results controllers with new permissions [SCI-6071]
* Small fixes to results controllers [SCI-6071]
* Update result permission helpers [SCI-6071]
2021-09-24 13:11:41 +02:00
Oleksii Kriuchykhin
607b7f76cf
Update/implement permission checks in the my_modules_controller and my_modules_status_flow_controller [SCI-6061][SCI-6063]
2021-09-24 10:23:28 +02:00
Martin Artnik
e8f57e9e99
Reworked MyModule permissions [SCI-6056]
2021-09-14 11:08:35 +02:00
Oleksii Kriuchykhin
c26dcf4b23
Replace empty? with blank? [SCI-5579]
2021-07-23 11:56:28 +02:00
aignatov-bio
60ce51149d
Add CRUD to comments
2020-11-20 20:25:28 +01:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] ( #1808 )
...
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
2019-06-04 14:40:21 +02:00
Mojca Lorber
7757096693
Results activities refactoring
2019-03-19 15:33:57 +01:00
Oleksii Kriuchykhin
d67abfda2c
Additional fixies for smart annotations [SCI-2880]
2018-11-26 15:17:18 +01:00
Alex Kriuchykhin
a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
...
Refactor result and step comments [SCI-2830]
2018-11-20 00:13:15 +01:00
Oleksii Kriuchykhin
fb309a12b9
Refactor result and step comments initialization [SCI-2830]
2018-11-13 16:57:42 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
Matej Zrimšek
d571ab2ed8
Fixed comments permissions for experiment level.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
8ef6c8f91f
Refactored remaining experiment level permissions (and everything below it).
2018-02-14 14:39:07 +01:00
Mojca Lorber
0bae4657f6
add experiment level to user smart annotation notification
2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715
add experiment to activities
2017-04-20 13:16:11 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
Oleksii Kriuchykhin
456934464a
Remove unneeded validation calls [SCI-1090]
2017-03-09 17:20:27 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +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
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
f567d0307e
Fix includes [SCI-102]
2017-01-12 17:02:01 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
Luka Murn
b931b20f02
Fix 2 bugs with comments editing
...
Closes SCI-820.
2016-12-23 20:41:23 +01:00
Luka Murn
f5e286b1f6
Remove unused code for some more comments
2016-11-22 14:52:43 +01:00
Luka Murn
008b31df0c
Finish removing new comment forms
2016-11-19 16:54:55 +01:00
Oleksii Kriuchykhin
5be7904f5a
Fix hound warnings [SCI-557]
2016-10-21 09:37:24 +02:00
Oleksii Kriuchykhin
0c1ff06f21
Fixes issue with new comments and date separator SCI-557
2016-10-20 22:33:15 +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
Matej Zrimšek
a3dfb59558
Added remaining constants.
2016-10-17 11:30:05 +02:00
zmagod
dad0d3868b
fixing hound
2016-09-27 17:31:37 +02:00
zmagod
06b1992e94
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
2016-09-21 19:20:55 +02:00
zmagod
42bbc47f5f
first working version
2016-09-20 17:06:07 +02:00
Pavel Maslov
15ea8fc0dc
Bug fixed: comments in results have no error message if the text exceeds 1000 characters.
2016-09-13 12:01:56 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Luka Murn
a480c8d403
Styling fixes
2016-08-25 13:59:50 +02:00
Luka Murn
b0d7b9dc75
Generate activities when editing/deleting comments
2016-08-25 13:51:31 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
Luka Murn
055298fee8
Initial commit.
2016-02-12 16:52:43 +01:00
