scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
10796 commits 69 branches 179 tags 165 MiB
Commit graph

1577 commits

Author SHA1 Message Date
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
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
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
Urban Rotnik e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests 
Features/signature requests into develop
 2020-10-29 14:48:25 +01:00
aignatov-bio d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
aignatov-bio 23f9fb212d
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal 
Update image edit modal [SCI-5105]
 2020-10-29 09:15:32 +01:00
aignatov-bio 16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
aignatov-bio bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
aignatov-bio aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +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 aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +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
aignatov-bio 2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio 3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Mojca Lorber a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio 5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin 21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
aignatov-bio e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
Mojca Lorber 23d6d93074 Fix css 2020-09-21 17:13:42 +02:00
Mojca Lorber d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
mlorb 4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
Mojca Lorber 3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Mojca Lorber fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Mojca Lorber 13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
Mojca Lorber eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio 7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
aignatov-bio 661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
aignatov-bio 84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
Mojca Lorber 9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
aignatov-bio d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio 39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow 
Fix css for status flows [SCI-4970]
 2020-09-03 09:46:19 +02:00
Mojca Lorber 06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
aignatov-bio 257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
Mojca Lorber d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
aignatov-bio 21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Alex Kriuchykhin 5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Mojca Lorber 059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin e965844a9e
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports 
Add new statuses to reports [SCI-4837]
 2020-08-04 09:49:55 +02:00
Urban Rotnik aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00
aignatov-bio 73911cf7ce Fix CSS for activities on task page 2020-07-30 13:30:23 +02:00
aignatov-bio 2f5231e832 Add start date to current task dashboard filter 2020-07-29 16:09:23 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio 6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
Alex Kriuchykhin d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results 
Add pagination to results page [SCI-4732]
 2020-07-23 14:45:10 +02:00
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
aignatov-bio b214d2df77
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch 
Fix switch view margins [SCI-4815]
 2020-07-23 08:57:20 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik aacee14fc6 Add Status button 2020-07-22 15:30:47 +02:00
aignatov-bio 1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik 7019e42736
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email 
Fix font size in dropdown [SCI-4816]
 2020-07-20 15:50:10 +02:00
aignatov-bio 691b8ec327 Fix switch view margins 2020-07-20 15:17:24 +02:00
Urban Rotnik 748dd7912b Fix font size in dropdown 2020-07-20 11:36:25 +02:00
Mojca Lorber 10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
Alex Kriuchykhin 8dd478ad61
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports 
Improve pdf reports [SCI-4874]
 2020-07-13 17:02:10 +02:00
Mojca Lorber 212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio a7fac38fcb Improve pdf reports 2020-07-13 14:29:59 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik 7aa40a284e
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout 
Text wrap for page numbers [SCI-4771]
 2020-07-09 16:52:41 +02:00
Urban Rotnik 1f220f70ee Text wrap for page numbers 2020-07-09 16:24:14 +02:00
mlorb 3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810 
Hide inventory buttons and fix css of disabled button [SCI-4810]
 2020-07-09 15:11:02 +02:00
Mojca Lorber cb8070c012 Fix pointer event 2020-07-09 14:25:54 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
Urban Rotnik 950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout 
Improve report layout [SCI-4771]
 2020-07-09 11:48:33 +02:00
mlorb d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
Mojca Lorber 19c5b7e5a2 Remove redundant css class 2020-07-09 11:44:36 +02:00
Mojca Lorber 00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
Urban Rotnik 5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
aignatov-bio 004a7e3943
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals 
Update inventory modals CSS [SCI-4808]
 2020-07-08 09:29:02 +02:00
aignatov-bio 88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
Mojca Lorber 9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
aignatov-bio be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio 6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +02:00
Urban Rotnik 1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
Miha Mencin 76c2e032dc
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name 
Fix long inventory name issue on task page  [SCI-4747]
 2020-06-29 09:44:21 +02:00
aignatov-bio 6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio 8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
aignatov-bio e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28:43 +02:00
Urban Rotnik 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik 9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +02:00
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
aignatov-bio 7c8460dcf5
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness 
Change selected line thickness [SCI-4699]
 2020-06-01 10:43:46 +02:00
