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
099cc29abb
fix tests
2018-05-28 09:29:46 +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
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
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
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
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
69d1f0511f
Rename sciNote -> SciNote (app/ folder)
2018-05-21 15:19:11 +02:00
Luka Murn
cea18a44d5
Rename sciNote -> SciNote (app/javascript folder)
2018-05-21 15:18:30 +02:00
Luka Murn
6135081a71
Update new repository row code so file columns work again
...
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.
Closes SCI-2436.
2018-05-21 14:46:30 +02:00
zmagod
ba2aafae39
fix access to public reports [fixes SCI-2340]
2018-05-21 14:45:18 +02:00
Zmago Devetak
2ac04ee476
Merge pull request #1150 from ZmagoD/zd_SCI_2426
...
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-21 14:15:47 +02:00
Zmago Devetak
67127b4d89
Merge pull request #1151 from ZmagoD/zd_SCI_2344_v2
...
shorten project name [fixes SCI-2344]
2018-05-21 14:15:24 +02:00
Luka Murn
91673afbf3
Merge pull request #1149 from Ducz0r/lm-remove-unnecessary-save-on-notifications
...
Remove unnecessary save on notifications
2018-05-21 13:53:23 +02:00
okriuchykhin
6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403
...
Change remove file button appearence [SCI-2403]
2018-05-18 17:34:56 +02:00
mlorb
0fccc71fc3
fix load protocol wording and UI-style
2018-05-18 16:57:18 +02:00
mlorb
c2cf52bb34
add another toggle button
2018-05-18 16:34:01 +02:00
mlorb
81392362ac
Final button colour changes
2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin
b79b0b79cf
Change remove file button appearence [SCI-2403]
2018-05-18 14:51:45 +02:00
zmagod
5514683f96
shorten project name [fixes SCI-2344]
2018-05-18 14:12:12 +02:00
zmagod
b8098093ee
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-18 13:57:52 +02:00
Luka Murn
5e90ae7383
Remove uneccesary save when setting notification settings on user
...
These methods should behave as the rest of setters on
ActiveRecords, ergo setting the model state, but not saving it.
The save is called at the end of the action inside the controller
anyway, so this save is redundant.
2018-05-18 13:43:04 +02:00
mlorb
876717e355
add pointer cursor to arrow
2018-05-18 13:34:52 +02:00
mlorb
64cbddb9a0
UI/UX restyle - update colours for navigation
2018-05-18 10:41:32 +02:00
