Commit graph

241 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +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
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
aignatov-bio
188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
aignatov-bio
568fcb20df Fix protocol revert from repository [SCI-5285] 2020-12-04 12:07:25 +01:00
aignatov-bio
c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
Mojca Lorber
c57da3380f Remove complete step button from protocol step and fix step number in Firefox 2020-11-23 10:18:27 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
2020-11-19 11:11:39 +01:00
aignatov-bio
3a2b36369a Fix protocol import from protocol.io 2020-11-18 09:57:50 +01:00
aignatov-bio
e8e9244d96 Fix I18n and double loading 2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin
8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio
0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio
eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Mojca Lorber
04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
aignatov-bio
12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
aignatov-bio
d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio
016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
Mojca Lorber
4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
aignatov-bio
d21aee1843 Remove complete step button from protocol managment 2020-09-29 15:08:01 +02:00
aignatov-bio
1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
aignatov-bio
70a0da17b2 Fix markup 2020-09-24 17:12:53 +02:00
aignatov-bio
780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Urban Rotnik
7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
aignatov-bio
e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio
6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
Mojca Lorber
fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Mojca Lorber
eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
2020-09-09 09:05:39 +02:00
Oleksii Kriuchykhin
ea845040aa Fix missing step edit button [SCI-4880] 2020-09-07 13:49:11 +02:00
Oleksii Kriuchykhin
dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber
06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
Oleksii Kriuchykhin
a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Mojca Lorber
212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
Urban Rotnik
b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
aignatov-bio
443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Urban Rotnik
d974ff57e1 Fix attachments sorting 2020-01-28 15:01:20 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio
19f5f9de67 Disable autocomplete for textarea field 2019-11-12 14:44:33 +01:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar
b3cafcec7c Add restore draft notification to all models
Close SCI-3751
2019-09-30 11:34:39 +02:00