aignatov-bio 222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00
aignatov-bio e67f345602
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes 
Small css fixes [SCI-4701]
 2020-06-01 10:27:54 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17:07 +02:00
Alex Kriuchykhin be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar 
Show selected snapshot in sidebar [SCI-4699]
 2020-05-29 11:14:52 +02:00
aignatov-bio 7f0d43209e Small css fixes 2020-05-28 16:04:21 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio 32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +02:00
aignatov-bio 73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
mlorb 384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582 
Task details description corrections and some changes of locales [SCI-4582]
 2020-05-25 09:10:37 +02:00
aignatov-bio 100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search 
Improve search through assigned tasks [SCI-4642]
 2020-05-25 09:09:19 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio 230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Urban Rotnik 9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
aignatov-bio d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view 
Add private tasks to assigned task list [SCI-4660]
 2020-05-21 12:57:59 +02:00
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Oleksii Kriuchykhin f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
aignatov-bio d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview 
Fix checklist render in full view [SCI-4635]
 2020-05-19 16:18:45 +02:00
Urban Rotnik 431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix 
Fonts size update [SCI-4650]
 2020-05-19 14:55:22 +02:00
Urban Rotnik ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio 9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb 1e0fed75d1
Merge pull request #2551 from mlorb/ml-sci-4620 
Fix missing corner on opened task inventory [SCI-4620]
 2020-05-14 17:25:39 +02:00
aignatov-bio e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections 
Small task inventories corrections [SCI-4605]
 2020-05-14 16:45:45 +02:00
aignatov-bio ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio 309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +02:00
aignatov-bio 78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections 
Small snapshot css corrections [SCI-4604]
 2020-05-14 15:18:13 +02:00
aignatov-bio 8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view 
Small CSS improvments for mobile [SCI-4518]
 2020-05-14 14:20:40 +02:00
aignatov-bio 445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick 
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
 2020-05-14 13:19:08 +02:00
aignatov-bio 5bdf1ff586
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position 
Prevent time to go newline in reports [SCI-4608]
 2020-05-14 13:18:31 +02:00
Mojca Lorber 009dce110b Css fix 2020-05-14 12:18:45 +02:00
aignatov-bio 9076fab12f Prevent time to go newline in reports 2020-05-13 18:46:58 +02:00
Oleksii Kriuchykhin c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
aignatov-bio 8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Mojca Lorber 9c4d07f0dd Fix missing corner on opened task inventory 2020-05-11 13:04:31 +02:00
aignatov-bio f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +02:00
aignatov-bio d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
 2020-05-08 12:39:28 +02:00
aignatov-bio dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view 
Update CSS for full view assigned rows modal [SCI-4594]
 2020-05-07 15:22:06 +02:00
aignatov-bio 30ce49b731
Merge pull request #2538 from aignatov-bio/ai-sci-4574-result-office-button-position 
Fix office button position [SCI-4574]
 2020-05-07 13:55:15 +02:00
aignatov-bio 8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio 912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols 
Fix css for comments and fix modal title size [SCI-4573]
 2020-05-07 12:59:56 +02:00
aignatov-bio 8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown 
Add new protocol template dropdown [SCI-4538]
 2020-05-07 08:32:54 +02:00
aignatov-bio 5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio b74b717d03 Fix office button position 2020-05-06 13:42:30 +02:00
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
aignatov-bio a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Mojca Lorber 8b4110c0af Css fixes for avatars for assigned users on tasks 2020-05-05 16:11:11 +02:00
Alex Kriuchykhin 7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task 
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
 2020-05-05 13:20:01 +02:00
aignatov-bio c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page 
Fix CSS for results [SCI-4574]
 2020-05-05 12:58:35 +02:00
aignatov-bio 8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio 1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio 0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
Urban Rotnik 73e5168db6 Fix icon position and hover efect in repositories sidebar 2020-04-24 14:51:32 +02:00
aignatov-bio 4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
mlorb 1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493 
Add protocol options dropdown [SCI-4493]
 2020-04-23 17:21:26 +02:00
