scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-30 03:46:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
5054 commits 69 branches 179 tags 165 MiB
Commit graph

1517 commits

Author SHA1 Message Date
mlorb 3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271 2018-05-23 14:06:54 +02:00
mlorb 2bb2f8d193
Merge pull request #1161 from mlorb/ml-sci-2350 
move the open/close arrow to the bottom of left menu [SCI-2350]
 2018-05-23 14:01:12 +02:00
mlorb 5e689f6b4d fix toggle button on inventory page 2018-05-23 11:20:42 +02:00
mlorb 79f1a1c0ad fix padding and change label colors 2018-05-23 11:13:28 +02:00
mlorb 7b5ec4ae3f move the open/close arrow to the bottom of left menu 2018-05-23 09:44:46 +02:00
mlorb c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
zmagod e97a98f189 adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372] 2018-05-22 14:18:40 +02:00
mlorb c2cf52bb34 add another toggle button 2018-05-18 16:34:01 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
Zmago Devetak c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
mlorb f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2 
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
 2018-05-16 11:30:54 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Oleksii Kriuchykhin 0ca0884937 Fix pagination in global search inside repositories [SCI-2411] 2018-05-15 17:48:48 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +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 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
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
zmagod ed6098ece6 adds deface hook in support dropdown [fixes SCI-2331] 2018-05-07 13:09:33 +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
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 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
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
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 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 3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +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 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 d023db16af Update the destroy_column action so it properly updates all states 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
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
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
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
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +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
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
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
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
Zmago Devetak e30b2261a8
Merge pull request #1077 from ZmagoD/zd_SCI_2279 
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
 2018-04-05 16:52:16 +02:00
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
zmagod 218f421dff fixes smart annotation avatar bug in pdf reports[fixes SCI-2282] 2018-04-05 15:31:25 +02:00
zmagod c0cc6c293a fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279] 2018-04-05 13:15:32 +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
Zanz2 cff2f933a0 removed byebug :D 2018-04-04 15:19:00 +02:00
Zanz2 ec743a7420 fixed the issue 2018-04-04 15:16:31 +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
zmagod e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
mlorb 11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243 
Style Guide - refactor colors, typography and buttons [SCI-2243]
 2018-04-03 11:30:02 +02:00
zmagod 3d5137b56f change export model wording [fixes SCI-2239] 2018-04-03 11:22:23 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Zanz2 1606982966 found a hackish fix by doing a manual ajax call and some other things with jquery 2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Zmago Devetak f5f6fa4a4f
Merge pull request #1066 from ZmagoD/zd_SCI_2235 
updated repository import modal html [fixes SCI-2235]
 2018-03-30 14:32:53 +02:00
okriuchykhin a6d45fea0a
Merge pull request #1059 from okriuchykhin/ok_SCI_2205 
Add repository name to record info modal [SCI-2205]
 2018-03-30 14:02:53 +02:00
Oleksii Kriuchykhin cc855cda86 Fix translations [SCI-2205] 2018-03-30 12:48:34 +02:00
okriuchykhin 5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111 
Implement search in file repository cells and improve performance [SCI-2111]
 2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod 802e917e69 updated repository import modal html [fixes SCI-2235] 2018-03-30 09:47:27 +02:00
zmagod fd88104fe2 adds manage repository link in repository actions dropdown 2018-03-29 17:10:57 +02:00
zmagod 56b0900619 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-03-29 16:42:10 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
zmagod 7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
Oleksii Kriuchykhin 31aed55ffc Disable turbolinks on tasks navigation [SCI-2251] 2018-03-26 17:55:51 +02:00
okriuchykhin 145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin fac5875cfd Add repository name to record info modal [SCI-2205] 2018-03-26 16:18:09 +02:00
okriuchykhin 784a4723cc
Merge pull request #1056 from okriuchykhin/ok_SCI_2251 
Update turbolinks and fix repository table init [SCI-2251]
 2018-03-26 14:23:30 +02:00
