Commit graph

26 commits

Author SHA1 Message Date
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
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Mojca Lorber
a3c29738bb Hide create office file button to user without permission 2019-05-27 14:58:10 +02:00
Anton Ignatov
dcb6162ded Fix merge error 2019-05-16 09:40:02 +02:00
Anton Ignatov
259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Oleksii Kriuchykhin
4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
2019-05-13 10:45:12 +02:00
Anton Ignatov
e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +02:00
aignatov-bio
634b58bd6a
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
2019-05-11 16:04:28 +02:00
Anton Ignatov
fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov
2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov
54731856f0 Finish step chemical attachments 2019-04-27 19:08:40 +02:00
Anton Ignatov
46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov
fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov
baa9b94a63 Add new graph button to step 2019-04-26 20:33:20 +02:00
Anton Ignatov
40c1c9aef7 Add marvin js modal 2019-04-26 18:24:21 +02:00
Urban Rotnik
ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +02:00
Urban Rotnik
ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00