Commit graph

3950 commits

Author SHA1 Message Date
okriuchykhin 784a4723cc
Merge pull request #1056 from okriuchykhin/ok_SCI_2251
Update turbolinks and fix repository table init [SCI-2251]
2018-03-26 14:23:30 +02:00
okriuchykhin fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin 5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +02:00
Oleksii Kriuchykhin 07070df1b4 Fix users profile edit form [SCI-2251] 2018-03-26 13:47:12 +02:00
okriuchykhin b1fcdb7474
Merge pull request #1057 from okriuchykhin/ok_SCI_2249
Fix sample assign permissions [SCI-2249]
2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
zmagod 8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +02:00
Zmago Devetak 2310439088
Merge pull request #1045 from ZmagoD/zd_SCI_2197
fixes import protocol bug for guest user [fixes SCI-2197]
2018-03-26 13:08:01 +02:00
zmagod c61efb0624 rename before_acton hook 2018-03-26 13:07:00 +02:00
mlorb b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2
Refactor project navigation [SCI-2120]
2018-03-26 12:56:19 +02:00
mlorb 0092be08cc refactor links 2018-03-26 12:11:59 +02:00
zmagod 3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
zmagod 9e1f285c9e adds missing labels [fixes SCI-2219] 2018-03-26 11:28:14 +02:00
mlorb 3c09150c7b
Merge pull request #1054 from mlorb/ml-sci-2238
Re-implement About sciNote modal [SCI-2238]
2018-03-26 11:00:50 +02:00
mlorb 1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
mlorb 3ad7963036
Merge pull request #1053 from mlorb/ml-sci-2245
Improve message for deleting sample/report items [SCI-2245]
2018-03-26 09:23:16 +02:00
mlorb 70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125
Implement new Help dropup in navigation [SCI-2125]
2018-03-26 09:22:39 +02:00
Oleksii Kriuchykhin aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin 83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin ecd3c73772 Skip asset if file is missing in protocol export [SCI-2250] 2018-03-25 13:36:24 +02:00
mlorb 83741358d1 fix locales 2018-03-23 16:19:06 +01:00
zmagod baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +01:00
mlorb eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb 2e81359ebb re-implement About sciNote modal 2018-03-23 15:14:49 +01:00
mlorb 5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +01:00
mlorb 9aa87a17e5 remove help helper 2018-03-23 14:26:53 +01:00
mlorb faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
okriuchykhin 12765e446d
Merge pull request #1048 from okriuchykhin/ok_SCI_2220
Refactor existing columns management to control only Column visibility and order [SCI-2220]
2018-03-23 11:57:39 +01:00
mlorb bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
zmagod 3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin 36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod 81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
zmagod 62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod 1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
mlorb 35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118
Code left-side menu bar [SCI-2118]
2018-03-20 14:40:55 +01:00
Zmago Devetak 75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068
Write server-side endpoints for custom repositories [SCI-2068]
2018-03-20 14:30:47 +01:00
mlorb 9cf9bf94c0 fix merge conflict 2018-03-20 14:30:07 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
mlorb e0926ddc3c code refactoring 2018-03-20 13:53:11 +01:00
okriuchykhin 935715a8c1
Merge pull request #1043 from okriuchykhin/ok_SCI_2193
Rename record to item in repository row info modal [SCI-2193]
2018-03-20 09:53:34 +01:00
okriuchykhin 5b1951e01e
Merge pull request #1044 from okriuchykhin/ok_SCI_2117
Remove Power Up button [SCI-2117]
2018-03-20 09:53:17 +01:00
zmagod 064bd88584 fix assigned query 2018-03-19 17:49:09 +01:00
okriuchykhin d906baff61
Merge pull request #1039 from okriuchykhin/ok_SCI_1697
Improve connections between repository models [SCI-1697]
2018-03-19 16:42:55 +01:00
Zmago Devetak 8349b08575
Merge pull request #1012 from ZmagoD/zd_SCI_2024_fix_custom_repositores_import
Fix custom repositories import so it supports "list of values" custom column types  [fixes SCI-2024]
2018-03-19 16:41:11 +01:00
okriuchykhin 2356b78044
Merge pull request #1042 from okriuchykhin/ok_SCI_2201
Use larger LinkedIn sign-in button [SCI-2201]
2018-03-19 16:23:22 +01:00
zmagod c46da5cc67 fixes import protocol bug for guest user [fixes SCI-2197] 2018-03-19 16:10:28 +01:00
okriuchykhin 06fe9dac51
Merge pull request #1015 from okriuchykhin/ok_SCI_1849_v2
Add team export/import scripts [SCI-1849]
2018-03-19 15:40:43 +01:00
Zmago Devetak 255ff32605
Merge pull request #1041 from ZmagoD/zd_SCI_2194
adds permission check to archived project  SCI-2194
2018-03-19 15:39:37 +01:00
Oleksii Kriuchykhin acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin 79fd2fbb2f Rename record to item in repository row info modal [SCI-2193] 2018-03-18 13:51:40 +01:00