Mojca Lorber c1138f1d26 fix font 2020-04-23 16:56:09 +02:00
Mojca Lorber ac709be364 Small fixes 2020-04-23 16:50:16 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Mojca Lorber 6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list 
Add repositories dropdown list [SCI-4506]
 2020-04-16 14:17:17 +02:00
mlorb 9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505 
Add the user management section of to the Details section of task layout [SCI-4505]
 2020-04-16 13:47:31 +02:00
aignatov-bio 338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
Mojca Lorber f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
aignatov-bio e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio 7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
aignatov-bio 2f0fd438a6
Merge pull request #2504 from aignatov-bio/ai-sci-4519-add-dashboard-mobile-view 
Add mobile view for dashboard [SCI-4519]
 2020-04-06 15:36:11 +02:00
Alex Kriuchykhin 967c072dbd
Merge pull request #2500 from aignatov-bio/ai-sci-4517-fix-sidebar-when-caching 
Fix caching issue for sidebar [SCI-4517]
 2020-04-06 10:21:59 +02:00
aignatov-bio fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list 
Add assigned repositories list [SCI-4507]
 2020-04-03 13:59:26 +02:00
aignatov-bio 9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio f313b6ff01
Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen 
Update css for login screen [SCI-4339]
 2020-04-02 15:47:17 +02:00
aignatov-bio 158966cc01 Add mobile view for dashboard 2020-04-02 14:58:10 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
Mojca Lorber cb554e815a Add new task layout details section 2020-04-01 13:05:35 +02:00
Oleksii Kriuchykhin 3c8a149cf4 Fix task start date placement on report element [SCI-4504] 2020-04-01 11:06:27 +02:00
aignatov-bio 5705bd8497 Fix caching issue for sidebar 2020-03-31 22:12:38 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
Mojca Lorber 7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
aignatov-bio d48e8dfeac Fix markup 2020-03-30 12:05:30 +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 1551197c06 Move constants to separate file 2020-03-27 11:12:38 +01:00
aignatov-bio b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio 8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
aignatov-bio ab6001c068 Fix scroll 2020-03-25 12:56:01 +01:00
aignatov-bio a7e4083ef1 Fix team dropdown 2020-03-25 12:31:47 +01:00
aignatov-bio 948034e3d4
Merge pull request #2488 from aignatov-bio/ai-sci-4494-fix-calendar-safari-issue 
Calendar CSS safari fix [SCI-4494]
 2020-03-24 21:55:40 +01:00
Miha Mencin be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344 
Fix tooltips appear wrongly [SCI-4344]
 2020-03-24 19:43:34 +01:00
aignatov-bio 4052ec1c67 Calendar CSS safari fix 2020-03-24 18:44:09 +01:00
Alex Kriuchykhin 54097a26ae
Merge pull request #2479 from mlorb/ml-sci-4473 
Fix new task modal css error [SCI-4473]
 2020-03-24 10:40:36 +01:00
aignatov-bio 39be0d5109
Merge pull request #2480 from aignatov-bio/ai-sci-4457-fix-padding-dashboard-current-list 
Fix padding for current tasks widget [SCI-4457]
 2020-03-24 09:52:58 +01:00
Mojca Lorber 3a58bd3cd6 Disable selecting range at update column 2020-03-23 20:02:57 +01:00
Mojca Lorber 9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
aignatov-bio a5bdef07a2 Fix padding for current tasks widget 2020-03-20 17:01:54 +01:00
Mojca Lorber b4d5fb524b Fix new task modal css error 2020-03-20 10:21:56 +01:00
Mojca Lorber 7e36a4e357 Small support dropdown fixes 2020-03-17 15:44:57 +01:00
Alex Kriuchykhin 2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408 
Enable time fraction for task due date [SCI-4408]
 2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio 8164b0d0c6 Change placeholders for dashboards 2020-03-12 15:00:14 +01:00
aignatov-bio d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
Miha Mencin 26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
mlorb bea7a6172b
Merge pull request #2456 from mlorb/ml-sci-4412 
Remove academy link from navigation and move about modal to support menu [SCI-4412]
 2020-03-10 17:08:22 +01:00