Oleksii Kriuchykhin 07070df1b4 Fix users profile edit form [SCI-2251] 2018-03-26 13:47:12 +02:00
okriuchykhin b1fcdb7474
Merge pull request #1057 from okriuchykhin/ok_SCI_2249 
Fix sample assign permissions [SCI-2249]
 2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
zmagod 8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +02:00
Zmago Devetak 2310439088
Merge pull request #1045 from ZmagoD/zd_SCI_2197 
fixes import protocol bug for guest user [fixes SCI-2197]
 2018-03-26 13:08:01 +02:00
mlorb b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2 
Refactor project navigation [SCI-2120]
 2018-03-26 12:56:19 +02:00
mlorb 0092be08cc refactor links 2018-03-26 12:11:59 +02:00
zmagod 3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
zmagod 9e1f285c9e adds missing labels [fixes SCI-2219] 2018-03-26 11:28:14 +02:00
mlorb 1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
mlorb 70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125 
Implement new Help dropup in navigation [SCI-2125]
 2018-03-26 09:22:39 +02:00
Oleksii Kriuchykhin aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin 83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
mlorb 83741358d1 fix locales 2018-03-23 16:19:06 +01:00
zmagod baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +01:00
mlorb eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb 2e81359ebb re-implement About sciNote modal 2018-03-23 15:14:49 +01:00
mlorb 5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +01:00
mlorb faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
mlorb bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
zmagod 3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin 36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod 81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
zmagod 62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod 1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
mlorb 35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118 
Code left-side menu bar [SCI-2118]
 2018-03-20 14:40:55 +01:00
Zmago Devetak 75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068 
Write server-side endpoints for custom repositories [SCI-2068]
 2018-03-20 14:30:47 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
okriuchykhin 2356b78044
Merge pull request #1042 from okriuchykhin/ok_SCI_2201 
Use larger LinkedIn sign-in button [SCI-2201]
 2018-03-19 16:23:22 +01:00
zmagod c46da5cc67 fixes import protocol bug for guest user [fixes SCI-2197] 2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin 37f675b32a Use larger LinkedIn sign-in button [SCI-2201] 2018-03-18 12:18:33 +01:00
zmagod 3131ed0948 adds permission check to archived project actions dropdown [fixes SCI-2194] 2018-03-16 17:30:49 +01:00
zmagod 311b2dac5a Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142 2018-03-16 16:21:47 +01:00
zmagod 86a8afd907 refactor 2018-03-16 15:56:12 +01:00
zmagod ee03115361 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095 2018-03-16 15:32:40 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
mlorb 9fd845c478 fix failing cucumber tests 2018-03-14 17:55:04 +01:00
mlorb 9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
Zmago Devetak d7679dcb99
Merge pull request #1032 from ZmagoD/zd_SCI_2141 
refactor global activities in separate page [fixes SCI-2141]
 2018-03-13 15:20:14 +01:00
zmagod dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
zmagod 51af74071c remove comments and activity modal 2018-03-13 10:52:53 +01:00
zmagod 8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +01:00
zmagod e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +01:00
okriuchykhin e0834a57cf
Merge pull request #1027 from okriuchykhin/ok_SCI_2163 
Hide delete button for guest users in repository [SCI-2163]
 2018-03-09 17:16:58 +01:00
Oleksii Kriuchykhin cd9260f439 Hide delete button for guest users in repository [SCI-2163] 2018-03-09 16:19:36 +01:00
Oleksii Kriuchykhin 940469e41b Fix user management on project [SCI-2146] 2018-03-09 12:08:34 +01:00
okriuchykhin 160935cde0
Merge pull request #1022 from okriuchykhin/ok_SCI_2136 
Fix manage repository permissions [SCI-2136]
 2018-03-09 10:15:24 +01:00
zmagod 26883af386 fix assigned ordering 2018-03-08 17:36:10 +01:00
okriuchykhin a306e65093
Merge pull request #1016 from okriuchykhin/ok_SCI_2130 
Fix edit project's users modal [SCI-2130]
 2018-03-07 14:04:26 +01:00
