scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
7204 commits 69 branches 179 tags 166 MiB
Commit graph

1740 commits

Author SHA1 Message Date
Urban Rotnik 96457d07bb Scroll left on new item in datatables 2020-01-16 16:34:45 +01:00
aignatov-bio d32201ad58 Fix smart annotation position 2020-01-16 16:28:51 +01:00
mlorb 8e4d0e9ff6
Merge pull request #2320 from mlorb/ml-sci-4069-v2 
Add emojionearea for status column type [SCI-4069]
 2020-01-16 16:00:36 +01:00
aignatov-bio b7fe8b71c1 Disable column manage button in edit mode 2020-01-16 15:59:57 +01:00
Miha Mencin e75d85c198
Merge pull request #2318 from biosistemika/SCI-4250-prevent-selecting-inventory-item 
SCI-4250 disable row selection when vieweng selected checklist items
 2020-01-16 15:29:13 +01:00
Mojca Lorber a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Miha Mencin 6460d6e879 fix typo, fix codestyle 2020-01-16 14:50:31 +01:00
Urban Rotnik 3a24d3150d Remove error on new file select, fix for new row file cells 2020-01-16 13:49:34 +01:00
Miha Mencin 29458375ab SCI-4250 disable row selection when vieweng selected checklist items 2020-01-16 13:39:49 +01:00
Urban Rotnik 218316bea2 Update error handling for name and text 2020-01-16 13:30:05 +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 2cb167ba7a Fix markup 2020-01-16 10:54:18 +01:00
aignatov-bio 96e1d4a7d0 Add new error handling 2020-01-16 10:51:37 +01:00
Miha Mencin ce3b4450cc
Merge pull request #2314 from biosistemika/SCI-4210-fix-styling-of-checklist-in-view-mode 
[SCI-4210][SCI-4189] show checklist as link, hide edit, copy, delete buttons when no items selected
 2020-01-15 18:16:45 +01:00
Alex Kriuchykhin 077ad7cad1
Merge pull request #2307 from okriuchykhin/ok_SCI_4233 
Unify view and edit modes for number cells [SCI-4233]
 2020-01-15 18:01:41 +01:00
Miha Mencin 960843c008 SCI-4210 move hiding and showing toolbar one level lower 2020-01-15 17:49:25 +01:00
aignatov-bio a10e7de9a6 Fix smart annotation window position 2020-01-15 17:19:56 +01:00
aignatov-bio b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
Alex Kriuchykhin 967acb0af3
Merge pull request #2312 from okriuchykhin/ok_SCI_4237 
Improve user experience for repository saving and fix checklist saving [SCI-4237]
 2020-01-15 16:36:40 +01:00
Alex Kriuchykhin 6e24dd4eb6
Merge pull request #2308 from okriuchykhin/ok_SCI_4226 
Disable repository filtering in edit mode [SCI-4226]
 2020-01-15 15:43:17 +01:00
Miha Mencin b23c874f9e
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost 
Sci 4199 selected checklist is lost
 2020-01-15 15:28:34 +01:00
Miha Mencin 79ad164166
Merge pull request #2311 from biosistemika/SCI-4202-dropdown-not-closing-after-select 
SCI-4202 add close param
 2020-01-15 15:27:11 +01:00
Oleksii Kriuchykhin bb32117796 Improve user experience for repository saving and fix checklist saving [SCI-4237] 2020-01-15 15:23:03 +01:00
Miha Mencin 5085e55f22 fix status selection as well 2020-01-15 15:22:05 +01:00
Miha Mencin df43c4c15f SCI-4202 add close param 2020-01-15 14:52:06 +01:00
mlorb e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
Mojca Lorber c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Miha Mencin 5bfa5c7939 SCI-4199 disabling delimiter, adding warning 2020-01-15 13:59:28 +01:00
Oleksii Kriuchykhin dd48a2902d Disable repository filtering in edit mode [SCI-4226] 2020-01-15 12:44:57 +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
Oleksii Kriuchykhin 470f6ff541 Unifify view and edit modes for number cells [SCI-4233] 2020-01-15 12:16:17 +01:00
aignatov-bio 2a83c6bae2 Update hidden field for time cell 2020-01-15 09:48:18 +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
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
aignatov-bio accd1d9e16
Merge pull request #2297 from aignatov-bio/ai-sci-4207-fix-datable-overflow 
Update layout for repository [SCI-4207]
 2020-01-13 15:13:39 +01:00
aignatov-bio b37d8f1275 Update layout for repository 2020-01-13 14:46:43 +01:00
aignatov-bio ac2f431a0b
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value 
Fix big number in repository number value [SCI-4221]
 2020-01-13 10:42:13 +01:00
