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
3886 commits 39 branches 184 tags 168 MiB
Commit graph

3092 commits

Author SHA1 Message Date
mlorb
ca022fead7 rename inventories buttons 2018-05-03 10:39:50 +02:00
zmagod
f04677600b fix the missing icons on task card [fixes SCI-2347] 2018-05-03 10:05:40 +02:00
zmagod
0584453575 fixes per @okriuchykhin 's request 2018-04-26 17:18:03 +02:00
zmagod
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
0afe461962 fixes download link 2018-04-26 17:00:51 +02:00
mlorb
f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb
763d934aa7 fix buttons again 2018-04-26 15:02:24 +02:00
zmagod
e9642cadad Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304 2018-04-26 14:26:30 +02:00
zmagod
ca539cdce8 remove samples from search 2018-04-26 14:25:02 +02:00
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
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
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
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
503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +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
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
mlorb
72c79013de fix file preview background 2018-04-19 17:40:24 +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
ea4d3f815b add back needed code 2018-04-19 16:51:37 +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
zmagod
bb3e1b4dcf change repository icon 2018-04-19 15:39:24 +02:00
zmagod
f555e8cea4 fix error message 2018-04-19 15:32:14 +02:00
mlorb
8753df7ce3
Merge pull request #1103 from mlorb/ml-sci-2309 
Fix top navigation style [SCI-2309]
 2018-04-19 15:16:27 +02:00
mlorb
50a4ae6163
Merge pull request #1104 from mlorb/ml-sci-2312 
Fix blocked buttons edit and eye icon [SCI-2312]
 2018-04-19 15:15:25 +02:00
mlorb
c149b3cc2a refactoring 2018-04-19 15:12:26 +02:00
mlorb
5f93da27f2
Merge pull request #1102 from mlorb/ml-sci-2308 
Fix screen responsiveness [SCI-2308]
 2018-04-19 14:55:49 +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
ce52eb851b add validation to dropdown items 2018-04-19 14:02:42 +02:00
mlorb
c1832969b4 fix top navigation style 2018-04-19 13:26:10 +02:00
zmagod
f3af8f4524 switch current_team to repository.team 2018-04-19 13:04:16 +02:00
zmagod
66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod
c23eacfe13 fixes for_admin action/ test visible_by functlion 2018-04-19 12:41:00 +02:00
mlorb
4f0c2a8122 fix screen responsiveness 2018-04-18 17:06:47 +02:00
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb
57f09029f5 return needed code 2018-04-18 16:22:36 +02:00
mlorb
cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +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
mlorb
04a20ab7ec change links 2018-04-16 17:05:22 +02:00
Zmago Devetak
f90589d714
Merge pull request #1095 from ZmagoD/zd_SCI_2300 
fixes archive button [fixes SCI-2300]
 2018-04-16 16:19:21 +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
Zmago Devetak
8803a7ca15
Merge pull request #1092 from ZmagoD/zd_SCI_2297 
adds edit repository item permission to normal user [fixes SCI-2297]
 2018-04-16 16:18:05 +02:00
mlorb
dceef349a4 fix bug and some refectoring 2018-04-16 14:10:49 +02:00
zmagod
9baaad25b6 add current_user to cloned created_by, last_modified_by field 2018-04-16 12:38:25 +02:00
zmagod
a2d8285f35 fixes archive button but [fixes SCI-2300] 2018-04-16 09:22:10 +02:00
mlorb
2627efe402 implement file column type when editing & creating new rows in inventories DataTables 2018-04-13 17:21:17 +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
zmagod
4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +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
Zmago Devetak
478115bbb0
Merge pull request #1082 from ZmagoD/zd_SCI_2257 
refactor update protocol keywords action [fixes SCI-2257]
 2018-04-12 16:52:04 +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
Luka Murn
09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +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