zmagod
38b84edfb0
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-04-04 12:59:41 +02:00
zmagod
e630d3113f
add ID column to repository [fixes SCI-2206]
2018-04-04 11:55:11 +02:00
Zanz2
4259fa44f9
Merge pull request #1069 from Zanz2/remotipart_workaround
...
Remotipart workaround [SCI-2270]
2018-04-04 11:27:30 +02:00
Zanz2
7f36ab3e5e
deleted require and gemfile entry for remotipart
2018-04-04 11:12:39 +02:00
Zmago Devetak
685255afbc
Merge pull request #1065 from ZmagoD/zd_SCI_2222
...
refactor smart annotation parser, adds repository item to smart annot…
2018-04-04 11:07:29 +02:00
zmagod
8a156ad91e
change method name
2018-04-03 13:05:25 +02:00
mlorb
11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243
...
Style Guide - refactor colors, typography and buttons [SCI-2243]
2018-04-03 11:30:02 +02:00
zmagod
3d5137b56f
change export model wording [fixes SCI-2239]
2018-04-03 11:22:23 +02:00
okriuchykhin
f20aebbed0
Merge pull request #1071 from okriuchykhin/ok_SCI_2265
...
Fix repository rows permissions [SCI-2265]
2018-04-03 11:03:41 +02:00
mlorb
e5e92eb215
fix the rest of the constants
2018-04-03 10:28:39 +02:00
zmagod
7dfec94ffc
remove samples from smart annotations
2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin
d8d2d75631
Fix repository rows permissions [SCI-2265]
2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
Zanz2
2fab3e4caa
Overlooked a small change #2
2018-04-02 20:05:06 +02:00
Zanz2
25619e5e01
Overlooked a small change
2018-04-02 20:02:59 +02:00
Zanz2
1606982966
found a hackish fix by doing a manual ajax call and some other things with jquery
2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin
b7c31d704f
Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222
2018-04-01 11:10:18 +02:00
mlorb
6a20c37449
fix travis againnnnn
2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin
f656ad1561
Fix fa icons [SCI-2217]
2018-03-30 17:03:44 +02:00
mlorb
5f0d33d75e
fix travis again
2018-03-30 16:47:23 +02:00
Zmago Devetak
f5f6fa4a4f
Merge pull request #1066 from ZmagoD/zd_SCI_2235
...
updated repository import modal html [fixes SCI-2235]
2018-03-30 14:32:53 +02:00
okriuchykhin
a6d45fea0a
Merge pull request #1059 from okriuchykhin/ok_SCI_2205
...
Add repository name to record info modal [SCI-2205]
2018-03-30 14:02:53 +02:00
mlorb
69b83a3f3d
fix travis
2018-03-30 12:50:06 +02:00
Oleksii Kriuchykhin
cc855cda86
Fix translations [SCI-2205]
2018-03-30 12:48:34 +02:00
okriuchykhin
5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
...
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
mlorb
10b5e1de84
refactor typography
2018-03-30 09:54:57 +02:00
zmagod
802e917e69
updated repository import modal html [fixes SCI-2235]
2018-03-30 09:47:27 +02:00
zmagod
fd88104fe2
adds manage repository link in repository actions dropdown
2018-03-29 17:10:57 +02:00
zmagod
56b0900619
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-03-29 16:42:10 +02:00
zmagod
01a548e8b3
fix hound
2018-03-29 16:11:21 +02:00
zmagod
659a088058
refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]
2018-03-29 15:55:26 +02:00
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