Alex Kriuchykhin 007cae39e8
Merge pull request #2291 from okriuchykhin/ok_SCI_4197 
Fix sorting for date time columns [SCI-4197]
 2020-01-10 15:25:53 +01:00
aignatov-bio 9ede0ef716 Fix big number in repository number value 2020-01-10 13:00:14 +01:00
aignatov-bio 751d34a078
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders 
Update placeholders for cells [SCI-4192]
 2020-01-10 10:50:00 +01:00
Alex Kriuchykhin f1babb2237
Merge pull request #2279 from okriuchykhin/ok_SCI_4000 
Fix sidebar update for inline editing [SCI-4000]
 2020-01-10 10:34:27 +01:00
Alex Kriuchykhin d2e12e0683
Merge pull request #2265 from okriuchykhin/ok_SCI_4146 
Restrict files to only images in RTE fields [SCI-4146]
 2020-01-10 10:34:00 +01:00
aignatov-bio e371715331
Merge pull request #2289 from aignatov-bio/ai-sci-4215-prevent-editing-two-items 
Prevent editing 2 items [SCI-4215]
 2020-01-10 10:13:30 +01:00
Oleksii Kriuchykhin ad5a5f3ebf Fix sorting for date time columns [SCI-4197] 2020-01-09 16:18:28 +01:00
aignatov-bio 38eaf19dde Prevent editing 2 items 2020-01-09 15:19:04 +01:00
Alex Kriuchykhin 704c89a7d6
Merge pull request #2284 from okriuchykhin/ok_SCI_4196 
Fix repository table state updates after column creation/deletion [SCI-4196]
 2020-01-09 15:05:51 +01:00
aignatov-bio 13675dd2e7 Update placeholders for cells 2020-01-09 14:57:37 +01:00
aignatov-bio 9fdea4657c Update validation for repository text field 2020-01-09 13:32:03 +01:00
Oleksii Kriuchykhin 2faab14444 Fix repository table state updates after column creation/deletion [SCI-4196] 2020-01-08 16:16:54 +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 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
Oleksii Kriuchykhin 16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +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 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
Urban Rotnik 356ba6572d Fix naming 2019-12-24 08:13:30 +01:00
Urban Rotnik 7116034b34 Update new renderer for StatusList 2019-12-23 14:40:15 +01:00
Urban Rotnik 400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
Urban Rotnik 79b7d63116 JS fix 2019-12-20 16:14:39 +01:00
Urban Rotnik fa6b1fa0db JS fixes 2019-12-20 15:19:30 +01:00
Urban Rotnik 181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
Urban Rotnik 1531d44e6b Add DateTime validators 2019-12-20 14:59:23 +01:00
Urban Rotnik 2e88f194bc Fix tests 2019-12-20 14:58:14 +01:00
Urban Rotnik dfe3c5292e Add TimeRange and DateRange renderer 2019-12-20 14:57:04 +01:00
Urban Rotnik 5d4453470a Add DateTimeRange renderer 2019-12-20 14:56:11 +01:00
Urban Rotnik 2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Alex Kriuchykhin 0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166 
Add view/edit renderers for numeric data type [SCI-4166]
 2019-12-19 11:57:13 +01:00
Oleksii Kriuchykhin e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Urban Rotnik 7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
Oleksii Kriuchykhin dc8ff18d68 Fix issue with clone & move task to another experiment [SCI-4145] 2019-12-17 11:54:34 +01:00
Oleksii Kriuchykhin 403a3e0140 Restrict files to only images in RTE fields [SCI-4146] 2019-12-16 16:05:40 +01:00
aignatov-bio eed56b59aa Fix markup 2019-12-11 15:08:18 +01:00
aignatov-bio 52c0782447 Fix checklist update 2019-12-11 15:05:02 +01:00
aignatov-bio 7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
aignatov-bio 7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Urban Rotnik 14ec728ae7 Update param for file deletion 2019-12-10 14:29:37 +01:00
Urban Rotnik b68aadf506 Update params nesting 2019-12-10 14:29:35 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +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 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
aignatov-bio c4a87bed52 Fix autosave for marvinJS in tinyMCE 2019-12-09 11:23:01 +01:00
aignatov-bio eb708e4226 Update dropdown for column type selection 2019-12-06 16:14:16 +01:00
Urban Rotnik 64c6159354 Update require JS 2019-12-06 10:39:21 +01:00
Urban Rotnik 2ec99fa696 Add new renderer for File, Status and List 2019-12-05 09:19:19 +01:00
Urban Rotnik ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
aignatov-bio d643a08a9c
Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task 
Fix task activity page [SCI-4137]
 2019-12-03 09:09:36 +01:00
