scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity
3649 commits 39 branches 184 tags 168 MiB
Commit graph

1166 commits

Author SHA1 Message Date
Zmago Devetak
f5127bad99
Merge pull request #1088 from ZmagoD/zd_SCI_2290 
remove catched views [fixes SCI-2290]
 2018-04-13 08:24:28 +02:00
zmagod
f2c314cc85 fix indentation 2018-04-12 17:12:45 +02:00
zmagod
d084998906 remove unneeded label in destroy repository record modal [fixes SCI-2292] 2018-04-12 15:00:41 +02:00
zmagod
5f5829bbe4 fix indentation 2018-04-12 14:49:51 +02:00
zmagod
123f3b796b remove catched views [fixes SCI-2290] 2018-04-12 14:48:14 +02:00
Luka Murn
fa603b54b8
Merge pull request #930 from okriuchykhin/ok_SCI_1860 
Remove tutorial [SCI-1860]
 2018-04-12 14:46:20 +02:00
zmagod
b4deb232c0 rename variable: not_in_repository => display_image_tag 2018-04-12 13:40:17 +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
233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076 
add asset field preview/sort/search in repository table [fixes SCI-2076]
 2018-04-09 14:29:45 +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
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
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
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
mlorb
b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
zmagod
515c95061c fixes delete column action 2018-04-05 09:56:09 +02:00
zmagod
afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +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
zmagod
d47337fbf3 remove destroy column modal 2018-04-05 08:51:21 +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
525a1c15ca fixes hound 2018-04-04 16:40:07 +02:00
mlorb
58433f4218 fix merge bananas 2018-04-04 16:36:26 +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
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
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
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
mlorb
4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
zmagod
7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +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
mlorb
0092be08cc refactor links 2018-03-26 12:11:59 +02:00