scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 22:44:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
3661 commits 43 branches 185 tags 169 MiB
Commit graph

448 commits

Author SHA1 Message Date
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
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
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
mlorb
8a35ce5c58 add locales 2018-04-09 10:53:03 +02:00
mlorb
0c851f227c remove unused locals 2018-04-06 15:00:19 +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
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
zmagod
3d5137b56f change export model wording [fixes SCI-2239] 2018-04-03 11:22:23 +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
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
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
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
Oleksii Kriuchykhin
fac5875cfd Add repository name to record info modal [SCI-2205] 2018-03-26 16:18:09 +02:00
Oleksii Kriuchykhin
e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
zmagod
8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +02:00
mlorb
b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2 
Refactor project navigation [SCI-2120]
 2018-03-26 12:56:19 +02:00
zmagod
3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
zmagod
9e1f285c9e adds missing labels [fixes SCI-2219] 2018-03-26 11:28:14 +02:00
mlorb
1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
mlorb
70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125 
Implement new Help dropup in navigation [SCI-2125]
 2018-03-26 09:22:39 +02:00
mlorb
83741358d1 fix locales 2018-03-23 16:19:06 +01:00
zmagod
baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +01:00
mlorb
eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb
bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
zmagod
3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin
36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod
81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
zmagod
62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
mlorb
884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00