scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
7051 commits 70 branches 179 tags 165 MiB
Commit graph

5476 commits

Author SHA1 Message Date
Urban Rotnik 6d55b07fdc
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors 2020-01-15 09:10:43 +01:00
Urban Rotnik 2c86c2263d
Merge pull request #2298 from urbanrotnik/ur-sci-4230-cannot-create-checklist 
Fix empty checklist and dropdown column creation [SCI-4230]
 2020-01-15 09:09:17 +01:00
Urban Rotnik 2fd76d7f47
Merge pull request #2305 from urbanrotnik/ur-sci-4234-old-column-drop 
Add rescue block for setting default repository state [SCI-4234]
 2020-01-15 08:43:15 +01:00
Urban Rotnik bcce8235cc Add rescue block for setting default repository state 2020-01-14 23:49:02 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +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
Alex Kriuchykhin 4ca2981177
Merge pull request #2299 from okriuchykhin/ok_SCI_4224 
Fix repository filtering and improve speed [SCI-4224]
 2020-01-13 17:57:11 +01:00
Oleksii Kriuchykhin 01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Urban Rotnik 0a3359e815 Fix empty checklist and dropdown column creation 2020-01-13 15:48:55 +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
aignatov-bio 7ac1b45aaa
Merge pull request #2295 from aignatov-bio/ai-sci-fix-const-in-repository-show 
Fix const in repository show view
 2020-01-13 10:39:54 +01:00
aignatov-bio 6f78901d4e
Merge pull request #2294 from aignatov-bio/ai-sci-4124-fix-flash-message 
Fix flash message for datetime column [SCI-4124]
 2020-01-13 10:24:35 +01:00
aignatov-bio bdbb3712e6
Merge pull request #2293 from aignatov-bio/ai-sci-4223-add-smart-annotations-to-text-fields 
Add smart annotations to repository text value [SCI-4223]
 2020-01-13 10:24:22 +01:00
Alex Kriuchykhin 67b1bf4611
Merge pull request #2286 from urbanrotnik/ur-sci-4161-v2 
Fix for numeric item in SQL array [SCI-4161]
 2020-01-13 10:15:48 +01:00
aignatov-bio 189bf5762e Fix const in repository show view 2020-01-13 10:13:33 +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 bdb970b8d4 Fix flash message for datetime column 2020-01-10 13:22:29 +01:00
aignatov-bio 9ede0ef716 Fix big number in repository number value 2020-01-10 13:00:14 +01:00
aignatov-bio d5675c0c33 Add smart annotations to repository text value 2020-01-10 12:56:57 +01:00
Urban Rotnik 92f432b86a
Merge pull request #2285 from urbanrotnik/ur-sci-4154-export-and-import 
Export/Import for new column types [SCI-4153]
 2020-01-10 11:31:23 +01:00
Oleksii Kriuchykhin 4799e6a1eb Fix failing tests [ok_SCI_4197] 2020-01-10 11:09:47 +01:00
Urban Rotnik 9296f0eb4f Add extra format for exports 2020-01-10 11:09:30 +01:00
Urban Rotnik 824e116cfa Add presence validation for STI type on DateTime column types 2020-01-10 11:09:30 +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
Urban Rotnik 728823ed65 fixup! Fix for numeric item in SQL array 2020-01-10 09:46:25 +01:00
Oleksii Kriuchykhin ad5a5f3ebf Fix sorting for date time columns [SCI-4197] 2020-01-09 16:18:28 +01:00
aignatov-bio f494a97f99
Merge pull request #2290 from aignatov-bio/ai-sci-4200-fix-error-on-opening-inventory 
Fix error on opening inventory [SCI-4200]
 2020-01-09 16:00:12 +01:00
aignatov-bio 8a647ee003 Fix error on opening inventory 2020-01-09 15:32:28 +01:00
aignatov-bio 38eaf19dde Prevent editing 2 items 2020-01-09 15:19:04 +01:00
Alex Kriuchykhin 9e58b2a759
Merge pull request #2283 from okriuchykhin/ok_SCI_4212 
Fix repository status item deletion issue [SCI-4212]
 2020-01-09 15:06:17 +01:00
Alex Kriuchykhin 9ab07af87b
Merge pull request #2282 from okriuchykhin/ok_SCI_4149 
Disable comment edit mode if comment is not editable [SCI-4149]
 2020-01-09 15:06: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
Urban Rotnik 39593b6342 Fix for numeric item in SQL array 2020-01-09 11:24:38 +01:00
Oleksii Kriuchykhin 2ec27e54f3 Fix repository status item deletion issue [SCI-4212] 2020-01-08 17:32:07 +01:00
Oleksii Kriuchykhin 2faab14444 Fix repository table state updates after column creation/deletion [SCI-4196] 2020-01-08 16:16:54 +01:00
Oleksii Kriuchykhin 1624f9d5ab Disable comment edit mode if comment is not editable [SCI-4149] 2020-01-08 12:32:59 +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
Oleksii Kriuchykhin 522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +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
Alex Kriuchykhin 1e665804ab
Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export 
Add new column types to team export/import [SCI-4155]
 2020-01-07 15:47:09 +01:00
Alex Kriuchykhin 1de5e0a47b
Merge pull request #2264 from aignatov-bio/ai-sci-4157-add-new-columns-support-for-report 
Add helper for repository tables in docx report [SCI-4157]
 2020-01-07 15:33:12 +01:00
