zmagod
|
e96b690a5b
|
removes reports link from secondary navigation, fix bug with turbolinks
|
2018-04-20 11:57:52 +02:00 |
|
zmagod
|
dafa29d4bf
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124
|
2018-04-20 10:33:15 +02:00 |
|
mlorb
|
3249d5db0d
|
Merge pull request #1100 from mlorb/ml-sci-2303
Update reports show page to work with new navigation [SCI-2303]
|
2018-04-20 09:50:35 +02:00 |
|
Zmago Devetak
|
93fc1af12d
|
Merge pull request #1083 from ZmagoD/zd_SCI_2259
set limit on maximum number of dropdown list items [fixes SCI-2259]
|
2018-04-19 17:17:54 +02:00 |
|
Zmago Devetak
|
1290435372
|
Merge pull request #1086 from ZmagoD/zd_SCI_2207
enables copying of repository items [fixes SCI-2207]
|
2018-04-19 17:13:43 +02:00 |
|
mlorb
|
d7eccac289
|
Merge pull request #1099 from mlorb/ml-sci-2167
Remove breadcrumbs throughout application [SCI-2167]
|
2018-04-19 16:11:37 +02:00 |
|
Zmago Devetak
|
540dff25e7
|
Merge pull request #1091 from ZmagoD/zd_SCI_2254
adds correct preview images to files [fixes SCI-2254]
|
2018-04-19 14:04:24 +02:00 |
|
zmagod
|
ce52eb851b
|
add validation to dropdown items
|
2018-04-19 14:02:42 +02:00 |
|
zmagod
|
66cc76f640
|
add view label in locales
|
2018-04-19 12:49:32 +02:00 |
|
zmagod
|
9d282d1800
|
adds new reports index page [fixes SCI-2124]
|
2018-04-18 16:47:52 +02:00 |
|
mlorb
|
cc34376253
|
update reports show page to work with new navigation
|
2018-04-18 14:40:53 +02:00 |
|
Luka Murn
|
2290b75f8a
|
Merge pull request #1097 from biosistemika/lm-fix-production-compiling
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
|
2018-04-17 17:46:01 +02:00 |
|
mlorb
|
c08d72be36
|
remove breadcrumbs throughout application
|
2018-04-17 17:00:04 +02:00 |
|
Luka Murn
|
a633861e1f
|
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
This should fix the command rails assets:precompile for production
environment.
|
2018-04-17 09:05:19 +02:00 |
|
mlorb
|
04a20ab7ec
|
change links
|
2018-04-16 17:05:22 +02:00 |
|
zmagod
|
bef166ff30
|
hides the create new inventory button for non admin users [fixes SCI-2296]
|
2018-04-13 13:39:58 +02:00 |
|
Zmago Devetak
|
d466fdf8e8
|
Merge pull request #1089 from ZmagoD/zd_SCI_2292
remove unneeded label in destroy repository record modal [fixes SCI-2…
|
2018-04-12 16:58:28 +02:00 |
|
Zmago Devetak
|
09e5579f0f
|
Merge pull request #1087 from ZmagoD/zd_SCI_2240
rename Repository/Library => Inventory [fixes SCI-2240]
|
2018-04-12 16:58:08 +02:00 |
|
Zmago Devetak
|
9d58292dcf
|
fix
|
2018-04-12 16:44:38 +02:00 |
|
Zmago Devetak
|
f83390e5ad
|
fix
|
2018-04-12 16:20:05 +02:00 |
|
zmagod
|
d084998906
|
remove unneeded label in destroy repository record modal [fixes SCI-2292]
|
2018-04-12 15:00:41 +02:00 |
|
Luka Murn
|
09c60d2468
|
Fixes per @Ducz0r's request
|
2018-04-12 14:38:22 +02:00 |
|
zmagod
|
309bd04e61
|
rename Repository/Library => Inventory [fixes SCI-2240]
|
2018-04-12 14:11:26 +02:00 |
|
Luka Murn
|
9bf8b5d864
|
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
|
2018-04-12 13:16:46 +02:00 |
|
zmagod
|
6291857bbf
|
enables copying of repository items [fixes SCI-2207]
|
2018-04-11 17:17:19 +02:00 |
|
mlorb
|
a10f671184
|
Merge pull request #1081 from mlorb/ml-sci-2123
Refactor settings into the new navigation bar [SCI-2123]
|
2018-04-09 13:21:16 +02:00 |
|
zmagod
|
b12f6f1b92
|
set limit on maximum number of dropdown list items [fixes SCI-2259]
|
2018-04-09 12:50:25 +02:00 |
|
mlorb
|
8a35ce5c58
|
add locales
|
2018-04-09 10:53:03 +02:00 |
|
Zmago Devetak
|
bdb6554870
|
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
adds manage columns page
|
2018-04-06 17:06:28 +02:00 |
|
mlorb
|
0c851f227c
|
remove unused locals
|
2018-04-06 15:00:19 +02:00 |
|
mlorb
|
70dfe66b2d
|
refactoring
|
2018-04-06 14:20:40 +02:00 |
|
zmagod
|
cf7761daaa
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
|
2018-04-06 12:56:39 +02:00 |
|
mlorb
|
b8e91e91a1
|
refactor settings into the new navigation bar
|
2018-04-05 16:30:02 +02:00 |
|
zmagod
|
a8a19df06d
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
|
2018-04-05 08:51:58 +02:00 |
|
okriuchykhin
|
e608d629c7
|
Merge pull request #1068 from okriuchykhin/ok_SCI_2217
Refactor file preview modal [SCI-2217]
|
2018-04-05 00:18:43 +02:00 |
|
Oleksii Kriuchykhin
|
9720063fb3
|
Fix tests [SCI-2217]
|
2018-04-05 00:06:11 +02:00 |
|
zmagod
|
0c05c60ebf
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
|
2018-04-04 16:06:38 +02:00 |
|
Zmago Devetak
|
ab48e4f527
|
Merge pull request #1072 from ZmagoD/zd_SCI_2239
change export model wording [fixes SCI-2239]
|
2018-04-04 15:40:18 +02:00 |
|
Zmago Devetak
|
d1f3a65279
|
Merge pull request #1073 from ZmagoD/zd_SCI_2206
add ID column to repository [fixes SCI-2206]
|
2018-04-04 15:39:59 +02:00 |
|
zmagod
|
77f80271dd
|
fixes per @mojca 's request
|
2018-04-04 14:52:59 +02:00 |
|
Oleksii Kriuchykhin
|
3b7977ee3b
|
Merge latest changes from ux-release-1 [SCI-2217]
|
2018-04-04 14:20:34 +02:00 |
|
zmagod
|
5eb007f4d2
|
fixes per @mlorb 's request
|
2018-04-04 13:22:14 +02:00 |
|
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 |
|
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 |
|
mlorb
|
e5e92eb215
|
fix the rest of the constants
|
2018-04-03 10:28:39 +02:00 |
|
Oleksii Kriuchykhin
|
51860652c1
|
Refactor smart annotations modal [SCI-2223]
|
2018-04-02 20:38:56 +02:00 |
|
Oleksii Kriuchykhin
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +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 |
|