aignatov-bio 63a5459d21 Add error handling to create task modal 2020-03-10 13:16:56 +01:00
Miha Mencin 9836a8b5a2
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown 
Prevent create empty dropdown in inventories [SCI-4352]
 2020-03-10 12:35:00 +01:00
Miha Mencin 62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
Mojca Lorber 6bf191d124 Remove academy link from navigation and move about modal to support menu 2020-03-06 14:36:22 +01:00
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
aignatov-bio d940c0a122
Merge pull request #2451 from aignatov-bio/ai-sci-4427-not-rounded-progress-bar 
Add rounded corners to porgress bar [SCI-4427]
 2020-03-05 14:53:12 +01:00
aignatov-bio d886a42c8e Fix team description white space 2020-03-05 14:47:48 +01:00
aignatov-bio 3494d1071e
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates 
Refactor current task widget [SCI-4416]
 2020-03-05 14:46:16 +01:00
aignatov-bio 79560e517d Fix markup 2020-03-05 14:40:46 +01:00
aignatov-bio 024fc5b421 Add rounded corners to porgress bar 2020-03-05 13:13:54 +01:00
Mojca Lorber 8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio d830fcec4a Remove locked task css and i18n 2020-03-04 14:56:06 +01:00
aignatov-bio 77d66b65b1 Refactor current task for addons integration 2020-03-04 13:21:52 +01:00
mlorb ba438e7728
Merge branch 'features/dashboard' into ml-sci-4354 2020-03-03 16:29:47 +01:00
aignatov-bio 7d7cdce91a Add file size limitation to tinyMCE 2020-03-03 15:55:17 +01:00
aignatov-bio 3dc94a225d Small visual improvments for current tasks widget 2020-03-03 14:21:16 +01:00
Mojca Lorber 7dfd1d5ba6 Small fixes 2020-03-03 13:52:36 +01:00
aignatov-bio 50810dc55e Fix markup 2020-03-03 09:53:44 +01:00
aignatov-bio d9bfd8c28e Add search to current task widget 2020-03-03 09:50:44 +01:00
Oleksii Kriuchykhin 73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
aignatov-bio 95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
aignatov-bio 6dcb8be849 Merge branch 'develop' into ai-sci-4380-saving-navigation-state 2020-02-28 14:14:08 +01:00
aignatov-bio 8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio a0015fe184
Merge pull request #2432 from aignatov-bio/ai-sci-4304-fix-assigned-task-position 
Fix assigned tasks position [SCI-4304]
 2020-02-28 13:54:19 +01:00
aignatov-bio 4aaeb2043f
Merge pull request #2433 from aignatov-bio/ai-sci-4390-change-new-inventory-button-design 
Change button style for new inventory [SCI-4390]
 2020-02-28 13:54:07 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
aignatov-bio 9e15d1ea42 Refactor experiment sidebar 2020-02-27 16:04:44 +01:00
aignatov-bio ace8613457 Fix z-index for dropdown 2020-02-27 13:16:11 +01:00
aignatov-bio b2580c1704 Prevent create empty dropdown in inventories 2020-02-27 13:10:00 +01:00
aignatov-bio 630412c18a Change button style for new inventory 2020-02-27 12:11:38 +01:00
aignatov-bio d31fc33873 Fic assigned tasks position 2020-02-27 11:47:47 +01:00
Alex Kriuchykhin bf1fac0b10
Merge pull request #2421 from aignatov-bio/ai-sci-4256-transparent-image-for-image-preview 
Add checkboard background for transparent images [SCI-4256]
 2020-02-26 17:46:48 +01:00
Mojca Lorber f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio 8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio 5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio 3b679bc53d
Merge pull request #2416 from aignatov-bio/ai-sci-4349-progress-bar-research 
Add progress bar for current tasks [SCI-4349]
 2020-02-21 10:01:57 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
aignatov-bio 01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
aignatov-bio f11b051715 Merge branch 'develop' into features/dashboard 2020-02-19 10:29:50 +01:00
aignatov-bio 5545d7da1a Add progress bar for current tasks 2020-02-18 14:28:06 +01:00
aignatov-bio 5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
aignatov-bio ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio a438f6b4f0 Finished filters 2020-02-17 10:47:10 +01:00
aignatov-bio 485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
mlorb 9f23f11dca
Merge pull request #2410 from mlorb/ml-sci-4309 
Hide pencil for shared inventory [SCI-4309]
 2020-02-13 15:12:17 +01:00
