scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
4261 commits 77 branches 180 tags 167 MiB
Commit graph

4261 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
zmagod
24acd5c779 fixes per @duco 's request 2018-04-26 14:13:46 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
mlorb
97d619ab51 fix tests again 2018-04-26 13:47:31 +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
zmagod
23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +02:00
Zmago Devetak
ac10f9fdb1
Merge pull request #1117 from ZmagoD/zd_SCI_2187 
remove task description info from canvas task card [fixes SCI-2187]
 2018-04-26 09:42:47 +02:00
Zmago Devetak
a6b2bb0228
Merge pull request #1120 from ZmagoD/zd_SCI_2338 
add permission check to repostiory show action [fixes SCI-2338]
 2018-04-26 09:41:43 +02:00
mlorb
e077c7dbf6 fix tests 2018-04-25 14:34:23 +02:00
mlorb
9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod
12365b3f0f add permission check to repostiory show action [fixes SCI-2338] 2018-04-25 11:56:30 +02:00
zmagod
589389fa8e fixex failing specs 2018-04-25 11:00:22 +02:00
Luka Murn
bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +02:00
zmagod
4d6e995481 add dismiss buttons back 2018-04-25 10:43:16 +02:00
zmagod
c026044322 fixes flash message [fixes SCI-2142] 2018-04-25 07:32:49 +02:00
zmagod
796e7c9822 sign_out user after 7 days [fixes SCI-2323] 2018-04-24 15:42:31 +02:00
zmagod
3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +02:00
zmagod
7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
zmagod
c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
Zmago Devetak
1e4a975304
Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2 
rename smart annotations icons [fixes SCI-2307]
 2018-04-24 10:11:30 +02:00
zmagod
3431ab2da3 fix failing spec 2018-04-24 09:53:26 +02:00
zmagod
de6c40a921 fix failing specs 2018-04-24 09:47:16 +02:00
zmagod
503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
zmagod
f56f457c78 fixes failing specs 2018-04-23 13:34:56 +02:00
Zmago Devetak
096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124 
adds new reports index page [fixes SCI-2124]
 2018-04-23 12:42:24 +02:00
zmagod
efd1e470f6 rename smart annotations icons [fixes SCI-2307] 2018-04-23 12:38:54 +02:00
zmagod
199a2a23bf fixes per @mlorb 's request 2018-04-23 12:26:21 +02:00
zmagod
824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn
c0da83c5de Add some additional nil guards 2018-04-20 12:31:22 +02:00
Luka Murn
d023db16af Update the destroy_column action so it properly updates all states 2018-04-20 12:31:22 +02:00
Luka Murn
68caf56ec2 Add comment to constants 2018-04-20 12:31:22 +02:00
Luka Murn
caab0cf55c Update the ordering upon table load 2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn
d8ca42aa0c Refactor repository_table_state and its class methods 2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
zmagod
e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
Zmago Devetak
645e9a19d8
Merge pull request #1108 from ZmagoD/zd_SCI_2313 
fix file preview [SCI-2313]
 2018-04-20 10:38:23 +02:00
Zmago Devetak
76c4202664
Merge pull request #1110 from ZmagoD/zd_SCI_2311 
fixes controller action in manage_columns
 2018-04-20 10:36:31 +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
Zmago Devetak
e94f1ad6aa
Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3 
add permission to column management [fixes SCI-2297]
 2018-04-20 09:57:30 +02:00
zmagod
74f23ee461 fixes controller action in manage_columns 2018-04-20 09:53: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
zmagod
078645332b add permission to column management [fixes SCI-2297] 2018-04-20 09:34:12 +02:00
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
mlorb
ab4a66756e
Merge pull request #1107 from mlorb/ml-sci-2314 
Fix file preview background [SCI-2314]
 2018-04-19 17:59:01 +02:00
Zmago Devetak
6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307 
change repository icon
 2018-04-19 17:58:48 +02:00
zmagod
ec5a8336b9 fixes failing spec 2018-04-19 17:46:44 +02:00
mlorb
72c79013de fix file preview background 2018-04-19 17:40:24 +02:00