Commit graph

8575 commits

Author SHA1 Message Date
Alex Kriuchykhin 1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
Implement search endpoint for Projects & folders search [SCI-5136]
2020-11-23 13:09:33 +01:00
aignatov-bio 833c327e3a Fix empty state during loading 2020-11-23 12:44:23 +01:00
aignatov-bio 2449f2b500 Fix smart annotation for comments 2020-11-21 12:34:36 +01:00
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio 60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin 4c8d8c176f Improve routes for folders [SCI-5136] 2020-11-20 11:12:36 +01:00
Alex Kriuchykhin 27bd9c2a72
Merge pull request #2948 from okriuchykhin/ok_SCI_5180
Add project folders to global search [SCI-5180]
2020-11-20 11:11:12 +01:00
Oleksii Kriuchykhin 86e5078622 Add project folders to global search [SCI-5180] 2020-11-20 11:10:03 +01:00
Alex Kriuchykhin f5860397f5
Merge pull request #2953 from okriuchykhin/ok_SCI_5183
Make folders selectable for 'Export all' functionality [SCI-5183]
2020-11-20 09:54:53 +01:00
Urban Rotnik 00cf35ef44
Merge pull request #2921 from urbanrotnik/ur-sci-5127
Add filters flyout [SCI-5127]
2020-11-20 09:31:20 +01:00
Oleksii Kriuchykhin 4dc3473c5e Fix showing/hiding export button on folder selection [SCI-5183] 2020-11-19 15:50:43 +01:00
Urban Rotnik aba0034854 Convert some values to ems 2020-11-19 09:25:26 +01:00
Urban Rotnik e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
aignatov-bio 2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio e434469c49
Merge pull request #2952 from aignatov-bio/ai-sci-5184-add-folder-to-team-import-export
Add project folders to team import/export [SCI-5184]
2020-11-17 10:10:06 +01:00
aignatov-bio deaecf57c9 Add activity for project moving 2020-11-16 12:21:03 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
aignatov-bio 80d6e5e87c Add project folders to team import/export 2020-11-13 14:13:26 +01:00
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
Alex Kriuchykhin 672e1d1b7a
Merge pull request #2934 from urbanrotnik/ur-sci-5130
New cards and list layout [SCI-5130][SCI-5131]
2020-11-09 15:40:36 +01:00
Urban Rotnik 0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik 9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Alex Kriuchykhin a95dd904c8
Merge pull request #2930 from okriuchykhin/ok_SCI_5129
Implement the toolbar on the Team Projects page [SCI-5129]
2020-11-05 09:16:29 +01:00
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Alex Kriuchykhin 8566d56b68
Merge pull request #2928 from okriuchykhin/ok_SCI_5126
Create database structure for project folders [SCI-5126]
2020-11-02 11:46:15 +01:00
Oleksii Kriuchykhin bb1d9e883f Add ProjectFolder factory and specs [SCI-5126] 2020-11-01 23:07:57 +01:00
Alex Kriuchykhin ffca4ae022
Merge pull request #2918 from urbanrotnik/ur-sci-5134
Refactor projects page [SCI-5134]
2020-10-30 13:40:12 +01:00
Urban Rotnik 042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Oleksii Kriuchykhin e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
Urban Rotnik b23f110184
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters
Add mark for active filters [SCI-5085]
2020-10-25 16:06:59 +01:00
Urban Rotnik c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
2020-10-23 15:33:22 +02:00
Urban Rotnik 75351a3aed px to em 2020-10-23 14:11:56 +02:00
Urban Rotnik 6ccd34291d
Merge pull request #2904 from urbanrotnik/ur-sci-5093
Fix smart annotation in checklist title [SCI-5093]
2020-10-23 13:36:22 +02:00
Urban Rotnik d43d487d33
Merge pull request #2907 from urbanrotnik/ur-sci-5045-remove-border
Remove border, update copy [SCI-5045]
2020-10-23 13:35:57 +02:00
Urban Rotnik 1089e7e4fd Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228 2020-10-22 14:27:32 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik 2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
Urban Rotnik a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
Miha Mencin c8083f730c
Merge pull request #2899 from biosistemika/release/1.20.2
Release/1.20.2
2020-10-16 09:01:45 +02:00
Urban Rotnik e1e7496307
Merge pull request #2884 from urbanrotnik/ur-sci-5043
DOCX lists [SCI-5043]
2020-10-15 11:53:58 +02:00
Urban Rotnik e748e1eff3 Fix smart annotations and links styling 2020-10-14 17:58:07 +02:00
mlorb 83ba40d135
Merge pull request #2870 from mlorb/ml-sci-4841
Fix at long inventory name snapshot in title is not visible [SCI-4841]
2020-10-14 14:38:04 +02:00
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Alex Kriuchykhin d5499168f3
Merge pull request #2896 from biosistemika/features/pwa
Merge features/pwa to develop
2020-10-13 16:34:57 +02:00
Urban Rotnik a19e0ef846 Refactor 2020-10-13 14:23:39 +02:00