Oleksii Kriuchykhin bd9f5c1cda Fix manage repository permissions [SCI-2136] 2018-03-07 13:41:57 +01:00
Oleksii Kriuchykhin 186780e68f Fix invite users link on task card [SCI-2055] 2018-03-06 17:56:01 +01:00
zmagod fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
Oleksii Kriuchykhin ca66858063 Fix edit project's users modal [SCI-2130] 2018-03-06 15:49:30 +01:00
mz3944 bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Matej Zrimšek c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Zanz2 c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +01:00
mlorb 5e44859ce0
Merge pull request #1010 from mlorb/ml-sci-1826 
Sign up with linkedIn account [SCI-1826]
 2018-03-05 13:24:36 +01:00
Matej Zrimšek 53f75f3cd6 Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
zmagod 2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
mlorb f5949e9d10 refactor 2018-03-01 17:52:24 +01:00
Luka Murn 070450f813 Merge branch 'release-1.12.11' 
Conflicts:
	config/initializers/extends.rb
 2018-03-01 14:04:57 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
Oleksii Kriuchykhin aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +01:00
Matej Zrimšek b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Zanz2 5c93bd9676 Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom 2018-02-16 14:14:51 +01:00
Zanz2 673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
 2018-02-16 12:52:51 +01:00
Matej Zrimšek 6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek 5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek 4fe669ca9a Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions. 2018-02-16 10:53:22 +01:00
Zanz2 b9db39f87d removing last commit 2018-02-16 00:00:53 +01:00
Zanz2 95501eb046 saving work for later 2018-02-15 20:01:36 +01:00
Zanz2 ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808 
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
 2018-02-15 16:53:39 +01:00
Zmago Devetak 0583979cf9
Merge pull request #993 from ZmagoD/zd_SCI_2039 
fixes errors with form id duplicates [fixes SCI-2039]
 2018-02-15 11:10:43 +01:00
Matej Zrimšek 09c5e23adf Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes. 2018-02-14 14:39:10 +01:00
Matej Zrimšek d571ab2ed8 Fixed comments permissions for experiment level. 2018-02-14 14:39:10 +01:00
Matej Zrimšek 6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek f21c794a95 Fixed permission error when accessing samples page. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 68206cb591 Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling. 2018-02-14 14:39:08 +01:00
Matej Zrimšek d55734e501 Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view. 2018-02-14 14:39:07 +01:00
Matej Zrimšek 8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek 0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 7938c2e036 Minor code style changes. 2018-02-14 14:19:22 +01:00
Matej Zrimšek d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek 854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Matej Zrimšek d058c371d4 Readded project archive permission. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 900446557b Fixed mistyped permission checker. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e36ec69ca9 Project level permissions refactoring (mostly names). 2018-02-14 13:16:32 +01:00
Matej Zrimšek 93536afcd5 Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e5799ee6dc Some permission fixes. 2018-02-14 13:16:32 +01:00
Matej Zrimšek d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod ace78cfb58 fixes errors with form id duplicates [fixes SCI-2039] 2018-02-09 14:54:16 +01:00
Zanz2 128f15f984
Merge pull request #990 from Zanz2/code_formatting_sci1822 
Commands in protocols io steps are now properly formatted like code [SCI-1822]
 2018-02-08 08:52:44 +01:00
Zanz2 49a4d9cf23 Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar 2018-02-07 15:50:42 +01:00
Zanz2 60aa1a0953 Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before 2018-02-07 15:12:03 +01:00
Zanz2 a6356d2420 Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines 2018-02-07 14:46:25 +01:00
Zmago Devetak b33d09536e
Merge pull request #987 from ZmagoD/zd_SCI_2033 
fixes user dropdown [fixes SCI-2033]
 2018-02-07 14:34:37 +01:00
Zanz2 efaf5ad721 Commands now get styled like code 2018-02-07 13:51:22 +01:00
Zanz2 367eff6401 re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches 2018-02-07 11:17:53 +01:00
zmagod 695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
Zmago Devetak 25a42658c8
Merge pull request #980 from ZmagoD/zd_SCI_2009 
adds nil check in step_table_element for table name [fixes SCI-2009]
 2018-02-06 15:44:56 +01:00