aignatov-bio a6186fba67 Change break limit 2020-02-13 14:44:59 +01:00
aignatov-bio 5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
Mojca Lorber 6fbecf3e88 Hide pencil for shared inventory 2020-02-12 20:28:15 +01:00
aignatov-bio 0381fef05b Move notifications to top navbar 2020-02-12 14:58:48 +01:00
aignatov-bio 5200096f69
Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown 
Improve search input field in the flyouts [SCI-4312]
 2020-02-12 14:16:06 +01:00
mlorb 8a9d495b77
Merge pull request #2398 from mlorb/ml-sci-4147 
Change repository name and team name to h2 [SCI-4147]
 2020-02-11 16:27:03 +01:00
aignatov-bio 26783e64da Fix protocols table CSS 2020-02-11 15:58:17 +01:00
aignatov-bio eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +01:00
Mojca Lorber 509e197f64 Change repository name and team name to h2 2020-02-11 13:18:33 +01:00
Mojca Lorber 7bcdc52de2 Fix share inventory button position 2020-02-10 13:13:18 +01:00
Oleksii Kriuchykhin 4547e4d61a Fix DateTime picker for repositories edit mode [SCI-4331] 2020-02-07 16:42:04 +01:00
mlorb f26ea42cc5
Merge pull request #2390 from mlorb/ml-sci-4265-v2 
Redesign clear buttons on global activities page [SCI-4265]
 2020-02-07 13:49:00 +01:00
Mojca Lorber e41df37a2e Small css fix after merging 2020-02-07 12:20:09 +01:00
Mojca Lorber 9068c20588 Redesign clear buttons on global activities page 2020-02-07 11:33:25 +01:00
mlorb ba597acf8d
Merge branch 'develop' into ml-sci-4217 2020-02-07 09:43:53 +01:00
Mojca Lorber a22fe28d24 Refactor new and edit renderer for file cell 2020-02-06 14:43:17 +01:00
aignatov-bio 665c178d79
Merge pull request #2386 from biosistemika/ai-sci-4325-add-css-for-connected-accounts 
Add connected account styling [SCI-4325]
 2020-02-05 14:07:06 +01:00
aignatov-bio f2539b052f Add connected account styling 2020-02-05 13:25:45 +01:00
mlorb 49bfb603c8
Merge pull request #2357 from mlorb/ml-sci-4130 
Sidebar redesign [SCI-4130]
 2020-02-04 09:55:00 +01:00
mlorb 415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283 
Implement missing style guide changes [SCI-4283]
 2020-02-04 09:37:48 +01:00
mlorb 7ad3527338
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes 
Visual fixes [SCI-4274]
 2020-02-03 09:44:48 +01:00
Mojca Lorber e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
mlorb 0ef066f921
Merge pull request #2365 from mlorb/ml-sci-4252 
Fix checklist list in inventory table [SCI-4252]
 2020-01-30 13:44:02 +01:00
aignatov-bio 9a9088a0da
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task 
Fix duplicate tags and small css issues [SCI-4279]
 2020-01-30 13:42:22 +01:00
aignatov-bio 44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1 
Fix small visual bugs [SCI-4254]
 2020-01-30 13:42:07 +01:00
mlorb bfd928b8fc
Merge pull request #2373 from mlorb/ml-sci-4293 
Fix buttons style [SCI-4293]
 2020-01-30 13:40:37 +01:00
mlorb a2afa11fef
Merge pull request #2378 from mlorb/ml-sci-4311 
Fix scroll position on protocol and result page [SCI-4311]
 2020-01-30 13:39:16 +01:00
Urban Rotnik 7813d3ab75
Merge pull request #2363 from urbanrotnik/ur-sci-4190 
Make less opacity when editing or adding row [SCI-4190]
 2020-01-30 13:24:20 +01:00
Urban Rotnik 64a7657f19
Merge pull request #2364 from urbanrotnik/ur-sci-4219 
Fix too long line problem[SCI-4219]
 2020-01-30 13:07:01 +01:00
