scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-05 23:25:46 +08:00
Code Issues Projects Releases Packages Wiki Activity
3699 commits 39 branches 184 tags 168 MiB
Commit graph

1187 commits

Author SHA1 Message Date
zmagod
2a5c4daa9d fix file preview [SCI-2313] 2018-04-20 09:29:08 +02:00
Zmago Devetak
487fb1fb48
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2 
Zd sci 2239 v2
 2018-04-19 18:00:19 +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
zmagod
a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb
c149b3cc2a refactoring 2018-04-19 15:12:26 +02:00
mlorb
56e00740c1 fix blocked buttons edit and eye icon 2018-04-19 14:40:46 +02:00
mlorb
58bdce557d
Merge pull request #1098 from mlorb/ml-sci-2306 
Fix project navigation to work with archived pages and… [SCI-2306]
 2018-04-19 14:17:32 +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
66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
mlorb
c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
mlorb
600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
Zmago Devetak
a0f549e935
Merge pull request #1093 from ZmagoD/zd_SCI_2296 
hides the create new inventory button for non admin users [fixes SCI-…
 2018-04-16 16:18:15 +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
zmagod
0adc06b1a1 adds edit repository item permission to normal user [fixes SCI-2297] 2018-04-13 13:11:29 +02:00
Zmago Devetak
0815111cae
Merge pull request #1090 from ZmagoD/zd_SCI_2293 
fixes edin/destory button on repository page after redirected from co…
 2018-04-13 09:58:01 +02:00
zmagod
9812a9f160 adds correct preview images to files [fixes SCI-2254] 2018-04-13 09:43:14 +02:00
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
3c5ce09bcd fixes edin/destory button on repository page after redirected from columns_management page [fixes SCI-2293] 2018-04-12 17:09:53 +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
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +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
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
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