Jure Grabnar
f00f4d39af
Refactor step activities using position_plus_one
...
Closes SCI-3273
2019-04-03 13:10:45 +02:00
Mojca Lorber
3c69225d6b
Change activities for task protocols
2019-03-29 15:09:20 +01:00
Mojca Lorber
cd7a87348f
Protocol activities refactoring, without tests
2019-03-19 16:12:07 +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
61d1f5374d
Additionaly removed some unneeded code, related to the previous commit.
2018-03-04 15:24:43 +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
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
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
046b608018
add notification for my_module/project comments
2017-04-06 14:07:22 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +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
e0607f7891
Refactor step comments code
2016-11-22 15:01:48 +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
da86208441
styled step comments
2016-09-20 14:13:40 +02:00
zmagod
0ca65aeca5
fixed step comment sorting
2016-09-20 13:31:50 +02:00
Luka Murn
b0d7b9dc75
Generate activities when editing/deleting comments
2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435
Add edit&delete functionality to step comments
...
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
2016-08-25 13:51:31 +02:00
Jure Grabnar
52e6d7d300
Fix step comments
2016-08-10 15:44:33 +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