aignatov-bio 2c595d01fc
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters 
Small fixes
 2020-01-29 15:48:19 +01:00
Urban Rotnik db6f1ecebb Set fixed width for preview dropdown 2020-01-29 15:11:42 +01:00
Mojca Lorber 9388883479 Fix scroll position on protocol and result page 2020-01-29 14:28:52 +01:00
Urban Rotnik 875515121b Fix Share button in repositories 2020-01-29 14:15:47 +01:00
aignatov-bio 970463f34d Fix input fields 2020-01-29 11:41:47 +01:00
aignatov-bio 4aa0a79c02 Fix resize repository 2020-01-29 11:00:48 +01:00
Miha Mencin 94cce6d57e
Revert "Fix repository data time range column width [SCI-4306]" 2020-01-28 16:25:21 +01:00
Mojca Lorber f502408e07 Fix buttons style 2020-01-28 15:30:57 +01:00
Mojca Lorber 1a834c206b Fix repository data time range column width 2020-01-28 15:12:09 +01:00
aignatov-bio 0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +01:00
Mojca Lorber b938c6ce35 Fix css for icons for repository file type 2020-01-28 11:32:48 +01:00
Urban Rotnik 6c50b514f3 Put Academy icon back, resize team switch 2020-01-27 17:15:22 +01:00
Urban Rotnik 83f4344bb7
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage 
Hide Edit/Delete buttons if user do not has permissions
 2020-01-27 16:35:07 +01:00
Mojca Lorber e6043ee0e5 Fix checklist list in inventory table 2020-01-27 15:52:52 +01:00
Urban Rotnik dc79174160 Make less opacity when editing or adding row 2020-01-27 14:39:45 +01:00
mlorb f605c0def3
Merge pull request #2358 from mlorb/ml-sci-4275 
Change to new style checkboxes on share inventory modal [SCI-4275]
 2020-01-27 13:38:30 +01:00
Mojca Lorber 276df8c151 Fix Safari inventories bug 2020-01-27 10:20:49 +01:00
Urban Rotnik d7761622ba Hide Edit/Delete buttons if user do not has permissions 2020-01-25 12:36:36 +01:00
Urban Rotnik ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Mojca Lorber 3af2f4af19 Change to new style checkboxes on share inventory modal 2020-01-24 15:43:13 +01:00
Mojca Lorber f5d245e7cc Sidebar redesign 2020-01-24 13:22:04 +01:00
aignatov-bio 24b296fd86 Fix duplicate tags and small css issues 2020-01-23 13:38:02 +01:00
aignatov-bio 4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
Mojca Lorber 658b64b617 Change button 2020-01-21 17:21:49 +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
aignatov-bio 5a4d74d487 Update emoji picker image loading 2020-01-21 15:49:13 +01:00
Mojca Lorber 981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
aignatov-bio bf9c7a70d4 Improve event handling 2020-01-21 14:01:44 +01:00
aignatov-bio 6a67280f6a Add new emoji picker 2020-01-21 10:50:55 +01:00
Urban Rotnik ed77d95abd
Merge pull request #2343 from urbanrotnik/ur-sci-4262-disable-columns-editing-on-task-page 
Hide new column button in modal [SCI-4262]
 2020-01-21 09:25:21 +01:00
Miha Mencin 96ed19ab22
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding 
Fix small css issues [SCI-4269]
 2020-01-21 09:22:56 +01:00
Urban Rotnik 42df748f87 Hide new column button in modal 2020-01-21 08:37:02 +01:00
aignatov-bio e022f7a096 Fix small css issues 2020-01-20 15:48:51 +01:00
Miha Mencin 239abfee33
Merge pull request #2340 from biosistemika/SCI-4218-remove-tooltips 
SCI-4218 prevent displaying tooltip on column type selection
 2020-01-20 15:25:28 +01:00
aignatov-bio 01cce84314
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown 
Update delimiter dropdown for manage column modal [SCI-4195]
 2020-01-20 15:22:40 +01:00
