Commit graph

6916 commits

Author SHA1 Message Date
Mojca Lorber
c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Mojca Lorber
16226640d5 changes upon Antons review 2020-01-14 16:46:48 +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
c5fea73187
Merge pull request #2296 from urbanrotnik/ur-sci-4026-renew-assign-column
Assign column update [SCI-4026]
2020-01-14 09:56:33 +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
0e391f6751 Fix tests [SCI-4224] 2020-01-13 17:17:07 +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
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
36c606c8a4
Merge pull request #2287 from aignatov-bio/ai-sci-4213-update-validation-for-repository-text-fields
Update validation for repository text field [SCI-4213]
2020-01-09 14:58:24 +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
Alex Kriuchykhin
f5004a1ba0
Merge pull request #2281 from biosistemika/features/new-column-types
Merge features/new-column-types to develop
2020-01-07 16:30:48 +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