Commit graph

111 commits

Author SHA1 Message Date
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
artoscinote
95a36b6870
Implemented stock management modal [SCI-6417] (#3788)
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
2022-01-20 12:44:57 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
Martin Artnik
ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Martin Artnik
6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
aignatov-bio
958ee92db7 Add BMT filters interactions [SCI-5955] (#3478)
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
2021-08-30 10:49:14 +02:00
zmagoD
c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD
f1ced42ae6 add filtering logic 2021-04-30 15:25:08 +02:00
zmagoD
11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
zmagoD
8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
zmagoD
c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
zmagoD
04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
Urban Rotnik
ba13a0b14b Add jstree lib 2021-01-07 17:41:32 +01:00
aignatov-bio
84d681ecce Replace loading spinner 2020-11-23 14:14:54 +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
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
e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio
50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
aignatov-bio
3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
Alex Kriuchykhin
92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state
Refactor sidebar [SCI-4380]
2020-03-30 09:56:51 +02:00
aignatov-bio
8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio
b664c88819 Remove clndr from package.json 2020-02-22 13:03:51 +01:00
aignatov-bio
01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio
485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
Urban Rotnik
eea80f4a09 Remove JS call 2020-02-02 18:56:52 +01:00
Urban Rotnik
765a577669 Ellipsis with css for Sidebar 2020-01-29 13:22:35 +01:00
aignatov-bio
79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
2020-01-21 16:33:05 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
aignatov-bio
6a67280f6a Add new emoji picker 2020-01-21 10:50:55 +01:00
Mojca Lorber
8b635ac38a Refactor flash alerts 2020-01-17 10:49:41 +01:00
Mojca Lorber
a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Urban Rotnik
64c6159354 Update require JS 2019-12-06 10:39:21 +01:00
Urban Rotnik
3a76753b72 Add Edit renderer for ListColumnType 2019-11-29 12:52:27 +01:00
aignatov-bio
3474f72c41 Change JS load order 2019-11-29 10:19:49 +01:00
Urban Rotnik
6fbb99c8d2 Add List items partial and JS 2019-11-29 10:19:09 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
aignatov-bio
232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio
a0f11116d2 Add render views for datatables 2019-11-29 10:18:59 +01:00
Mojca Lorber
9d4796cf90 refactor repository column javascript 2019-11-29 10:17:44 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
aignatov-bio
264493a322 Finish removing Select2 library 2019-11-18 13:59:55 +01:00
Anton Ignatov
7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00