Miha Mencin ed7d275d9a SCI-4218 prevent displaying tooltip on column type selection 2020-01-20 14:42:16 +01:00
aignatov-bio cd471bfb25 Update delimiter dropdown for manage column modal 2020-01-20 14:26:17 +01:00
Urban Rotnik fc29641c2b Hide manage column action buttons on Task page 2020-01-17 17:29:26 +01:00
aignatov-bio e4e2e08456
Merge pull request #2325 from aignatov-bio/ai-sci-4239-2-fix-smartannotation-position 
Fix smart annotation position [SCI-4239]
 2020-01-17 14:39:54 +01:00
Miha Mencin 58db10ce7f
Merge pull request #2331 from urbanrotnik/ur-sci-4240-status-items-error-message 
Add error message for status item [SCI-4240]
 2020-01-17 14:07:42 +01:00
Miha Mencin 61ead41271
Merge pull request #2332 from urbanrotnik/ur-sci-4193-item-error-handling 
item error handling [SCI-4193] FIX
 2020-01-17 14:07:19 +01:00
aignatov-bio 597c88cacc Fix smart annotation position 2020-01-17 13:55:43 +01:00
Urban Rotnik 6bf08a9f3d Update counter visability 2020-01-17 11:59:46 +01:00
Urban Rotnik 2e8db12ca5 Add error message for status item 2020-01-17 11:25:01 +01:00
Mojca Lorber 8b635ac38a Refactor flash alerts 2020-01-17 10:49:41 +01:00
Mojca Lorber 36ecfbf7bf Redesign flash alerts 2020-01-16 19:08:14 +01:00
Alex Kriuchykhin 4a96fa2648
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode 
Disable column manage button in edit mode [SCI-4255]
 2020-01-16 16:37:29 +01:00
Urban Rotnik 7655dd0bea
Merge pull request #2321 from urbanrotnik/ur-sci-4257 
Remove Checklist item min length validation and modal fixes [SCI-4257]
 2020-01-16 16:02:30 +01:00
aignatov-bio b7fe8b71c1 Disable column manage button in edit mode 2020-01-16 15:59:57 +01:00
Urban Rotnik 469714c40d Remove Checklist item min length validation and modal fixes 2020-01-16 15:21:01 +01:00
Mojca Lorber a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Urban Rotnik 0522b9b0a3 Update too many items error showing 
Update too many items error showing
 2020-01-16 11:40:59 +01:00
aignatov-bio 1ff0351a74 Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories 2020-01-16 11:36:00 +01:00
aignatov-bio 509451daae Fix table header size 2020-01-16 11:26:23 +01:00
aignatov-bio cafc10f569 Fix datetime picker 2020-01-16 11:10:51 +01:00
Miha Mencin ac4154bd85 SCI-4210 fix css 2020-01-15 17:09:13 +01:00
aignatov-bio b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
mlorb e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
aignatov-bio 778264713f Fix pagination and update css 2020-01-15 13:55:11 +01:00
aignatov-bio 271d6db792
Merge pull request #2303 from aignatov-bio/ai-sci-4175-update-design-date-time-fields 
Update css and error handling for date and time fields [SCI-4175]
 2020-01-15 12:36:12 +01:00
Urban Rotnik 6d55b07fdc
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors 2020-01-15 09:10:43 +01:00
Mojca Lorber 16226640d5 changes upon Antons review 2020-01-14 16:46:48 +01:00
aignatov-bio 7ea6dbc67b Update css and error handling for date and time fields 2020-01-14 16:31:55 +01:00
Urban Rotnik 75c7cb7aa8 Keep circles for task page 2020-01-14 13:31:44 +01:00
aignatov-bio 79b020b97e Update table header color and update checkboxes 2020-01-14 11:39:15 +01:00
Mojca Lorber 9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
Urban Rotnik 1cf793127a Update cell color 2020-01-14 09:24:42 +01:00
Urban Rotnik 2468b67de0 Assign column update 2020-01-14 09:02:30 +01:00
aignatov-bio b37d8f1275 Update layout for repository 2020-01-13 14:46:43 +01:00
aignatov-bio 38eaf19dde Prevent editing 2 items 2020-01-09 15:19:04 +01:00
aignatov-bio 54c78cf4d1
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles 
Update colors and buttons
 2020-01-08 12:30:51 +01:00
