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

5536 commits

Author SHA1 Message Date
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
Urban Rotnik 64c6159354 Update require JS 2019-12-06 10:39:21 +01:00
Oleksii Kriuchykhin 7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
aignatov-bio 29f4b6fe79
Merge pull request #2248 from aignatov-bio/ai-sci-4125-search-doesnt-find-file-content 
Fix file post process method [SCI-4125]
 2019-12-05 12:48:03 +01:00
aignatov-bio 9fe6e7b538 Fix markup 2019-12-05 11:27:52 +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 6c057a86c9 Update git version 2019-12-03 13:31:13 +01:00
aignatov-bio 42dac51241 Fix markup 2019-12-03 10:38:21 +01:00
aignatov-bio be87d50bfa Remove YOMU serrver 2019-12-03 10:35:54 +01:00
aignatov-bio d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Miha Mencin 8caa88fc7e Merge branch 'release-1-17-7' of github.com:biosistemika/scinote-web into release-1-17-7 2019-12-03 09:10:55 +01:00
Miha Mencin 80579043b2 Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7 2019-12-03 09:10:09 +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 f148ae8b24
Merge pull request #2242 from aignatov-bio/ai-sci-4136-fix-smart-annotation-on-autosave 
Fix smart annotation for autosave [SCI-4136]
 2019-12-03 09:09:16 +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
aignatov-bio 43ff9f6f26 Fix experiment copy 2019-12-02 15:34: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
Alex Kriuchykhin fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098 
Refactor Azure configuration  and connected accounts [SCI-4098]
 2019-11-29 11:30:33 +01:00
