Commit graph

9136 commits

Author SHA1 Message Date
mlorb a71e8ef9cf
Merge pull request #2940 from mlorb/ml-sci-5034
Expose the new step button on task [SCI-5034]
2020-11-10 13:10:55 +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
Urban Rotnik a06f421c88
Merge pull request #2941 from urbanrotnik/ur-sci-5124
Fix teams query [SCI-5124]
2020-11-06 12:08:54 +01:00
aignatov-bio f3dd749c1d Fix smart annotation for archived experiments 2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin f2f08a31d5 Add check for zero page size in repository states [SCI-5190] 2020-11-06 11:42:33 +01:00
Urban Rotnik 8ac59fd699 Fix acessiable_by_team scope 2020-11-06 10:43:18 +01:00
Mojca Lorber 9893e8d5c8 Add 403 error handling to current tasks dashboard widget 2020-11-06 10:39:04 +01:00
Urban Rotnik d6eef4699b
Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap
Fix dashboard small screen overlap [SCI-5153]
2020-11-06 09:59:52 +01:00
Alex Kriuchykhin b51e92d5be
Merge pull request #2933 from okriuchykhin/ok_SCI_5047
Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]
2020-11-06 09:06:37 +01:00
Mojca Lorber 8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio 2c64481cda Fix navigation on small screens 2020-11-05 15:20:34 +01:00
aignatov-bio 5b22f7d301 Fix dashboard small screen overlap 2020-11-05 14:47:19 +01:00
Urban Rotnik 0c8134373d
Merge pull request #2937 from urbanrotnik/ur-sci-5157
Add data attribute to change status dropdown [SCI-5157]
2020-11-05 14:39:33 +01:00
Urban Rotnik 2c347af7bf Add data attribute to change status dropdown 2020-11-05 13:19:45 +01:00
aignatov-bio 09f7b7c750
Merge pull request #2936 from aignatov-bio/ai-sci-5102-add-context-menu-to-attachments
Add context menu to attachments [SCI-5102]
2020-11-05 11:00:51 +01:00
aignatov-bio d29a62dad1 Improve markup 2020-11-05 10:41:06 +01:00
aignatov-bio e8592d911d Fix markup 2020-11-05 10:04:27 +01:00
aignatov-bio 8145a292fd Clear code and add missed I18n translation 2020-11-05 10:03:15 +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
aignatov-bio 99b52e5d80 Fix markup 2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin 40ab03c38d Fix cucumber tests for table results [SCI-5047] 2020-11-04 16:46:18 +01:00
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
aignatov-bio 5d0ab1f2e9 Fix markup 2020-11-04 13:32:34 +01:00
aignatov-bio 12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio 09494c08c1
Merge pull request #2932 from aignatov-bio/ai-sci-5101-add-attachments-dropdown-to-step
Add attachments dropdown to step [SCI-5101]
2020-11-03 09:44:06 +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 84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
Add filer previews to reports [SCI-5110]
2020-11-02 18:48:45 +01:00
aignatov-bio eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
mlorb 7b1fb3a343
Merge pull request #2931 from mlorb/merge-develop-into-features/office-file-previews
Merge develop into features/office file previews
2020-11-02 15:20:23 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +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
Urban Rotnik 2549d9deeb
Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart
Fix SA in protocol description [SCI-5147]
2020-11-02 09:55:40 +01:00
mlorb 349e89eb28
Merge pull request #2887 from mlorb/ml-sci-5033
Change Complete step button on task step [SCI-5033]
2020-11-02 09:48:19 +01:00
Oleksii Kriuchykhin bb1d9e883f Add ProjectFolder factory and specs [SCI-5126] 2020-11-01 23:07:57 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
aignatov-bio 187e4bc541
Merge pull request #2922 from aignatov-bio/ai-sci-5107-add-step-attachments-size-backend
Add asset preview mode switcher to step [SCI-5107]
2020-10-30 16:30:40 +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
Urban Rotnik 1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 6193f91192 Update view mode switcher logic 2020-10-29 16:42:05 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00