aignatov-bio 5953c2543d Fix typo and boostrap load order 2020-01-08 12:07:33 +01:00
aignatov-bio 68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio f717ce66cb Fix tests 2020-01-06 12:31:56 +01:00
aignatov-bio 464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio e714787c38 Fix markup 2020-01-06 10:40:20 +01:00
aignatov-bio 18a8be43f5 Add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio d93095b489 Fix markup 2020-01-06 10:40:20 +01:00
aignatov-bio a281f09e7f Add reports and missed modals 2020-01-06 10:40:20 +01:00
aignatov-bio ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio aba3baf685 Fix colors 2020-01-06 10:40:20 +01:00
aignatov-bio 3f38b1e6a1 Add text input fields 2020-01-06 10:40:20 +01:00
aignatov-bio 443ab8645f Add toggles 2020-01-06 10:40:20 +01:00
aignatov-bio 7bfefd8659 Add checkboxes and radio buttons 2020-01-06 10:40:20 +01:00
aignatov-bio 9694117635 Add new colors and buttons 2020-01-06 10:40:20 +01:00
Urban Rotnik 181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
Mojca Lorber 46e7de0c25 Add new button style 2019-12-18 09:57:39 +01:00
aignatov-bio 7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
aignatov-bio 7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
aignatov-bio 2a38928b7a
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms 
Update drop-down for columns type selection [SCI-4068]
 2019-12-09 14:09:21 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
aignatov-bio eb708e4226 Update dropdown for column type selection 2019-12-06 16:14:16 +01:00
Urban Rotnik ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
Urban Rotnik 3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Urban Rotnik 5ae29d549e Add manage modal for DateTime values 2019-11-29 10:19:55 +01:00
Urban Rotnik 1c9d7ef6e7 Add File type renderer 2019-11-29 10:19:54 +01:00
Urban Rotnik 253205dcd1 Syntax improvements 2019-11-29 10:19:12 +01:00
Urban Rotnik 85153a5785 Split css file 2019-11-29 10:19:12 +01:00
Urban Rotnik 9bf948c3a8 Add statuses validation on FE 2019-11-29 10:19:11 +01:00
Urban Rotnik b9d50263c4 Add simple emoji picker 2019-11-29 10:19:11 +01:00
Urban Rotnik 621f7da37b Add fields for StatusItem 2019-11-29 10:19:10 +01:00
Urban Rotnik b2b6296cb5 Improve update items action, JS and views 2019-11-29 10:19:10 +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
Oleksii Kriuchykhin e8fdfe7111 Implement datatables renderer for status data type [SCI-4032] 2019-11-29 10:19:04 +01:00
aignatov-bio 9eec36cb01 Refactor column type edit modal 2019-11-29 10:17:58 +01:00
Mojca Lorber f1487561be Reafactor javascript repository column 2019-11-29 10:17:48 +01:00
Mojca Lorber 467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +01:00
aignatov-bio 4f5fada41f
Merge pull request #2236 from aignatov-bio/ai-sci-4117-ui-activities-fixes 
UI activtiies fixes [SCI-4117]
 2019-11-28 14:54:07 +01:00
aignatov-bio 990d8e1c3a
Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description 
Replace RTE with simple textarea [SCI-4088]
 2019-11-28 14:45:06 +01:00
aignatov-bio a87fc24251 UI activtiies fixes 2019-11-27 14:04:59 +01:00
aignatov-bio 3322676373 Replace RTE with simple textarea 2019-11-27 12:37:33 +01:00
aignatov-bio 75f29d7b04 Fix tag edit mode 2019-11-27 12:34:54 +01:00
aignatov-bio 8f2eaaacf9
Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page 
Update css for global activities page [SCI-4111]
 2019-11-25 14:08:33 +01:00
aignatov-bio 4a641ac03a
Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags 
Fix permission check and due date clear [SCI-4110]
 2019-11-25 13:55:20 +01:00
aignatov-bio e99fe2dbda Update css for global activties page 2019-11-25 11:09:37 +01:00
aignatov-bio fae8b252a6 Fix markup 2019-11-24 21:11:32 +01:00
aignatov-bio e76b4ca26f Fix permission check and due date clear 2019-11-24 21:06:34 +01:00