scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-15 13:45:25 +08:00
Code Issues Projects Releases Packages Wiki Activity
4110 commits 31 branches 181 tags 166 MiB
Commit graph

140 commits

Author SHA1 Message Date
zmagod
2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +02:00
Zmago Devetak
29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408 
adds an additional check if some other user has added/removed reposit…
 2018-06-13 11:30:43 +02:00
Luka Murn
9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
zmagod
f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +02:00
Luka Murn
eb29c50379 Fix asset link preview, fix inventory item modal window styling 2018-06-08 09:01:59 +02:00
zmagod
c0b659a252 adds data-hook to repositories/show page 2018-06-07 10:50:48 +02:00
Luka Murn
c07fa5adc2 Update blank page for projects 2018-06-06 17:23:22 +02:00
mlorb
f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb
64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
mlorb
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
mlorb
ca022fead7 rename inventories buttons 2018-05-03 10:39:50 +02:00
mlorb
f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
mlorb
9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod
078645332b add permission to column management [fixes SCI-2297] 2018-04-20 09:34:12 +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
zmagod
a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb
c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +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
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
zmagod
b4deb232c0 rename variable: not_in_repository => display_image_tag 2018-04-12 13:40:17 +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
zmagod
ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19: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
zmagod
b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +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