Zanz2 83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807 
Images not imported [SCI-1807]
 2018-02-06 14:33:35 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
zmagod ad742ac2d1 adds nil check in ste_table_element for table name [fixes SCI-2009] 2018-02-05 16:27:04 +01:00
zmagod 25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
okriuchykhin def08a3faa
Merge pull request #971 from okriuchykhin/ok_SCI_1968 
Update notification settings accessor names and update Rubocop config [SCI-1968]
 2018-01-31 15:40:09 +01:00
zmagod 366b67ca1c fixes per @mojca 's request 2018-01-31 15:18:18 +01:00
zmagod b1684dbd5b removed unneeded hook 2018-01-31 14:40:19 +01:00
zmagod 34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
Oleksii Kriuchykhin 7a769bbfde Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
zmagod 029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
Zanz2 70a972c264 Fixed pr and small oversight 2018-01-27 14:33:01 +01:00
Zanz2 2a287193b7 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix 2018-01-27 13:50:35 +01:00
Zanz2 e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993 
A red error messagge is now displayed when not selecting protocol [SCI-1993]
 2018-01-26 16:00:15 +01:00
Zanz2 1d4ce42f23 fixed according to PR 2018-01-26 15:29:13 +01:00
Zanz2 98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807 2018-01-26 15:13:40 +01:00
Zanz2 020e9ddc16 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807 2018-01-26 11:08:47 +01:00
Zanz2 6f56f829da Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title 2018-01-26 10:49:38 +01:00
Zanz2 fc541147c8 A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone 2018-01-25 15:54:38 +01:00
zanzdebian 8bd8c34c4d Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button) 2018-01-25 13:45:35 +01:00
Zmago Devetak 1e407bd9c5
removes unneeded classes 2018-01-25 11:00:48 +01:00
zmagod 76b08e6ac9 add permissions in views 2018-01-24 13:59:57 +01:00
Zanz2 00ac774fde Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result 2018-01-24 13:40:13 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
okriuchykhin aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931 
Fix protocol import button [SCI-1931]
 2018-01-18 10:30:19 +01:00
okriuchykhin 8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
Zmago Devetak 26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 
fixes first element both in Rails part an React part off the application
 2018-01-17 14:12:52 +01:00
okriuchykhin 38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939 
Fix repository records import [SCI-1939]
 2018-01-17 12:55:11 +01:00
okriuchykhin 1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945 
Fix repository item export [SCI-1945]
 2018-01-17 12:50:22 +01:00
zmagod 0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin 86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
zmagod a931a1bc15 adds first date to _list.html.erb view 2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Oleksii Kriuchykhin a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin 79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin deabd39a98 Fix protocol import button [SCI-1931] 2018-01-15 13:43:09 +01:00
Zanz2 b105920d4e
Merge pull request #901 from Zanz2/code_refactor 
Protocols.io code beautification and refactoring [SCI-1929]
 2018-01-12 12:34:00 +01:00
Zanz2 3c6d37ce64 Fixed according to PR review 2018-01-11 18:37:36 +01:00
Zmago Devetak 0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb efb4ce289c fix and/or use 2018-01-05 15:52:41 +01:00
mlorb 99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb 70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
mlorb ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod 862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
okriuchykhin 4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
okriuchykhin b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
mlorb abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
mlorb 0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
okriuchykhin ff62a36788
Merge pull request #910 from okriuchykhin/ok_SCI_1838 
Change invite users to project link to new settings page [SCI-1838]
 2018-01-03 14:47:26 +01:00
okriuchykhin b8fa3c4d51
Merge pull request #905 from okriuchykhin/ok_SCI_1865 
Add icons for different notification types in recent notification dropdown [SCI-1865]
 2018-01-03 14:23:53 +01:00
zmagod 1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin 2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
Zanz2 83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin 917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
mlorb 0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00