Urban Rotnik 5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik cac4c11071 Typo fix 2019-11-29 10:19:57 +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 cb0fe049f0 Remove range method from model 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 f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik f30664a7b3 Add inverse_of option 2019-11-29 10:19:15 +01:00
Urban Rotnik aee806edaa Add methods for repository_date_time_value 2019-11-29 10:19:14 +01:00
Urban Rotnik 2a20ad68a3 Add range column to RepositoryColumn 2019-11-29 10:19:14 +01:00
Urban Rotnik fe4aa12ced Add DateTime columns CRUD endpoints 2019-11-29 10:19:14 +01:00
Urban Rotnik b591346a3f Add DateTime type column 2019-11-29 10:19:13 +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 804e36650e Add service for updating ListColumnItems 2019-11-29 10:19:09 +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
Urban Rotnik 1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Urban Rotnik 7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin 7efcf5abcf Cleanup updateButtons method [SCI-4070] 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin 371f699a11 Fix AR preloading for repository table [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin 3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin 220c3f8eeb Fix repository columns default state [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin 73be1181ac Fix failing tests for repository states [SCI-4070] 2019-11-29 10:19:05 +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 0f3c138a7e Fix markup 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 bcb8cc1840 Remove byebug 2019-11-29 10:17:54 +01:00
Mojca Lorber 305104f639 Refactor text inventory type 2019-11-29 10:17:53 +01:00
Urban Rotnik 37b7d5aa64 Use values from extends 2019-11-29 10:17:52 +01:00
Urban Rotnik f645ff52ab Refactor ColumnServices 2019-11-29 10:17:52 +01:00
Urban Rotnik 28d7a4f284 Refactor FileColumnController 2019-11-29 10:17:51 +01:00
Urban Rotnik 1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +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 482deafdd3 Rename partial 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
Urban Rotnik 43e81c46b7 Rename CreateColumnService to ColumnService 2019-11-29 10:16:46 +01:00
Urban Rotnik 5923e8897a Remove commented code 2019-11-29 10:16:46 +01:00
Urban Rotnik b55966487e Remove permission helper 2019-11-29 10:16:46 +01:00
Urban Rotnik 4cb3d1b6f0 Add BaseColumnsController for column_types controllers 2019-11-29 10:16:45 +01:00
Urban Rotnik 14b43d516e Add UpdateStatusColumnService service 2019-11-29 10:16:45 +01:00
Urban Rotnik de2ee66dd4 Add DeleteStatusColumnService service 2019-11-29 10:16:44 +01:00
Urban Rotnik 5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
Urban Rotnik bbb8c46fe2 Add CreateStatusColumnService service 2019-11-29 10:16:44 +01:00
Urban Rotnik c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Mojca Lorber dda5ffe4f9 Add create repository column service 2019-11-29 10:16:43 +01:00
aignatov-bio 70d721bb99 Add text method for assets 2019-11-29 10:16:42 +01:00
aignatov-bio 2ed3054c89 Make repository value render more flexible 2019-11-29 10:16:42 +01:00
Oleksii Kriuchykhin 6c7f45fc20 Add simplified view for sign-in form [SCI-4098] 2019-11-28 17:00:43 +01:00
aignatov-bio e07fad72b6
Merge pull request #2235 from aignatov-bio/ai-sci-4116-update-filter-logic-for-activities 
Update filter logic for activities [SCI-4116]
 2019-11-28 14:58:53 +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 a87cc3ae98
Merge pull request #2237 from aignatov-bio/ai-sci-4114-fix-task-and-protocol-description-activities 
Add task description and task protocol description activities [SCI-4114]
 2019-11-28 14:54:20 +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
Miha Mencin 13191f1a72
Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user 
Sci 4058 disable inventory delition for normal user
 2019-11-28 14:31:32 +01:00
Oleksii Kriuchykhin f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +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 68284c10da Add task description and task protocol description activities 2019-11-27 14:37:53 +01:00
aignatov-bio a87fc24251 UI activtiies fixes 2019-11-27 14:04:59 +01:00
aignatov-bio 3d9351c537 Update filter logic for activities 2019-11-27 13:13:19 +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
Oleksii Kriuchykhin 6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Alex Kriuchykhin 111056a032
Merge pull request #2224 from okriuchykhin/ok_SCI_4112 
Fix adding experiment contents to report [SCI-4112]
 2019-11-26 09:50:28 +01:00
Miha Mencin a328c4ad56 fix CR comments 2019-11-25 17:40:29 +01:00
Miha Mencin d74cad3b8c
Merge pull request #2231 from biosistemika/SCI-4108-bug-at-report-generation 
SCI-4108 Docx report error because of checklist does not have any item
 2019-11-25 17:33:20 +01:00
Miha Mencin b968de96c7
Merge pull request #2232 from biosistemika/SCI-4109-export-with-assigned-item-bugfix 
SCI-4109 fix the file copying
 2019-11-25 17:32:34 +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 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 d732b2f1a6
Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags 
Add strict order to module tags in modal [SCI-4090]
 2019-11-25 13:55: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 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
Miha Mencin 48fc7708f8 SCI-4109 fix the file copying 2019-11-25 13:38:16 +01:00
Miha Mencin 72c158d3e2 SCI-4108 check if there are any checklist items before rendering the checklist 2019-11-25 11:55:02 +01:00
aignatov-bio 179dea085f Fix dropdown event after click browser back action 2019-11-25 11:28:11 +01:00
aignatov-bio e99fe2dbda Update css for global activties page 2019-11-25 11:09:37 +01:00
Miha Mencin e65e344c39 fix styling 2019-11-25 10:45:21 +01:00
aignatov-bio 5100ab4d08 Add strict order to module tags in modal 2019-11-25 10:15:06 +01:00
Miha Mencin bd34435b39 fixing style issues 2019-11-25 08:44:33 +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
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
Oleksii Kriuchykhin 8f94c85b7a Fix adding experimaent contents to report [SCI-4112] 2019-11-22 14:57:59 +01:00
Miha Mencin 1bf6663196 check the permissions in before action 2019-11-22 13:23:02 +01:00
aignatov-bio 96523ae131 Update CSS for team preferences and enable autosave 2019-11-22 10:46:44 +01:00
aignatov-bio 2e30f50ae8
Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields 
Add autosave for protocol keywords, user preferences and due date [SCI-3976]
 2019-11-21 13:13:10 +01:00
aignatov-bio c712e4e48c Fix due date moda 2019-11-21 13:05:36 +01:00
aignatov-bio 0b04ca4012 Fix markup 2019-11-21 12:19:47 +01:00
aignatov-bio f2ed3198d5 Add due date autosave field 2019-11-21 12:14:43 +01:00
Miha Mencin 04a6645cfc Separate view/edit/modify permissions SCI-4058 2019-11-20 17:12:47 +01:00