Oleksii Kriuchykhin 1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin 4df8779b19 Fix experiment template exporter [SCI-3988] 2020-01-07 15:26:21 +01:00
aignatov-bio a69e587706 Change cells loading in report repository helper 2020-01-07 14:21:55 +01:00
aignatov-bio 10b7aad732 Add ned column types to team export/import 2020-01-07 14:12:48 +01:00
Alex Kriuchykhin 71cb4bf6f6
Merge pull request #2266 from okriuchykhin/ok_SCI_4145 
Fix issue with clone & move task to another experiment [SCI-4145]
 2020-01-06 17:02:27 +01:00
Oleksii Kriuchykhin 16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +01:00
aignatov-bio c3c070c11a Update checklist formatted value 2020-01-06 13:03:05 +01:00
aignatov-bio 83f8df2012 Rebase branch and fix checklist formatted 2020-01-06 12:40:09 +01:00
aignatov-bio 4895f41238 Add helper for repository tables in docx report 2020-01-06 12:40:09 +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 c15bcf0769 Add search support for numeric 2020-01-06 10:12:11 +01:00
Urban Rotnik 87288d0771 Add search for statuses 2020-01-06 10:12:08 +01:00
aignatov-bio 3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model 
Refactor checklist column data structure [SCI-4168]
 2019-12-24 11:12:36 +01:00
Urban Rotnik 356ba6572d Fix naming 2019-12-24 08:13:30 +01:00
aignatov-bio 210292de07 Leave string_agg only for checklists 2019-12-23 21:36:56 +01:00
Urban Rotnik c286334c1d UpdateRepositoryRowService fix 2019-12-23 14:53:51 +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
aignatov-bio 725bb449d5 Fix naming 2019-12-23 09:20:36 +01:00
Miha Mencin 882ec711fe
Merge pull request #2276 from biosistemika/master 
Master
 2019-12-20 17:39:46 +01:00
Urban Rotnik 79b7d63116 JS fix 2019-12-20 16:14:39 +01:00
aignatov-bio 54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio 16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +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 f3bc6386c3 Fix partials renderer 2019-12-20 14:59:26 +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
Urban Rotnik 7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Oleksii Kriuchykhin b945171f2f Fix creation of new tasks on canvas [SCI-4171] 2019-12-19 15:48:25 +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 ac8aa88b88 Fix RepositoryTextValueSerializer [SCI-4166] 2019-12-18 16:37:21 +01:00
aignatov-bio dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +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
Mojca Lorber 46e7de0c25 Add new button style 2019-12-18 09:57:39 +01:00
Miha Mencin b67911c81a Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9 2019-12-17 14:48:50 +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
Alex Kriuchykhin 792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142 
Implement SSO with Azure AD [SCI-4142]
 2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin 0094528a02 Improve connected accounts unlinking [SCI-4142] 2019-12-12 14:57:27 +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
Oleksii Kriuchykhin 1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +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
Urban Rotnik 14ec728ae7 Update param for file deletion 2019-12-10 14:29:37 +01:00
Urban Rotnik d35f7119b7 Moved delete action to service 2019-12-10 14:29:37 +01:00
Urban Rotnik 5345cf0342 Updated date and time comparison 2019-12-10 14:29:36 +01:00
Urban Rotnik 5055490a23 Refactor asset value methods 2019-12-10 14:29:36 +01:00
Urban Rotnik 82b93bf9a4 Fix failing tests 2019-12-10 14:29:35 +01:00
Urban Rotnik 508a9b4e3e RepositoryRows controller refactor 2019-12-10 14:29:35 +01:00
Urban Rotnik b68aadf506 Update params nesting 2019-12-10 14:29:35 +01:00
Urban Rotnik dd9880f030 Add CreateRepositoryRowService 2019-12-10 14:29:34 +01:00
Urban Rotnik 98b89e9e80 Add UpdateRepositoryRowService 2019-12-10 14:29:34 +01:00
Urban Rotnik 0c990ef8cf Add functions for creating new cells with values 2019-12-10 14:29:34 +01:00
Urban Rotnik 5b710241e1 Add delete condition to update_data method on CellValues 2019-12-10 14:29:33 +01:00
Urban Rotnik 79a50860b6 Add methods update_data, data_changed, formatted for all types off ColumnValues 2019-12-10 14:29:29 +01:00
Mojca Lorber a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
mlorb 1122fe2d2f
Merge branch 'features/new-column-types' into ml-sci-4029 2019-12-10 10:54:41 +01:00
aignatov-bio 5ba8e6507e
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error 2019-12-10 10:36:30 +01:00
Alex Kriuchykhin 2e15548680
Merge pull request #2245 from okriuchykhin/ok_SCI_4107 
Fix TinyMCE images and avatars for export all [SCI-4107]
 2019-12-10 10:35:09 +01:00
Urban Rotnik c6a3c41019 Fix routes in dropdown 2019-12-10 10:13:41 +01:00
Urban Rotnik e764e856d8 Fix syntax error 2019-12-10 09:40:40 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
Alex Kriuchykhin 7a97f813b2
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix 
SCI-4109 fix the file copying
 2019-12-09 16:04:43 +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 643abc3fd7 Fixes 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 eca0c84bbd Fix tests 2019-12-06 14:20:37 +01:00
aignatov-bio 63edd3e877 Remove edit initialization from view mode 2019-12-06 13:26:47 +01:00
Urban Rotnik e934e08c17 Implement STI for DateTimeValue types 2019-12-06 12:50:19 +01:00
Urban Rotnik 06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Urban Rotnik 7661a24a44 Remove scope for before_action 2019-12-06 11:15:17 +01:00
Urban Rotnik 2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00