mlorb
4bf9369bc5
refactor buttons
2018-03-29 13:58:14 +02:00
okriuchykhin
31c68ab4bc
Merge pull request #1062 from okriuchykhin/ok_SCI_2201
...
Rescale Linkedin buttons [SCI-2201]
2018-03-28 15:23:05 +02:00
zmagod
7c1390ece2
implement sidebar toggle [fixes SCI-2232]
2018-03-28 14:12:11 +02:00
mlorb
22afa61b11
refactor colors
2018-03-28 13:54:01 +02:00
Luka Murn
bccf9f1a5b
Merge pull request #1064 from Ducz0r/lm-sci-2264-fix
...
Fix Office Online editing of files [SCI-2264]
2018-03-28 13:27:52 +02:00
Luka Murn
c07dc98cc8
Fix Office Online editing of files [SCI-2264]
...
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.
Closes SCI-2264.
2018-03-28 13:22:30 +02:00
okriuchykhin
13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11
...
merge release 1.12.11 branch to master
2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin
1ed0b16d12
Rescale Linkedin buttons [SCI-2201]
2018-03-27 15:00:28 +02:00
Luka Murn
18ef385c6e
Merge pull request #1061 from okriuchykhin/ok_SCI_2251_v2
...
Disable turbolinks on tasks navigation [SCI-2251]
2018-03-27 08:34:11 +02:00
Oleksii Kriuchykhin
31aed55ffc
Disable turbolinks on tasks navigation [SCI-2251]
2018-03-26 17:55:51 +02:00
okriuchykhin
b5dcd3aeb4
Merge pull request #1060 from biosistemika/revert-1056-ok_SCI_2251
...
Revert "Update turbolinks and fix repository table init [SCI-2251]"
2018-03-26 17:39:39 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]"
2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
fac5875cfd
Add repository name to record info modal [SCI-2205]
2018-03-26 16:18:09 +02:00
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