aignatov-bio 010a44650c Fix task activity page 2019-12-02 16:04:50 +01:00
aignatov-bio 2d4104b0f2 Fix smart annotation for autosave 2019-12-02 15:53:42 +01:00
Urban Rotnik 3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Urban Rotnik d797469e38 Fix for hidden columns 2019-12-02 08:08:49 +01:00
aignatov-bio 84e47f5b4c Fix autosave in steps and result 2019-11-29 16:10:14 +01:00
Urban Rotnik 3a76753b72 Add Edit renderer for ListColumnType 2019-11-29 12:52:27 +01:00
Urban Rotnik 5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik 65d8d0e35b DateTime HTML and JS simplified 2019-11-29 10:19:57 +01:00
Urban Rotnik d9178f4617 Remove .off handlers for columns JS 2019-11-29 10:19:56 +01:00
Urban Rotnik bc1c377f63 Fix html 2019-11-29 10:19:56 +01:00
Urban Rotnik 9ea61578f1 Generic custom trigger event for loading partial 2019-11-29 10:19:55 +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
aignatov-bio 3474f72c41 Change JS load order 2019-11-29 10:19:49 +01:00
Urban Rotnik 64d797678a Small syntax improvement 2019-11-29 10:19:13 +01:00
Urban Rotnik 0eb5c5671f LoadParams refactor 2019-11-29 10:19:13 +01:00
Urban Rotnik 253205dcd1 Syntax improvements 2019-11-29 10:19:12 +01:00
Urban Rotnik dc6cc3bc62 Show after create flash messages 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 b2ce600820 Add delimiter column for repository_column 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 db2943a1b7 Strip length of dropdown items, unique items, add specific params to request 2019-11-29 10:19:09 +01:00
Urban Rotnik 6fbb99c8d2 Add List items partial and JS 2019-11-29 10:19:09 +01:00
Urban Rotnik 24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Oleksii Kriuchykhin 7efcf5abcf Cleanup updateButtons method [SCI-4070] 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin 3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +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 2024afce4b Fix markup 2019-11-29 10:19:04 +01:00
aignatov-bio c6a075664c Add default renders for new columns type 2019-11-29 10:19:04 +01:00
aignatov-bio 232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio a0f11116d2 Add render views for datatables 2019-11-29 10:18:59 +01:00
aignatov-bio 6d0f0dd3e2 Fix messages for manage columns modal 2019-11-29 10:18:11 +01:00
aignatov-bio 28de55acce Fix url variables for manage columns 2019-11-29 10:18:06 +01:00
aignatov-bio 308c1c93d0 Fix merge 2019-11-29 10:18:02 +01:00
aignatov-bio 9eec36cb01 Refactor column type edit modal 2019-11-29 10:17:58 +01:00
Mojca Lorber 305104f639 Refactor text inventory type 2019-11-29 10:17:53 +01:00
Mojca Lorber a269c8462d Fix hound 2019-11-29 10:17:50 +01:00
Mojca Lorber 006a422e25 Refactor again 2019-11-29 10:17:49 +01:00
Mojca Lorber fe8829b592 Fix multiple load of modal 2019-11-29 10:17:49 +01:00
Mojca Lorber f1487561be Reafactor javascript repository column 2019-11-29 10:17:48 +01:00
Mojca Lorber c47d0017a0 fix failed tests 2019-11-29 10:17:48 +01:00
Mojca Lorber 9d4796cf90 refactor repository column javascript 2019-11-29 10:17:44 +01:00
Mojca Lorber 467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +01:00
aignatov-bio bcd9c6aee3
Merge pull request #2238 from aignatov-bio/ai-sci-4101-improve-time-zone-date-format-interaction 
Improve time zone and date format interaction at preference page [SCI-4101]
 2019-11-28 14:54:30 +01:00
aignatov-bio 06a11a4a49 Improve time zone and date format interaction at preference page 2019-11-27 15:14:40 +01:00
aignatov-bio a87fc24251 UI activtiies fixes 2019-11-27 14:04:59 +01:00
aignatov-bio ad137b47df
Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action 
Fix dropdown event after click browser back action [SCI-4097]
 2019-11-25 13:58:04 +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 993424d08e
Merge pull request #2226 from aignatov-bio/ai-sci-4086-fix-team-name-after-update 
Fix name update and path to team [SCI-4086]
 2019-11-25 13:55:09 +01:00
aignatov-bio 179dea085f Fix dropdown event after click browser back action 2019-11-25 11:28:11 +01:00
aignatov-bio e76b4ca26f Fix permission check and due date clear 2019-11-24 21:06:34 +01:00
aignatov-bio 7fa753ca81 Fix name update and path to team 2019-11-23 23:20:38 +01:00
aignatov-bio 84a9d764e0 Add arrows controll for dropdown 2019-11-23 21:09:34 +01:00