scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-12 20:24:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
12051 commits 30 branches 180 tags 166 MiB
Commit graph

687 commits

Author SHA1 Message Date
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik
8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik
ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
artoscinote
ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136) 
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
 2022-06-02 11:15:32 +02:00
Anton
61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
artoscinote
98d66a3276
Implement reordering activities [SCI-6851] (#4129) 
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
 2022-06-01 12:30:09 +02:00
artoscinote
23872f519b
Implement step element sorting modal [SCI-6849] (#4124) 
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
 2022-05-30 13:45:51 +02:00
aignatov-bio
57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space 
Add the ability to show storage limit [SCI-6835]
 2022-05-26 15:03:45 +02:00
Anton
3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
Anton
9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote
894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
aignatov-bio
45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step 
Add dropable area to step [SCI-6814]
 2022-05-26 12:57:51 +02:00
Anton
2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio
82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description 
Add tinyMce field to protocol [SCI-6810]
 2022-05-26 12:46:15 +02:00
aignatov-bio
5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section 
Add comments to step [SCI-6837]
 2022-05-25 22:01:48 +02:00
Anton
7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote
df0f001afa
Refactor step elements controllers [SCI-6848] (#4117) 2022-05-25 14:23:35 +02:00
ajugo
b77394a7b2
Responsive filter flyout [SCI-6494] (#4098) 
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
 2022-05-25 10:42:54 +02:00
artoscinote
c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
artoscinote
6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Oleksii Kriuchykhin
6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Anton
a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton
5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
Anton
9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Anton
134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Anton
9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
Anton
711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
Anton
8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
Anton
87450ea821 Add thumbnail and list view [SCI-6812] 2022-05-12 18:04:06 +02:00
Anton
940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +02:00
Anton
6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
artoscinote
b486f3fd31
Implement checklists [SCI-6789] (#4089) 2022-05-11 15:51:26 +02:00
Anton
c0660d0243 Small fixes [SCI-6808] 2022-05-11 11:32:27 +02:00
Anton
04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
aignatov-bio
d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion 
Add delete step modal [SCI-6781]
 2022-05-10 13:28:47 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Anton
252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
artoscinote
b00968fd55
Implement basic checklist functionality [SCI-6786] (#4073) 
* Implement protocol status bar functionality [SCI-6760]

* Inline edit interactions, checklist name edit improvements [SCI-6786]
 2022-05-05 12:56:31 +02:00
Anton
277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
artoscinote
5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton
3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton
e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +02:00
artoscinote
6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066) 
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
 2022-05-03 15:18:48 +02:00
Anton
d71ba2f7a1 Fix serailizer [SCI-6758] 2022-05-03 13:55:08 +02:00
Anton
6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
Anton
6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
artoscinote
8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote
6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
aignatov-bio
ede5e958db
Fix filters loading for stock filter [SCI-6687] (#3975) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-31 14:40:17 +02:00
aignatov-bio
004aeda601
Add stock filters [SCI-6547] (#3938) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-23 10:05:07 +01:00
artoscinote
4e118d095d
Fix dropdown component for group select [SCI-6583] (#3905) 2022-02-28 13:21:17 +01:00
aignatov-bio
155b437d6a
Fix blank state for time filter [SCI-6590] (#3903) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-28 11:05:01 +01:00
artoscinote
3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] (#3898) 
* Fix filter overwrite [SCI-6582]

* Fix date/time filter loading [SCI-6582]

* Fix time/time range filter loading [SCI-6582]

* Code style fixes [SCI-6582]
 2022-02-25 15:27:31 +01:00
aignatov-bio
899f2efbd6
Fix blank state for dates range [SCI-6576] (#3893) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-24 12:47:32 +01:00
aignatov-bio
f7cc20ebab
Update blank state for datetime filters [SCI-6571] (#3891) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 14:55:04 +01:00
aignatov-bio
d6c7305dfe
Move range filter logic to separate mixin (#3889) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 13:28:59 +01:00
aignatov-bio
cf200a23a7
Fix datetime switch between operators [SCI-6571] (#3888) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 11:40:37 +01:00
aignatov-bio
3ae683307d
Fix time filter [SCI-6575] (#3886) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 09:24:11 +01:00
Alex Kriuchykhin
dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote
463e1a8014
Fix date/time range filtering [SCI-6574] (#3882) 2022-02-22 13:29:50 +01:00
aignatov-bio
5a65b8689b
Fix blank state for between (#3883) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-22 12:55:40 +01:00
aignatov-bio
358ff50cc3
Update blank state for date filter [SCI-6541] (#3880) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-22 09:40:16 +01:00
aignatov-bio
4877455e9c
Change date operator order [SCI-6544] (#3876) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-21 11:25:12 +01:00
aignatov-bio
ed5b69c0ab
Add validation for date picker [SCI-6541] (#3875) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-21 11:10:50 +01:00
aignatov-bio
0267bade3c
Add prepopulated datetime filters [SCI-6541] (#3869) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-18 11:25:51 +01:00
aignatov-bio
10821edbba
Update datetime filters operators [SCI-6544] (#3873) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-18 11:16:53 +01:00
artoscinote
8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +01:00
aignatov-bio
6cee35dfa5
Small ux fixes [SCI-6539][SCI-6516] (#3864) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-16 12:56:54 +01:00
artoscinote
39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
aignatov-bio
f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-15 15:03:25 +01:00
Alex Kriuchykhin
6cc102cfd1
Fix advanced filters for list and status data types [SCI-6524][SCI-6521] (#3844) 2022-02-11 13:50:42 +01:00
aignatov-bio
97898fef7a
Add error handling for saving filters [SCI-6488] (#3835) 
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-02-11 13:32:27 +01:00
aignatov-bio
afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 12:44:22 +01:00
aignatov-bio
24127af83f
Fix dropdown behavior for repository filters [SCI-6491] (#3842) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 11:42:31 +01:00
Alex Kriuchykhin
b9204e1ce3
Add type specific indices for date time repository values [SCI-6485] (#3825) 2022-02-11 10:45:21 +01:00
aignatov-bio
ad5326011f
Fix validation for number field in filters [SCI-6510] (#3836) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 10:41:25 +01:00
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824) 
* Added error messges for missing search columns/values [SCI-6483]
 2022-02-11 10:24:29 +01:00
artoscinote
553bde0bf5
Fix blank definition for user value filters [SCI-6509] (#3834) 2022-02-11 10:14:45 +01:00
artoscinote
85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +01:00
aignatov-bio
e59b18e25d
Add default selection for filters [SCI-6484] (#3826) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-10 20:58:44 +01:00
aignatov-bio
ec6886735c
Add archived on column [SCI-6482] (#3823) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-03 13:18:15 +01:00
aignatov-bio
5223ce13f3
Fix assets operator markup error [SCI-6462] (#3822) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-03 12:32:19 +01:00
artoscinote
dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803) 
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
 2022-02-01 14:37:13 +01:00
aignatov-bio
3fc5883172
Fix purple dots after applying empty filters [SCI-6458] (#3809) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-31 15:14:39 +01:00
aignatov-bio
c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] (#3806) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-31 09:21:08 +01:00
aignatov-bio
60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-27 14:01:09 +01:00
Martin Artnik
5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
Martin Artnik
8c8d26011d Fix bad merge of additionalDataFilter.vue 2022-01-26 11:05:09 +01:00
artoscinote
790451c96f
Various fixes for BMT search [SCI-6077] (#3673) 
* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
 2022-01-25 12:28:38 +01:00
aignatov-bio
86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 10:22:11 +01:00
Alex Kriuchykhin
5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388 
Fix added_on filter, add specs [SCI-6388]
 2022-01-24 16:47:03 +01:00
Martin Artnik
5fcf2cd080 Fix rendering of bmt/repository filters [SCI-6447] 2022-01-21 13:14:04 +01:00
Martin Artnik
711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +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
aignatov-bio
8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-17 10:24:57 +01:00
aignatov-bio
3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768) 
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-01-12 14:39:42 +01:00
Anton
304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote
3f87d250ce
Implement saving repository filters [SCI-6230] (#3748) 
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
 2022-01-05 15:02:09 +01:00
Martin Artnik
66081950f0 Fix added_on filter, add specs [SCI-6388] 2022-01-04 19:20:02 +01:00
Martin Artnik
ef0fec55df Filter fixes [SCI-6391] 2021-12-27 11:36:39 +01:00
Oleksii Kriuchykhin
738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik
55905310a6 Added filter parameter formatting [SCI-6229] 2021-12-16 14:40:36 +01:00
aignatov-bio
7bcf7a7943
Fix conflicts and update localizations [SCI-6227] (#3733) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 15:16:12 +01:00
artoscinote
49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio
ac8fdb95d6
Add filters for checklist and status [SCI-6225][SCI-6226] (#3732) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 12:31:32 +01:00
aignatov-bio
8ce321456e
Add time filter [SCI-6217] (#3738) 
* Add time filter [SCI-6217]

* Add datetime filter for inventory [SCI-6220]

* Refactor components structure

Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 12:22:24 +01:00
artoscinote
e08857886a
Implement date type filter [SCI-6216] (#3729) 
Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
 2021-12-10 14:12:06 +01:00
aignatov-bio
c7af5b322b
Add drodown filter [SCI-6224] (#3728) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 20:49:48 +01:00
aignatov-bio
00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726) 
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 15:28:20 +01:00
aignatov-bio
e4606abf3e
Add basic structure for text filter [SCI-6213][SCI-6214] (#3710) 
* Add basic structure for text filter [SCI-6213]

* Add actions for text filter [SCI-6213]

* Add mixins and i18n [SCI-6213]

* Add number filters [SCI-6214]

* Fix operator values

Co-authored-by: Anton <anton@scinote.net>
 2021-12-03 14:50:27 +01:00
artoscinote
f1ede0f439
Add asset filter type [SCI-6215] (#3711) 2021-12-01 11:24:34 +01:00
aignatov-bio
12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698) 
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
 2021-11-25 20:34:22 +01:00
Anton
c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio
06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652) 
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:46:08 +01:00
aignatov-bio
27d6453527
After clear filters not reload table [SCI-6101][SCI-6102] (#3661) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:12:57 +01:00
aignatov-bio
c8fd0dce51
Add permission checks for bmt filters [SCI-6099] (#3622) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:28:51 +01:00
Martin Artnik
2f56e25346 Close saved filters dropdown on outclick [SCI-6086] 2021-11-02 16:23:08 +01:00
Martin Artnik
206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik
5f21e3296e Added error message on search failure [SCI-5961] 2021-08-30 12:02:02 +02:00
Martin Artnik
e08b406185 Added additionalDataFilter [SCI-6026] 2021-08-30 10:49:15 +02:00
Martin Artnik
896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio
b269f3f612 Add saved filters backend [SCI-5977] (#3509) 
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-08-30 10:49:15 +02:00
artoscinote
ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503) 
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
 2021-08-30 10:49:15 +02:00
aignatov-bio
90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik
a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik
9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +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
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
Martin Artnik
71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
aeba25cf09 Fix Hound warning 2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin
25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio
be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
Urban Rotnik
7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Jure Grabnar
fc961b570c Comment out index.jsx 
Closes SCI-3590
 2019-07-02 18:07:12 +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
Oleksii Kriuchykhin
88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Urban Rotnik
96fa620c4c Add fontawesome checkmark before dropdown item 
SCI-3209
 2019-03-26 12:35:17 +01:00
Oleksii Kriuchykhin
7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix 
Update software with new logo & new brand [SCI-2416]
 2018-05-23 15:47:17 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Luka Murn
cea18a44d5 Rename sciNote -> SciNote (app/javascript folder) 2018-05-21 15:18:30 +02:00
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
mlorb
e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb
22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Luka Murn
4ddc7dfa85 Comment react-hijack code 2018-02-06 08:00:29 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
zmagod
2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Adrian Oprea
f2f624cfa6 Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web:
  fix(AboutScinoteModal): Enable react optimizations
  Fix addons display in info modal [SCI-1875]
  Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
 2018-01-18 10:24:36 +02:00
Adrian Oprea
12fd630d0c fix(AboutScinoteModal): Enable react optimizations 
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-18 09:59:37 +02:00
Adrian Oprea
6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
 2018-01-17 18:14:41 +02:00
Adrian Oprea
157969aa5e HACK: Comment out code which returns invalid data 
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 17:54:35 +02:00
okriuchykhin
8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
Adrian Oprea
b559f3cbd4 refactor(Navigation): Use identifier instead of screenName 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:40:33 +02:00
Adrian Oprea
4b9013bcab refactor(massageConfiguration): Create response only when we have addons 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:39:42 +02:00
zmagod
0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Adrian Oprea
d71f6161e4 feat(Navigation): Enhance navigation with addons 
Use the withExtras HOC to add external functionality without embedding that knowledge in the core.
 2018-01-16 17:24:11 +02:00
Adrian Oprea
d7b63f5941 feat(massageConfiguration): Add data-transformation function 
The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.
 2018-01-16 17:23:15 +02:00
Adrian Oprea
583efbc9c4 refactor(componentLoader): Add component path at module level 
Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.
 2018-01-16 17:19:56 +02:00
Adrian Oprea
350862b0cc feat: Re-export availableAddons 
This will probably be removed and the config will be exported through the main entrypoint.
 2018-01-16 17:18:46 +02:00
Adrian Oprea
f6f2bc4c3d feat: Create availableAddons empty config 
This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.
 2018-01-16 17:17:39 +02:00
Oleksii Kriuchykhin
b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Adrian Oprea
894e0afd0a feat(componentLoader): Add external component loader module 
For render hijacking to work, imports need to be peformed at core level.
This loader ensures that Webpack is able to resolve the paths to the
external components' code, without the need for extra loaders or custom
built plugins.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-16 10:14:35 +02:00
zmagod
371491c259 refactor 2018-01-12 11:38:52 +01:00
zmagod
0d7c116de1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-09 10:03:02 +01:00
zmagod
c5379896c0 fix HOC to recive objects 2018-01-08 16:28:20 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
zmagod
455534ef9a fixes list keys 2018-01-05 17:11:38 +01:00
zmagod
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
zmagod
be014000ab fixes flow-types 2018-01-05 09:59:08 +01:00
zmagod
862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
okriuchykhin
4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin
53f4db9352 Code refactoring [SCI-1869] 2018-01-04 14:56:16 +01:00
zmagod
e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +01:00
zmagod
1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin
2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
mlorb
11a3cd196c add create, update team permission and refactor 422 respond handling in controllers 2017-12-14 14:18:14 +01:00
zmagod
219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin
7bdc22ee80 Remove default property [SCI-1865] 2017-12-13 17:28:05 +01:00
Oleksii Kriuchykhin
6986d11cfe Add Flow types for notifications [SCI-1865] 2017-12-13 17:25:25 +01:00
zmagod
249d3d7698 fixes current timezone setup for activities 2017-12-13 16:48:31 +01:00
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +01:00
Oleksii Kriuchykhin
ea63864b33 Add icons for different notification types in recent notification dropdown [SCI-1865] 2017-12-12 17:05:08 +01:00
zmagod
52e5cf7be8 remove unneeded import 2017-12-04 13:27:24 +01:00
zmagod
e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
zmagod
b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod
52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
Zmago Devetak
fe128dc53b
Merge pull request #865 from ZmagoD/zd_SCI_1761 
fixes password validations [fixes SCI-1761]
 2017-11-13 13:09:46 +01:00
zmagod
26912a14d6 fixes password validations [fixes SCI-1761] 2017-11-10 12:59:37 +01:00
mlorb
fd743ec2d5 fix error with event not defined and add flowtype to ESLint 2017-11-10 09:30:55 +01:00
mlorb
dfb2689fbf
Merge pull request #860 from mlorb/ml-sci-1730 
Fix team table does not retain the number of teams per page bug [SCI-1730]
 2017-11-09 17:53:19 +01:00
mlorb
b3e39697d5
Merge pull request #857 from mlorb/ml-sci-1575 
Implement login feature integration tests [SCI-1575]
 2017-11-09 13:48:57 +01:00
mlorb
b0fe792f9c fix ESLint class-methods-use-this error 2017-11-09 13:33:41 +01:00
mlorb
c7f5d6ed8c add state for number of teams per page 2017-11-09 13:29:14 +01:00
Zmago Devetak
7386974d64
Merge pull request #850 from ZmagoD/zd_SCI_1731 
add scenic gem, teams datatables sql view
 2017-11-09 11:37:20 +01:00
zmagod
e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +01:00
mlorb
4e92065ea0
Merge pull request #855 from mlorb/ml-sci-1633-v2 
Fix bug with import css styles [SCI-1633]
 2017-11-09 09:49:37 +01:00
zmagod
9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
zmagod
e2af987b80 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568 2017-11-09 08:35:39 +01:00
Luka Murn
dfa1c83c9f Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation 
Conflicts:
	flow-typed/npm/lodash_v4.x.x.js
 2017-11-08 09:33:29 +01:00
Luka Murn
0412c6f283 Update code per @ZmagoD's request 2017-11-07 17:30:15 +01:00
mlorb
157b1968cc implement login's feature integration tests 2017-11-07 17:18:41 +01:00
mlorb
df835fccb4 fix bug with import css styles 2017-11-07 11:09:30 +01:00
zmagod
3255d5cf7c code cleanup 2017-11-06 15:37:09 +01:00
zmagod
54e360bb52 fixes team switch 2017-11-06 15:14:17 +01:00
mlorb
bd569b9746 small changes 2017-11-06 11:34:25 +01:00
mlorb
21e3c653eb add integration tests for single team feature 2017-11-03 10:48:09 +01:00
Zmago Devetak
460bcd4980
Merge pull request #844 from ZmagoD/zd_SCI_1669 
Refactor all API server calls from react to go through the services
 2017-11-03 09:19:02 +01:00
Zmago Devetak
b1f4d578f0
Merge pull request #848 from ZmagoD/zd_SCI_1726_add_team_member_bug_fix 
fixes user invitation button [fixes SCI-1726]
 2017-11-02 16:50:42 +01:00
zmagod
618880aa30 follows @Ducz0r 's remarks 2017-11-02 16:49:09 +01:00
zmagod
e17f945d8a fix typos 2017-11-02 16:41:29 +01:00
zmagod
5ded818291 fixes failing cucumber tests 2017-11-02 16:24:11 +01:00
zmagod
5538805faa Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669 2017-11-02 14:39:07 +01:00
zmagod
2118b31762 adds about sciNote modal 2017-11-02 13:23:57 +01:00
Luka Murn
329dd4f1b0 Onboard Flow onto validation components. 2017-10-30 14:13:36 +01:00
zmagod
e5a01f7a57 adds integration tests for about sciNote modal 2017-10-27 16:37:42 +02:00
zmagod
3158fc4a8a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1723 2017-10-27 10:47:10 +02:00
zmagod
c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
zmagod
62dfd6a713 adds wait_for_ajax function to cucumber tests [fixes SCI-1723] 2017-10-24 15:39:06 +02:00
Luka Murn
a60e4c28bb Hound is love, Hound is life 2017-10-24 13:58:59 +02:00
Luka Murn
cbe3e67402 Codestyle refactor 2017-10-24 13:57:33 +02:00
Luka Murn
0eea1e3def Fixes per @ZmagoD's request 2017-10-24 13:49:33 +02:00
Luka Murn
998519066c Remove unneeded localized Strings 2017-10-24 10:00:10 +02:00
Luka Murn
823ed75898 Add file validators, refactor a bit 2017-10-24 09:40:55 +02:00
Luka Murn
c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +02:00
Luka Murn
ceb11c143f Change edit team name & description modals to use new validation 2017-10-23 17:55:28 +02:00
Luka Murn
463d17ace1 Add first version of reusable validation form elements 
Implemented on new team page.
 2017-10-23 17:55:28 +02:00
zmagod
f76dc29e61 fix change user role [fixes SCI-1669] 2017-10-23 15:48:12 +02:00
zmagod
545cf50993 removes modalContaine, move leaveTeamModal under teams 2017-10-23 15:02:04 +02:00
zmagod
7d6d95630d add flow and fix api request in updateTeamNameModal component 2017-10-23 10:11:39 +02:00
zmagod
7cf43a299a adds flow in updateTeamDescriptionModal 2017-10-23 09:59:05 +02:00
Zmago Devetak
a0eaec214b Merge pull request #821 from ZmagoD/zd_SCI_1572 
Implement integration test: profile.feature + initial setup
 2017-10-20 20:17:37 +02:00
zmagod
e3e3f4c75d Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-19 16:06:40 +02:00
Zmago Devetak
a677ef06c7 Merge pull request #837 from ZmagoD/zd_SCI_1703 
adds page titles [fixes SCI-1703]
 2017-10-19 15:50:16 +02:00
zmagod
09e4e23e3d fixes typos 2017-10-19 15:48:21 +02:00
zmagod
7943bfda13 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-19 14:01:26 +02:00
zmagod
5e5d7ea2dd fix page title locales 2017-10-19 12:50:33 +02:00
zmagod
fb0ba702e1 add HOC for page title 2017-10-19 12:37:17 +02:00
zmagod
92061628a0 adds @Ducz0r suggestions 2017-10-19 10:35:53 +02:00
zmagod
063ac4ea0b increase polling interval [fixes SCI-1705] 2017-10-18 16:35:02 +02:00
zmagod
d324ea3c12 fixes flow error 2017-10-18 16:28:19 +02:00
zmagod
a6ea56540f Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-18 16:21:59 +02:00
zmagod
0a46d50e4b split custom types in multiple files 2017-10-18 16:14:45 +02:00
Zmago Devetak
6702265b1e Merge pull request #835 from ZmagoD/zd_SCI_1706 
disables invite user button if no emails present [fixes SCI-1706]
 2017-10-18 15:48:48 +02:00
zmagod
3558e20454 follow @Ducz0r suggestions 2017-10-18 15:37:13 +02:00
zmagod
2f68a90eff adds page titles [fixes SCI-1703] 2017-10-18 15:23:46 +02:00
mlorb
a7ebaaed87 Merge pull request #824 from mlorb/ml-sci-1700 
Fixes closing of notification modal window [SCI-1700]
 2017-10-18 15:01:59 +02:00
zmagod
d2c3827289 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-18 14:15:28 +02:00
zmagod
5afd65d2b1 fixes active tab bug, opt-in flow [fixes SCI-1688] 2017-10-18 13:59:52 +02:00
mlorb
5e9a1408f2 fix banana bug 2017-10-18 13:41:58 +02:00
zmagod
6a5bafd07b fix hound 2017-10-18 08:42:48 +02:00
zmagod
3179a7abf5 disables invite user button if no emails present [fixes SCI-1706] 2017-10-18 08:37:58 +02:00
mlorb
6c6aa53904 add new team to redux 2017-10-17 15:52:18 +02:00
mlorb
a4a2c79959 Merge pull request #829 from mlorb/ml-sci-1691 
Fixes some text style and default input values [SCI-1691]
 2017-10-17 13:45:07 +02:00
mlorb
67585a4c6e Merge pull request #827 from mlorb/ml-sci-1702 
Add search to one team page [SCI-1702]
 2017-10-17 13:43:01 +02:00
mlorb
1a15c5fa4f Merge pull request #823 from mlorb/ml-sci-1636-v2 
Removes focus from "add team members" button after… [SCI-1636]
 2017-10-17 13:28:35 +02:00
mlorb
7f3c34b930 Merge pull request #822 from mlorb/ml-sci-1633 
Fixes time zone style [SCI-1633]
 2017-10-17 13:21:02 +02:00
mlorb
21b13f0e2c fixes some text style and default input values 2017-10-17 10:57:14 +02:00
zmagod
952c4e8195 fixes bug with remove user modal [fixes SCI-1699] 2017-10-17 09:55:04 +02:00
zmagod
6fe48a07ae fix hound, add custom hook for webpacker:compile 2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86 adds cucumber test for profile page [fixes SCI-1572] 2017-10-16 16:21:52 +02:00
mlorb
b92fd6be35 add search to one team page 2017-10-16 13:10:46 +02:00
mlorb
dafa4a6f1f fixes closing of notification modal window 2017-10-13 10:46:58 +02:00
zmagod
bdc1051cbb cleanup 2017-10-12 17:05:04 +02:00
zmagod
e5ebedb428 fix errors with polyfill 2017-10-12 16:49:33 +02:00
mlorb
f19c0defd6 remove focus from add team members button after the invite users modal closes 2017-10-12 15:28:00 +02:00
mlorb
ed80d849aa remove double css file import and move data-tables style to the component 2017-10-12 14:54:40 +02:00
mlorb
6cc3c2df95 fixes time zone styling 2017-10-12 14:45:08 +02:00
zmagod
dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
zmagod
3740e89ca0 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572 2017-10-11 15:20:09 +02:00
zmagod
abe0b8adcc tweak tweak 2017-10-11 15:20:03 +02:00
mlorb
8bd698e5c3 Merge pull request #817 from mlorb/ml-sci-1632 
Fixes buttons on my profile page [SCI-1632]
 2017-10-10 16:30:50 +02:00
mlorb
7ca29b50a2 Merge pull request #816 from mlorb/ml-sci-1636 
Fixes style errors on one team page [SCI-1636]
 2017-10-10 16:23:50 +02:00
Zmago Devetak
e99791bd29 Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration 
fixes webpack production build
 2017-10-10 15:08:28 +02:00
zmagod
f12a645fa3 fix hound 2017-10-10 15:01:25 +02:00
zmagod
f00c36998d removes unneeded style component 2017-10-10 14:51:46 +02:00
zmagod
a35ba0239a fixes flow types 2017-10-10 14:48:46 +02:00
Zmago Devetak
d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629 
adds bootstrap and font-awesome in webpacker build fixes the missing …
 2017-10-10 14:09:52 +02:00
zmagod
c014742a88 fixes webpack production build 2017-10-10 14:08:23 +02:00
mlorb
fd859d7b7f fixes buttons on my profile page 2017-10-10 13:25:44 +02:00
mlorb
7dae772822 fixes style errors on one team page 2017-10-10 11:32:13 +02:00
mlorb
25e6eb4511 Merge pull request #812 from mlorb/ml-sci-1634 
Fix a few style error on All teams page [SCI-1634]
 2017-10-09 14:59:57 +02:00
mlorb
1049e0730e implements @ZmagoD comments 2017-10-09 13:59:32 +02:00
zmagod
fc585ebe11 refactor GlobalActivitiesModal constructor 2017-10-09 10:58:40 +02:00
zmagod
943339345a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628 2017-10-09 10:41:36 +02:00
zmagod
2d1c849106 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-09 09:43:29 +02:00
zmagod
d85233cb2c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-09 09:30:06 +02:00