zmagod
|
29a1073a50
|
refactor queries
|
2018-02-27 16:34:51 +01:00 |
|
zmagod
|
e3ca782996
|
add info modal for repository items [fixes SCI-2066]
|
2018-02-27 16:21:46 +01:00 |
|
mlorb
|
d2dcb765b4
|
fix bug with load older activities button not working
|
2018-02-16 15:42:10 +01:00 |
|
mlorb
|
9797712561
|
Merge pull request #997 from mlorb/ml-sci-2045
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
|
2018-02-15 14:51:40 +01:00 |
|
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
|
1182ce5da1
|
Fixed experiment level permission checks in the controllers.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
7938c2e036
|
Minor code style changes.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
c5b798017e
|
Minor Hound warning fixes.
|
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
|
d058c371d4
|
Readded project archive permission.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
e36ec69ca9
|
Project level permissions refactoring (mostly names).
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
93536afcd5
|
Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
13e9a2a132
|
Corrected some project level permissions; minor refactoring.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
a21343a819
|
Fixing and refactoring project permissions in controllers.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
279da20060
|
Fixed Hound warnings.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
d423700e84
|
Used permissions where they were missing.
|
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 |
|
mlorb
|
8d0ac93c80
|
add check to start work on next task notification if recent changes notification is switched off
|
2018-02-13 11:01:45 +01:00 |
|
Zmago Devetak
|
027297d46a
|
Merge pull request #985 from ZmagoD/zd_SCI_2008
fixes bug with assets upload on task result page,
|
2018-02-12 11:40:44 +01:00 |
|
okriuchykhin
|
e7fb1bc716
|
Merge pull request #967 from okriuchykhin/ok_SCI_1966
Merge gilson-iot-rails4 to master [SCI-1966]
|
2018-02-12 11:02:17 +01:00 |
|
Zmago Devetak
|
e400514020
|
Merge pull request #981 from ZmagoD/zd_SCI_2026
fixes bug with step table update [fixes SCI-2026]
|
2018-02-07 14:35:15 +01:00 |
|
Zanz2
|
ef0733b886
|
Merge pull request #988 from Zanz2/red_error_msg_sci1993
Accidentally deleted this off master, identical to the branch before [SCI-1993]
|
2018-02-07 13:08:45 +01:00 |
|
Zanz2
|
367eff6401
|
re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches
|
2018-02-07 11:17:53 +01:00 |
|
mlorb
|
e151c963e1
|
fix error on task activity
|
2018-02-06 16:34:16 +01:00 |
|
zmagod
|
2ad4eb3488
|
fix bug with checklists
|
2018-02-06 16:15:10 +01:00 |
|
zmagod
|
75cc9d11df
|
fix error on checklists
|
2018-02-06 16:06:15 +01:00 |
|
zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
Zanz2
|
83e9550feb
|
Merge pull request #966 from Zanz2/images_not_imported_SCI1807
Images not imported [SCI-1807]
|
2018-02-06 14:33:35 +01:00 |
|
Zanz2
|
dac59cf4d0
|
Refactored to PR, deleted unrelated things
|
2018-02-06 09:06:33 +01:00 |
|
zmagod
|
b48fa3f231
|
fixes bug with step table update [fixes SCI-2026]
|
2018-02-05 17:32:38 +01:00 |
|
zmagod
|
25dcfe66ae
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960
|
2018-02-01 16:04:05 +01:00 |
|
Zanz2
|
e8f6dc0d24
|
Merge pull request #962 from Zanz2/missing_error_SCI1993
A red error messagge is now displayed when not selecting protocol [SCI-1993]
|
2018-01-26 16:00:15 +01:00 |
|
Oleksii Kriuchykhin
|
7c14800570
|
Change base class for API controller [SCI-1966]
|
2018-01-26 13:34:38 +01:00 |
|
Zanz2
|
e041426a09
|
Merge pull request #964 from Zanz2/steps_order_SCI1816
Steps order fix [SCI-1816]
|
2018-01-26 11:32:28 +01:00 |
|
okriuchykhin
|
94f604ae17
|
Merge pull request #961 from okriuchykhin/ok_SCI_1994
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-26 11:14:59 +01:00 |
|
Zanz2
|
4ee51959eb
|
fixed hound
|
2018-01-26 09:56:59 +01:00 |
|
Zanz2
|
346f9feaef
|
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
|
2018-01-26 09:34:58 +01:00 |
|
Zanz2
|
24e772d7e5
|
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
|
2018-01-26 08:26:38 +01:00 |
|
Zanz2
|
fc541147c8
|
A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone
|
2018-01-25 15:54:38 +01:00 |
|
okriuchykhin
|
0b1f43c1c5
|
Merge pull request #954 from okriuchykhin/ok_SCI_1970
Add health check endpoint to API controller [SCI-1970]
|
2018-01-25 14:33:37 +01:00 |
|
Oleksii Kriuchykhin
|
7dd9121072
|
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-25 14:30:04 +01:00 |
|
mlorb
|
ab2955c9bb
|
Merge pull request #956 from mlorb/ml-sci-1491
Add notification for previous task has been completed [SCI-1491]
|
2018-01-25 11:35:19 +01:00 |
|
zmagod
|
9b836d04fa
|
fixes per @mlorb 's request
|
2018-01-24 13:21:53 +01:00 |
|
Zanz2
|
7fe1c20ebe
|
Finished the protocol reorder functions and implemented them
|
2018-01-24 09:31:43 +01:00 |
|
Mojca Lorber
|
ac8b1769be
|
add notification for previous task has been completed
|
2018-01-23 15:53:33 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
28be7c4fc4
|
Add health check endpoint to API controller [SCI-1970]
|
2018-01-22 16:52:48 +01:00 |
|
zmagod
|
ee7c646b1d
|
update user settings controllers to new permission system [fixes SCI-1960]
|
2018-01-22 16:42:26 +01:00 |
|
Oleksii Kriuchykhin
|
91468faaf9
|
Fix addons display in info modal [SCI-1875]
|
2018-01-17 18:30:55 +01:00 |
|