Luka Murn
|
80323eaf67
|
Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle
Conflicts:
app/assets/javascripts/sidebar_toggle.js.erb
|
2018-05-28 12:39:24 +02:00 |
|
mlorb
|
705a453818
|
Merge pull request #1172 from mlorb/ml-sci-2405
fix error if user is not assigned to any teams [SCI-2405]
|
2018-05-28 12:36:06 +02:00 |
|
Luka Murn
|
e611e76fae
|
Fix Hound errors
|
2018-05-28 11:53:49 +02:00 |
|
mlorb
|
2bce62cab8
|
Merge branch 'ux-release-1' into ml-sci-2405
|
2018-05-28 11:43:14 +02:00 |
|
mlorb
|
f791234ec7
|
changes on Zmago's request
|
2018-05-28 11:36:37 +02:00 |
|
Zmago Devetak
|
9513efa3f3
|
Merge pull request #1173 from ZmagoD/zd_SCI_2451
fixes sidebar animation [fixes SCI-2451]
|
2018-05-28 11:18:07 +02:00 |
|
Zmago Devetak
|
792b134737
|
Merge pull request #1170 from ZmagoD/zd_SCI_2437
adds flash_message div in manage repository column page
|
2018-05-28 10:32:06 +02:00 |
|
zmagod
|
485993f2f6
|
fixes sidebar animation [fixes SCI-2451]
|
2018-05-28 10:28:35 +02:00 |
|
mlorb
|
58ba596a24
|
update locales
|
2018-05-28 09:38:24 +02:00 |
|
mlorb
|
099cc29abb
|
fix tests
|
2018-05-28 09:29:46 +02:00 |
|
zmagod
|
bcebc03416
|
adds missing locales
|
2018-05-28 09:17:29 +02:00 |
|
Luka Murn
|
f8c8887d72
|
Forgot to remove the constant
|
2018-05-27 17:23:50 +02:00 |
|
Luka Murn
|
b3ae1d8fa6
|
Remove some dead code, make sidebar toggle animated
|
2018-05-27 16:24:47 +02:00 |
|
Luka Murn
|
b86edf20a5
|
Remove auto-toggling of navigation sidebar depending on width
|
2018-05-27 15:44:15 +02:00 |
|
Luka Murn
|
8b527d8a5b
|
Restyle left side menu bar so it also works with lower heights
|
2018-05-27 15:24:49 +02:00 |
|
Luka Murn
|
6e6b6803e6
|
Remove session-stored toggle state of navigation bar
|
2018-05-27 15:24:11 +02:00 |
|
Luka Murn
|
ce4883522a
|
Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary
Change login button color to green
|
2018-05-25 17:15:57 +02:00 |
|
Luka Murn
|
0fc278a74c
|
Merge pull request #1169 from biosistemika/lm-remove-report-sidebar-file
Delete _report_sidebar.html.erb
|
2018-05-25 17:15:27 +02:00 |
|
mlorb
|
f02363dfce
|
fix error if user is not assigned to any teams
|
2018-05-25 17:14:22 +02:00 |
|
Luka Murn
|
23d8dc0b31
|
Change login button color to green
What it says, change it to `btn-primary`.
|
2018-05-25 17:05:00 +02:00 |
|
zmagod
|
6512970b9c
|
adds flash_message div in manage repository column page
|
2018-05-25 14:36:15 +02:00 |
|
Luka Murn
|
c76b926387
|
Delete _report_sidebar.html.erb
This file is no longer needed from my research.
|
2018-05-25 11:04:05 +02:00 |
|
okriuchykhin
|
815616aac1
|
Merge pull request #1167 from okriuchykhin/ok_SCI_2428
Fix search in repositories [SCI-2428]
|
2018-05-25 11:03:46 +02:00 |
|
Luka Murn
|
fe3ddb7c65
|
Update code so it works
|
2018-05-25 08:50:27 +02:00 |
|
Oleksii Kriuchykhin
|
46d6accf78
|
Fix search in repositories [SCI-2428]
|
2018-05-24 17:14:40 +02:00 |
|
Zmago Devetak
|
280a926554
|
Merge pull request #1159 from ZmagoD/zd_SCI_2372
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
|
2018-05-24 16:05:56 +02:00 |
|
zmagod
|
06f1daf7a9
|
rename data-hook
|
2018-05-24 16:02:56 +02:00 |
|
Zmago Devetak
|
efaefb3dfc
|
Merge pull request #1154 from ZmagoD/zd_SCI_2340
fix access to public reports [fixes SCI-2340]
|
2018-05-24 16:01:23 +02:00 |
|
zmagod
|
bbbe06e491
|
fixes reports index for guest users
|
2018-05-24 15:28:54 +02:00 |
|
zmagod
|
1f8db7bc49
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340
|
2018-05-24 15:00:59 +02:00 |
|
mlorb
|
f466c4afa4
|
Merge pull request #1163 from mlorb/ml-sci-2425
Fix bug with protocol preview does not open… [SCI-2425]
|
2018-05-24 13:46:16 +02:00 |
|
Luka Murn
|
c9f3de9f27
|
Improve toggle
|
2018-05-24 13:39:04 +02:00 |
|
mlorb
|
c5e62207eb
|
fix bug with protocol preview does not open on protocols containing files
|
2018-05-24 11:51:27 +02:00 |
|
mlorb
|
f972676f8d
|
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
Update software with new logo & new brand [SCI-2416]
|
2018-05-23 15:47:17 +02:00 |
|
mlorb
|
9da4fc9fbc
|
Merge pull request #1160 from mlorb/ml-sci-2271
Change icons throughout sciNote - navigation, project, task cards [SCI-2271]
|
2018-05-23 14:19:25 +02:00 |
|
mlorb
|
3368e3b963
|
Merge branch 'ux-release-1' into ml-sci-2271
|
2018-05-23 14:06:54 +02:00 |
|
mlorb
|
2bb2f8d193
|
Merge pull request #1161 from mlorb/ml-sci-2350
move the open/close arrow to the bottom of left menu [SCI-2350]
|
2018-05-23 14:01:12 +02:00 |
|
mlorb
|
00657a78a5
|
Merge pull request #1162 from mlorb/ml-sci-2440-v2
fix toggle button on inventory page [SCI-2440]
|
2018-05-23 14:01:02 +02:00 |
|
okriuchykhin
|
7b08529e39
|
Merge pull request #1156 from okriuchykhin/ok_SCI_2342
Enable editing office online files in inventories [SCI-2342]
|
2018-05-23 12:59:12 +02:00 |
|
okriuchykhin
|
f61f069c95
|
Merge pull request #1157 from okriuchykhin/ok_SCI_2432
Init selectpicker for move workflow to another experiment modal [SCI-2432]
|
2018-05-23 12:58:58 +02:00 |
|
mlorb
|
5e689f6b4d
|
fix toggle button on inventory page
|
2018-05-23 11:20:42 +02:00 |
|
mlorb
|
79f1a1c0ad
|
fix padding and change label colors
|
2018-05-23 11:13:28 +02:00 |
|
mlorb
|
7b5ec4ae3f
|
move the open/close arrow to the bottom of left menu
|
2018-05-23 09:44:46 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
zmagod
|
e97a98f189
|
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
|
2018-05-22 14:18:40 +02:00 |
|
Luka Murn
|
31a1641b42
|
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix
Update new repository row code so file columns work again [SCI-2436]
|
2018-05-22 09:27:32 +02:00 |
|
mlorb
|
e3fc0237c1
|
Merge pull request #1153 from mlorb/ml-sci-2440
Final button colour changes [SCI-2440]
|
2018-05-21 16:29:04 +02:00 |
|
Oleksii Kriuchykhin
|
39b74d6f8a
|
Init selectpicker for move workflow to another experiment modal [SCI-2432]
|
2018-05-21 16:12:39 +02:00 |
|
Oleksii Kriuchykhin
|
5c41527b92
|
Enable editing office online files in inventories [SCI-2342]
|
2018-05-21 15:48:48 +02:00 |
|
Luka Murn
|
0b33775419
|
Update the logo.png - new logo
|
2018-05-21 15:45:14 +02:00 |
|