scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
3922 commits 70 branches 179 tags 165 MiB
Commit graph

3124 commits

Author SHA1 Message Date
Oleksii Kriuchykhin a92abc5995 Fix editing of inventory rows with existing files [SCI-2394] 2018-05-14 14:26:01 +02:00
mlorb f01cfc2968 fix hound 2018-05-14 12:08:45 +02:00
mlorb ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
mlorb b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
zmagod 3db7cc437b fixes error message for invalid file type [fixes SCI-2337] 2018-05-10 13:52:01 +02:00
Luka Murn 8650edbbb9
Merge pull request #1129 from Ducz0r/lm-fix-repositories-index 
Fix merge conflict introduced in when merging master->ux-release-1
 2018-05-10 11:19:38 +02:00
okriuchykhin 3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301 
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
 2018-05-10 10:46:25 +02:00
okriuchykhin ed8237484b
Merge pull request #1131 from okriuchykhin/ok_SCI_2379 
Re-init file preview modal after column visability change [SCI-2379]
 2018-05-10 10:45:56 +02:00
zmagod e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
zmagod 4bc01c44e9 add file name to loading image 2018-05-10 10:37:48 +02:00
Zmago Devetak 0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261 
propagate assigned repository items in workflow [fixes SCI-2261]
 2018-05-10 09:57:49 +02:00
zmagod 38869ec037 adds title on disabled download file link 2018-05-10 09:47:10 +02:00
zmagod 0fe499d4a1 adds the update action to repository records last_modified_by field when downstreaming assigned records 2018-05-10 09:04:12 +02:00
Oleksii Kriuchykhin 8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
Oleksii Kriuchykhin fa1fea634c Re-init file preview modal after column visability change [SCI-2379] 2018-05-09 17:41:52 +02:00
mlorb 13f9ec30b8 fix hound 2018-05-09 13:56:32 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Luka Murn f8295b60c9 Fix merge conflict introduced in when merging master->ux-release-1 
Bug was introduced in merge commit
cb6fe50832 and resulted in import
into inventories not working.
 2018-05-08 09:41:40 +02:00
Zmago Devetak a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344 
adds new string truncation method [fixes SCI-2344]
 2018-05-07 16:30:12 +02:00
zmagod ed6098ece6 adds deface hook in support dropdown [fixes SCI-2331] 2018-05-07 13:09:33 +02:00
zmagod 3e10ff7fc5 add custom method that generates smart annotations name from repository name [fixes SCI-2307] 2018-05-04 10:44:23 +02:00
Zmago Devetak ee307886df
Merge pull request #1124 from ZmagoD/zd_SCI_2347 
fix the missing icons on task card [fixes SCI-2347]
 2018-05-04 09:34:49 +02:00
zmagod fa30278153 change dropdown lenght 2018-05-03 16:25:59 +02:00
zmagod 0177dc811b fixes per @mojca 's request 2018-05-03 16:21:29 +02:00
zmagod abbc0995f2 fix css 2018-05-03 14:51:49 +02:00
zmagod 60e5aa8716 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2 2018-05-03 14:49:06 +02:00
Zmago Devetak d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323 
sign_out user after 7 days [fixes SCI-2323]
 2018-05-03 14:36:44 +02:00
Zmago Devetak 19d5c687ef
remove unneeded :rememberable module 2018-05-03 14:35:59 +02:00
Zmago Devetak 9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310 
parse smart annotations in repository export [fixes SCI-2310]
 2018-05-03 14:34:29 +02:00
zmagod 0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +02:00
Zmago Devetak 4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339 
repository when sorting/searching bug fix [SCI-2339]
 2018-05-03 12:05:39 +02:00
mlorb d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
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