Zmago Devetak
|
29fe58de80
|
Merge pull request #1208 from ZmagoD/zd_SCI_2408
adds an additional check if some other user has added/removed reposit…
|
2018-06-13 11:30:43 +02:00 |
|
Zmago Devetak
|
2eb6613c6a
|
Merge pull request #1206 from ZmagoD/zd_SCI_2442
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-13 11:14:35 +02:00 |
|
Zmago Devetak
|
d457a66996
|
Merge pull request #1205 from ZmagoD/zd_SCI_2427
enables tooltip on long column names [fixes SCI-2427]
|
2018-06-13 11:14:29 +02:00 |
|
Zmago Devetak
|
a8981d7039
|
Merge pull request #1201 from ZmagoD/zd_SCI_2421
fixes bug with tinymce/at.js [fixes SCI-2421]
|
2018-06-13 11:14:17 +02:00 |
|
Zmago Devetak
|
673410251d
|
Merge pull request #1197 from ZmagoD/zd_SCI_2384
fixes repository table on sidebar toggle [fixes SCI-2384]
|
2018-06-13 09:57:27 +02:00 |
|
Zmago Devetak
|
50c1a712d8
|
Merge pull request #1204 from ZmagoD/zd_SCI_2434
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-13 08:42:13 +02:00 |
|
Zmago Devetak
|
6cab1746cd
|
Merge pull request #1202 from ZmagoD/zd_SCI_2392
prevents asset preview modal to close on click [fixes SCI-2392]
|
2018-06-13 08:41:41 +02:00 |
|
Zmago Devetak
|
e06ab02f68
|
Merge pull request #1192 from ZmagoD/zd_SCI_2435
removes visibility toggle from Name column [fixes SCI-2435]
|
2018-06-13 08:41:25 +02:00 |
|
Luka Murn
|
24b925c419
|
Merge branch 'Ducz0r-lm-sci-2431-fix'
|
2018-06-12 17:45:28 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
zmagod
|
f8ac083d39
|
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
|
2018-06-12 15:28:03 +02:00 |
|
Luka Murn
|
a66d65fb28
|
Fix the sign in halt layout
... so it's not dependant on common addon any more.
|
2018-06-12 14:47:15 +02:00 |
|
zmagod
|
1cff4a5060
|
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-12 10:22:48 +02:00 |
|
mlorb
|
8e90efa94b
|
Merge pull request #1203 from mlorb/ml-sci-2479
Fix truncation bug [SCI-2479]
|
2018-06-11 15:53:43 +02:00 |
|
zmagod
|
a8971b4e20
|
enables tooltip on long column names [fixes SCI-2427]
|
2018-06-11 15:22:56 +02:00 |
|
Zmago Devetak
|
a174e186bb
|
removes unneeded code
|
2018-06-11 15:00:13 +02:00 |
|
zmagod
|
256e502982
|
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-11 14:57:27 +02:00 |
|
mlorb
|
1e1330847f
|
remove unused code
|
2018-06-11 14:49:03 +02:00 |
|
mlorb
|
40f3365596
|
fix bug with truncating string
|
2018-06-11 14:47:25 +02:00 |
|
zmagod
|
32a09f9780
|
prevents asset preview modal to close on click [fixes SCI-2392]
|
2018-06-11 13:03:11 +02:00 |
|
zmagod
|
374a16abad
|
fixes bug with tinymce/at.js [fixes SCI-2421]
|
2018-06-11 10:18:35 +02:00 |
|
okriuchykhin
|
acd6efae57
|
Merge pull request #1200 from okriuchykhin/ok_SCI_2212
Add result content hook [SCI-2212]
|
2018-06-11 09:28:30 +02:00 |
|
Zmago Devetak
|
6ba5c587f7
|
Merge pull request #1189 from ZmagoD/zd_SCI_2211
add data-hook, refactor add user to project modal to support addons
|
2018-06-08 15:23:26 +02:00 |
|
Zmago Devetak
|
2d3738fc70
|
Merge pull request #1198 from ZmagoD/zd_SCI_2456
fixes label in save report to inventory item modal [fixes SCI-2456]
|
2018-06-08 15:08:53 +02:00 |
|
Zmago Devetak
|
a7dc4f8933
|
Merge pull request #1194 from ZmagoD/add_data_hook
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
|
2018-06-08 14:49:48 +02:00 |
|
Zmago Devetak
|
0b5c1e3ecc
|
Merge pull request #1195 from ZmagoD/zd_SCI_2487
fixes assign items flash message [fixes SCI-2487]
|
2018-06-08 14:40:48 +02:00 |
|
Zmago Devetak
|
eff68aead8
|
Merge pull request #1193 from ZmagoD/zd_SCI_2481_
fixes project validation message [fixes SCI-2481]
|
2018-06-08 14:40:27 +02:00 |
|
Zmago Devetak
|
74ccaf06b9
|
Merge pull request #1184 from ZmagoD/zd_SCI_2417
adds asset_text_data to global search options
|
2018-06-08 14:30:52 +02:00 |
|
Oleksii Kriuchykhin
|
87925271e8
|
Add result content hook [SCI-2212]
|
2018-06-08 14:22:03 +02:00 |
|
Luka Murn
|
b471719cc2
|
Merge pull request #1199 from Ducz0r/lm-sci-2397-fix
Fix buttons style on tags modal [SCI-2397]
|
2018-06-08 13:55:28 +02:00 |
|
Luka Murn
|
bfaedab4b4
|
Fix buttons style on tags modal
Closes SCI-2397.
|
2018-06-08 13:43:23 +02:00 |
|
zmagod
|
d78c130a47
|
fixes label in save report to inventory item modal [fixes SCI-2456]
|
2018-06-08 11:26:33 +02:00 |
|
zmagod
|
b7ecf09963
|
fixes repository table on sidebar toggle [fixes SCI-2384]
|
2018-06-08 10:58:28 +02:00 |
|
zmagod
|
f769215468
|
fixes assign items flash message [fixes SCI-2487]
|
2018-06-08 10:02:57 +02:00 |
|
zmagod
|
86c4093bf2
|
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
|
2018-06-08 09:41:04 +02:00 |
|
Luka Murn
|
eb29c50379
|
Fix asset link preview, fix inventory item modal window styling
|
2018-06-08 09:01:59 +02:00 |
|
Luka Murn
|
dbceac7aa4
|
Style inventories secondary navigation section
|
2018-06-08 08:31:22 +02:00 |
|
zmagod
|
11ebea573a
|
fixes project validation message [fixes SCI-2481]
|
2018-06-07 16:42:11 +02:00 |
|
Luka Murn
|
4cdfe67115
|
Fix protocol management filter display (css)
|
2018-06-07 15:57:59 +02:00 |
|
zmagod
|
51e024e3d7
|
adds data-hooks to reports and search results [fixes SCI-2374]
|
2018-06-07 14:29:40 +02:00 |
|
zmagod
|
c0b659a252
|
adds data-hook to repositories/show page
|
2018-06-07 10:50:48 +02:00 |
|
Luka Murn
|
b324a2dab3
|
Restyle activities page
|
2018-06-07 09:29:47 +02:00 |
|
Luka Murn
|
0417af716b
|
Remove new experiment button from canvas, change edit canvas btn
|
2018-06-06 17:41:07 +02:00 |
|
zmagod
|
43a60b632a
|
adds datahook to experiment card [fixes SCI-2373]
|
2018-06-06 17:28:04 +02:00 |
|
Luka Murn
|
c07fa5adc2
|
Update blank page for projects
|
2018-06-06 17:23:22 +02:00 |
|
Luka Murn
|
ff485cb75d
|
Update wording on 'save protocol to protocol repository' modal
|
2018-06-06 16:38:04 +02:00 |
|
Luka Murn
|
e0a3b5a941
|
Fix Save PDF to repository modal window
|
2018-06-06 16:29:07 +02:00 |
|
Luka Murn
|
b6c4f724db
|
Update text when no experiments are found for moving tasks
|
2018-06-06 16:10:55 +02:00 |
|
zmagod
|
a51ea399f4
|
removes unneeded empty lines
|
2018-06-05 16:39:22 +02:00 |
|
zmagod
|
66cac0b676
|
removes visibility toggle from Name column [fixes SCI-2435]
|
2018-06-05 16:36:36 +02:00 |
|