scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 02:16:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
4265 commits 69 branches 179 tags 166 MiB
Commit graph

3390 commits

Author SHA1 Message Date
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
zmagod 6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod 23653d1d95 refactor 2018-04-11 09:29:08 +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 e4b49e62a3 fixes import limit 2018-04-10 15:45:51 +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
mlorb 80fe1dd73b fix travis 2018-04-06 17:16:04 +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
zmagod 58b6eb908e fix duplications 2018-04-06 17:02:10 +02:00
zmagod 024032faff refactor update protocol keywords action [fixes SCI-2257] 2018-04-06 15:41:50 +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
Zmago Devetak 71531ebf12
refactor 2018-04-05 16:46:09 +02:00
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Zmago Devetak cafe042494
Merge pull request #1079 from ZmagoD/zd_SCI_2282 
fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]
 2018-04-05 16:12:23 +02:00
zmagod 218f421dff fixes smart annotation avatar bug in pdf reports[fixes SCI-2282] 2018-04-05 15:31:25 +02:00
Luka Murn 386ede0400 Add special middleware for handling of Rails 5.1 WOPI errors 
Closes SCI-2266.
 2018-04-05 13:26:08 +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 030ce271be fixes name validations 2018-04-05 10:47:47 +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
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +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
zmagod 6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin 8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +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
Zanz2 4259fa44f9
Merge pull request #1069 from Zanz2/remotipart_workaround 
Remotipart workaround [SCI-2270]
 2018-04-04 11:27:30 +02:00
Zanz2 7f36ab3e5e deleted require and gemfile entry for remotipart 2018-04-04 11:12:39 +02:00
Zmago Devetak 685255afbc
Merge pull request #1065 from ZmagoD/zd_SCI_2222 
refactor smart annotation parser, adds repository item to smart annot…
 2018-04-04 11:07:29 +02:00
zmagod 8a156ad91e change method name 2018-04-03 13:05:25 +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
mlorb e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
zmagod 7dfec94ffc remove samples from smart annotations 2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin d8d2d75631 Fix repository rows permissions [SCI-2265] 2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Zanz2 2fab3e4caa
Overlooked a small change #2 2018-04-02 20:05:06 +02:00
Zanz2 25619e5e01
Overlooked a small change 2018-04-02 20:02:59 +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 b7c31d704f Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222 2018-04-01 11:10:18 +02:00
mlorb 6a20c37449 fix travis againnnnn 2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
mlorb 5f0d33d75e fix travis again 2018-03-30 16:47:23 +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
mlorb 10b5e1de84 refactor typography 2018-03-30 09:54:57 +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
zmagod 01a548e8b3 fix hound 2018-03-29 16:11:21 +02:00
zmagod 659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
okriuchykhin 31c68ab4bc
Merge pull request #1062 from okriuchykhin/ok_SCI_2201 
Rescale Linkedin buttons [SCI-2201]
 2018-03-28 15:23:05 +02:00
zmagod 7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
mlorb 22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Luka Murn c07dc98cc8 Fix Office Online editing of files [SCI-2264] 
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.

Closes SCI-2264.
 2018-03-28 13:22:30 +02:00
okriuchykhin 13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11 
merge release 1.12.11 branch to master
 2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin 1ed0b16d12 Rescale Linkedin buttons [SCI-2201] 2018-03-27 15:00:28 +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
okriuchykhin fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250 
Skip asset if file is missing in protocol export [SCI-2250]
 2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin 5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +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
zmagod c61efb0624 rename before_acton hook 2018-03-26 13:07:00 +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
Oleksii Kriuchykhin ecd3c73772 Skip asset if file is missing in protocol export [SCI-2250] 2018-03-25 13:36:24 +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 9aa87a17e5 remove help helper 2018-03-23 14:26:53 +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 9cf9bf94c0 fix merge conflict 2018-03-20 14:30:07 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
mlorb e0926ddc3c code refactoring 2018-03-20 13:53:11 +01:00
okriuchykhin 5b1951e01e
Merge pull request #1044 from okriuchykhin/ok_SCI_2117 
Remove Power Up button [SCI-2117]
 2018-03-20 09:53:17 +01:00
zmagod 064bd88584 fix assigned query 2018-03-19 17:49:09 +01:00
okriuchykhin d906baff61
Merge pull request #1039 from okriuchykhin/ok_SCI_1697 
Improve connections between repository models [SCI-1697]
 2018-03-19 16:42:55 +01:00
Zmago Devetak 8349b08575
Merge pull request #1012 from ZmagoD/zd_SCI_2024_fix_custom_repositores_import 
Fix custom repositories import so it supports "list of values" custom column types  [fixes SCI-2024]
 2018-03-19 16:41:11 +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 a9dfcd9681 refactor 2018-03-16 16:38:59 +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
Oleksii Kriuchykhin 9371d77762 Improve connections between repository models [SCI-1697] 2018-03-16 13:12:33 +01:00
zmagod fad4001273 fix edit row action 2018-03-16 12:27:19 +01:00
Oleksii Kriuchykhin 27a605d974 Fix failing test [SCI-2148][SCI-2149] 2018-03-16 11:05:38 +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 c2eb6d6900 fixes hound adds specs to repository_list_items controller 2018-03-16 10:53:05 +01:00
Oleksii Kriuchykhin f3385adb06 Merge branch 'master' into ok_SCI_2148 2018-03-16 10:21:02 +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
Zanz2 bf34d82791 refactored to PR 2018-03-13 17:42:26 +01:00
zmagod a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod b67a54e2d1 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import 2018-03-13 15:25:57 +01:00
Zmago Devetak f778415321
Merge pull request #1014 from ZmagoD/zd_SCI_2025 
Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]
 2018-03-13 15:20:46 +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 5b56f3dbd6 fix hound 2018-03-13 14:47:35 +01:00
okriuchykhin 503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
okriuchykhin f14931f6a8
Update with latest changes on branch 2018-03-13 14:37:12 +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
Oleksii Kriuchykhin 269f7d74fa Add explicit ordering to samples_tables [SCI-2148][SCI-2149] 2018-03-13 13:16:34 +01:00
okriuchykhin 262c21d145
Merge pull request #1036 from okriuchykhin/ok_SCI_2078 
Implement importable selector for repository columns [SCI-2078]
 2018-03-13 13:14:53 +01:00
okriuchykhin dfb0d923b5
Merge pull request #1030 from okriuchykhin/ok_SCI_2016 
Add annotations migrations and optimize queries [SCI-2016]
 2018-03-13 13:07:31 +01:00
Oleksii Kriuchykhin be1ead22e0 Implement importable selector for repository columns [SCI-2078] 2018-03-13 11:36:05 +01:00
zmagod 51af74071c remove comments and activity modal 2018-03-13 10:52:53 +01:00
Oleksii Kriuchykhin 21c07371c9 Fix repository export to support file columns [SCI-2079] 2018-03-13 10:40:27 +01:00
Oleksii Kriuchykhin f5ecbecaf3 Fix bugs [SCI-1849] 2018-03-12 17:00:44 +01:00
zmagod 8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +01:00
mlorb 3b9ad2f86f
Merge pull request #1028 from mlorb/ml-sci-2144 
Add file custom column type to db [SCI-2144]
 2018-03-12 15:18:02 +01:00
zmagod e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +01:00
mlorb 34f5c2c7ac fix validation in asset model and change formatted method in repository_asset_value model 2018-03-12 10:50:45 +01:00
Oleksii Kriuchykhin 60e3a836be Fix typo in regex [SCI-1849] 2018-03-11 22:11:12 +01:00
Oleksii Kriuchykhin ac009a29cb Add annotations migrations and optimize queries [SCI-2016] 2018-03-11 22:06:44 +01:00
Zanz2 97c01c386b pushing fix 2018-03-10 22:48:25 +01:00
Zmago Devetak d50bc5fde9
Merge pull request #998 from ZmagoD/zd_SCI_2014 
migration script for migrating samples -> custom repositories [SCI-2014]
 2018-03-09 17:19:12 +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
mlorb 64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
okriuchykhin 707d2a048f
Merge pull request #1024 from okriuchykhin/ok_SCI_2145 
Fix sample record creation [SCI-2145]
 2018-03-09 16:52:38 +01:00
okriuchykhin 7cbfa5936a
Merge pull request #1026 from okriuchykhin/ok_SCI_2148 
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
 2018-03-09 16:42:33 +01:00
Oleksii Kriuchykhin 853e1f7657 Fix nil case [SCI-2145] 2018-03-09 16:41:23 +01:00
Oleksii Kriuchykhin cd9260f439 Hide delete button for guest users in repository [SCI-2163] 2018-03-09 16:19:36 +01:00
zmagod 22eb4121f0 follow @okriuchykhin 's suggestions 2018-03-09 15:44:42 +01:00
Oleksii Kriuchykhin e4d974aa58 Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149] 2018-03-09 15:34:06 +01:00
zmagod 0baa7a1f99 fix hound 2018-03-09 14:43:12 +01:00
zmagod 4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin 940469e41b Fix user management on project [SCI-2146] 2018-03-09 12:08:34 +01:00
Oleksii Kriuchykhin 804d313f90 Fix sample record creation [SCI-2145] 2018-03-09 11:52:28 +01:00
Oleksii Kriuchykhin 1765d83cd1 Refactor search to support repository list items [SCI-2108] 2018-03-09 11:05:43 +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
okriuchykhin d0d5481a29
Merge pull request #1021 from okriuchykhin/ok_SCI_2131 
Fix notification for user removal from a team [SCI-2131]
 2018-03-09 10:15:09 +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 1082f7f93c Fix notification for user removal from a team [SCI-2131] 2018-03-07 13:20:17 +01:00
okriuchykhin cae726f5c3
Merge pull request #1020 from okriuchykhin/ok_SCI_2055 
Fix invite users link on task card [SCI-2055]
 2018-03-07 09:41:23 +01:00
okriuchykhin c0cfa6e7fe
Merge pull request #1019 from okriuchykhin/ok_SCI_2134 
Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]
 2018-03-06 18:10:05 +01:00
Oleksii Kriuchykhin 186780e68f Fix invite users link on task card [SCI-2055] 2018-03-06 17:56:01 +01:00
Oleksii Kriuchykhin 156a639e4c Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133] 2018-03-06 17:36:40 +01:00
Oleksii Kriuchykhin b5eb821cfa Fix sample's custom column permissions [SCI-2135] 2018-03-06 16:40:25 +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
Oleksii Kriuchykhin c933030b94 Add team export/import scripts [SCI-1849] 2018-03-06 11:26: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 8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 
Table missing scrollbar [SCI-1818]
 2018-03-05 17:13:06 +01:00
Zanz2 1e6f1acef5 fixed according to pr 2018-03-05 17:02:37 +01:00
Zanz2 451d14c2e9 Added 4 to constants too, then fixed line too long error 2018-03-05 16:48:18 +01:00
Zanz2 c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +01:00
Zanz2 e3e7514049 removed redundant return 2018-03-05 16:15:33 +01:00
Zanz2 554b31e0aa Added constants 2018-03-05 16:09:06 +01:00
Zanz2 bd19c89212
Merge pull request #1013 from Zanz2/step_reorder_fix 
quick fix for if previous guid is unknown format [Protocols.io import]
 2018-03-05 15:59:46 +01:00
zmagod fca01bd54f refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +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
mlorb a19b672a83
change validation again 2018-03-05 13:12:44 +01:00
Zmago Devetak 50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066 
add info modal for repository items [fixes SCI-2066]
 2018-03-05 12:49:29 +01:00
Matej Zrimšek 61d1f5374d Additionaly removed some unneeded code, related to the previous commit. 2018-03-04 15:24:43 +01:00
Matej Zrimšek fa7710fb80 Forgot to remove unneeded code form permissions after the previous refactoring. 2018-03-04 15:17:46 +01:00
Matej Zrimšek 53f75f3cd6 Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
Matej Zrimšek 5724f8ed4d Minor permissions refactoring, including putting the same checks for multiple permissions before the specific ones, hence preventing further evaluation if those permissions are not met. 2018-03-04 14:19:17 +01:00
mz3944 c04a153652
Merge pull request #1005 from mz3944/mz-SCI-2064 
At adding file to task, cancel button does not respond [SCI-2064]
 2018-03-04 13:34:50 +01:00
Zanz2 ba67446eee quick fix for if previous guid is unknown format 2018-03-03 22:26:00 +01:00
Zanz2 5bcda7f6de fixed pr 2018-03-02 23:02:35 +01:00
Zanz2 350f12bdbc using dig method now 2018-03-02 22:29:51 +01:00
mlorb d19ca7fbdc
change validation 2018-03-02 16:32:46 +01:00
zmagod 4642d049fa fix hound 2018-03-02 14:16:31 +01:00
zmagod 2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
zmagod 0996745781 refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024] 2018-03-02 13:39:22 +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
zmagod 83ba412c48 remove unneeded comment 2018-03-01 11:51:39 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod 29a1073a50 refactor queries 2018-02-27 16:34:51 +01:00
zmagod e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod 6908368506 refactor 2018-02-27 10:43:57 +01:00
zmagod 3aa28f6d11 assign repository row to task 2018-02-27 10:40:52 +01:00
zmagod 83db7ed01d adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014] 2018-02-26 17:21:58 +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 96a6779d55 Fixed misspelled permission call. 2018-02-22 14:08:12 +01:00
Matej Zrimšek ff9dff5c10 Fixed reports permissions check calls. Fixed Hound warnings. 2018-02-22 13:51:22 +01:00
Matej Zrimšek 1904099954 Put permissions helper methods inside utility module. 2018-02-21 20:22:13 +01:00
Zanz2 29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +01:00
mlorb 4d69636dbe
Merge pull request #1002 from mlorb/ml-sci-2031_v2 
Fix bug with load older activities button not working [SCI-2031]
 2018-02-20 13:19:20 +01:00
Zanz2 9c2a2956e3 Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 
Merging Biosis master with branch that resizes small tables to atleast 5x5
 2018-02-19 17:40:13 +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
mlorb d2dcb765b4 fix bug with load older activities button not working 2018-02-16 15:42:10 +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 7b07e7b347 Fixed protocol in repository permissions, and refactored it a bit. 2018-02-16 12:04:11 +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 fab9180b7b fixed small oversight 2018-02-15 23:40:09 +01:00
Zanz2 c963c948a1 Fixed main issue, bad step structure now gets fixed to empty template 2018-02-15 23:28:20 +01:00
Zanz2 95501eb046 saving work for later 2018-02-15 20:01:36 +01:00
zmagod 5922aa21a8 adds fetch_all_team_samples method/spec 2018-02-15 17:38:45 +01:00
zmagod c53df21946 adds specs for sample_to_repository migration service 2018-02-15 16:56:38 +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
mlorb 9797712561
Merge pull request #997 from mlorb/ml-sci-2045 
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
 2018-02-15 14:51:40 +01:00
Zmago Devetak e0510ab448
Merge pull request #995 from ZmagoD/zd_SCI_2040 
fixed bug with assigned repository items [fixes SCI-2040]
 2018-02-15 13:05:30 +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
zmagod 78e902f316 fixes few Hound alerts 2018-02-15 11:06:59 +01:00
zmagod e0ac8e8f91 extract helper methods in service 2018-02-15 09:36:09 +01:00
Matej Zrimšek ac5b65b121 Added some additional comments for checking if project is active in permissions. 2018-02-14 14:39:10 +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 4c87fb4a55 Fixed permission error when restoring task. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 946f516171 Fixed permission error when moving a freshly cloned task. 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 d7108f5a35 Fixed Hound warnings. 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 879eda2d8f Minor experiment level permissions refactoring. 2018-02-14 14:19:22 +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 1182ce5da1 Fixed experiment level permission checks in the controllers. 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 c5b798017e Minor Hound warning fixes. 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 70fdae567c Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions. 2018-02-14 13:16:32 +01:00
Matej Zrimšek c09ffa4043 Project permissions comments change. 2018-02-14 13:16:32 +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 a21343a819 Fixing and refactoring project permissions in controllers. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 279da20060 Fixed Hound warnings. 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
mlorb 8d0ac93c80 add check to start work on next task notification if recent changes notification is switched off 2018-02-13 11:01:45 +01:00
zmagod 18eab358c7 generate custom repository when user is created [fixes SCI-2020] 2018-02-13 10:44:50 +01:00
Zmago Devetak 027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008 
fixes bug with assets upload on task result page,
 2018-02-12 11:40:44 +01:00
okriuchykhin e7fb1bc716
Merge pull request #967 from okriuchykhin/ok_SCI_1966 
Merge gilson-iot-rails4 to master [SCI-1966]
 2018-02-12 11:02:17 +01:00
okriuchykhin 5a94b40d9c
Merge pull request #978 from okriuchykhin/ok_SCI_2003 
Improve files handling in protocol cloning [SCI-2003]
 2018-02-12 11:01:59 +01:00
Zmago Devetak ccba5d3eb3
Merge pull request #992 from ZmagoD/zd_SCI_2015 
setup models for repository list column [fixes SCI-2015]
 2018-02-12 10:59:20 +01:00
zmagod 27b7aff3ea fixed bug with assigned repository items [fixes SCI-2040] 2018-02-12 10:49:35 +01:00
zmagod 36595d33f4 fix name scope 2018-02-12 09:09:56 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00
zmagod ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00
zmagod ace78cfb58 fixes errors with form id duplicates [fixes SCI-2039] 2018-02-09 14:54:16 +01:00
zmagod 557aeca049 refactor relations 2018-02-09 14:11:56 +01:00
zmagod 7c13c5a1f4 fixes typo, follows @okriuchykhin 's suggestions 2018-02-09 11:38:52 +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
zmagod 6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +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 e400514020
Merge pull request #981 from ZmagoD/zd_SCI_2026 
fixes bug with step table update [fixes SCI-2026]
 2018-02-07 14:35:15 +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 ef0733b886
Merge pull request #988 from Zanz2/red_error_msg_sci1993 
Accidentally deleted this off master, identical to the branch before [SCI-1993]
 2018-02-07 13:08:45 +01:00
Zanz2 a6e93b8e35 Fixed hound line too long 2018-02-07 13:04:02 +01:00
mlorb edbcdc6bf4
Merge pull request #986 from mlorb/ml-sci-2031 
Fix error on task activity [SCI-2031]
 2018-02-07 11:39:14 +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
Zanz2 e56c0bb100 Tables are now always atleast 5x5, like in scinote when creating new table 2018-02-07 10:55:44 +01:00
Zanz2 f7f46a094e Fixed PR and a mistake i made 2018-02-07 09:53:49 +01:00
Zanz2 167cbc98e5
Merge branch 'master' into yellow_flashv3_SCI1834 2018-02-07 09:42:56 +01:00
Zanz2 80735f2412 Fixed the bug with big text difference in preview and imported protocol 2018-02-07 09:26:45 +01:00
zmagod 695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
Luka Murn 4389c110cf
Merge pull request #982 from biosistemika/lm-remove-component-loader 
Remove component loader (so builds pass)
 2018-02-06 17:02:08 +01:00
mlorb e151c963e1 fix error on task activity 2018-02-06 16:34:16 +01:00
zmagod 2ad4eb3488 fix bug with checklists 2018-02-06 16:15:10 +01:00
zmagod 75cc9d11df fix error on checklists 2018-02-06 16:06:15 +01:00
Zanz2 a37d4f3cde there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally 2018-02-06 15:46:03 +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
zmagod bd1345d560 fixes bug with assets upload on task result page, 
adds ctrl+v listener to upload images from clipboard, adds image preview modal
 2018-02-06 15:39:19 +01:00
Zanz2 a2df9777f6
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 
fixed empty table name unable to generate reports bug [SCI-2000]
 2018-02-06 14:34:31 +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 f9c6eafe49 most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit 2018-02-06 12:04:24 +01:00
Zanz2 9b5ddc6789 moved code from older branch to new master 2018-02-06 11:03:17 +01:00
Zanz2 748af2cbf7 Fixed the issue, table name defaults to empty string space now 2018-02-06 10:29:49 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
Luka Murn 4ddc7dfa85 Comment react-hijack code 2018-02-06 08:00:29 +01:00
zmagod b48fa3f231 fixes bug with step table update [fixes SCI-2026] 2018-02-05 17:32:38 +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
Oleksii Kriuchykhin 16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +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
mlorb 39fc52ddf4
Merge pull request #972 from mlorb/ml-sci-1997 
Fix type error at changing task at navigation bar after setting due date [SCI-1997]
 2018-01-31 15:13:28 +01:00
Zmago Devetak ccab688728
Merge pull request #975 from ZmagoD/zd_SCI_2001 
Zd sci 2001
 2018-01-31 14:42:41 +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
mlorb 553039b7b4 fix type error at changing task at navigation bar after seting due date 2018-01-30 13:29:54 +01:00
Oleksii Kriuchykhin 7a769bbfde Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
mlorb 775b8b3201 fix bug with ajax error caused to the other user when deleting column in custom repository 2018-01-29 16:01:33 +01:00
zmagod 029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
Zanz2 0607579d06 Fixes the database error i was having on home machine too, wasnt exclusive to me 2018-01-27 14:57:07 +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 a15e624b06
Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995 
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
 2018-01-26 15:08:03 +01:00
Oleksii Kriuchykhin 7c14800570 Change base class for API controller [SCI-1966] 2018-01-26 13:34:38 +01:00
Zanz2 e041426a09
Merge pull request #964 from Zanz2/steps_order_SCI1816 
Steps order fix [SCI-1816]
 2018-01-26 11:32:28 +01:00
Zanz2 48b48c945c Refactored hound errors, now that rubocop works 2018-01-26 11:17:49 +01:00
okriuchykhin 94f604ae17
Merge pull request #961 from okriuchykhin/ok_SCI_1994 
Actually return 404 when requested asset doesn't exist [SCI-1994]
 2018-01-26 11:14:59 +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 a48fc168a9 deleted un needed function 2018-01-26 11:05:19 +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 4ee51959eb fixed hound 2018-01-26 09:56:59 +01:00
Zanz2 4ed1555ebb small fix, ordering 2018-01-26 09:45:41 +01:00
Zanz2 346f9feaef Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html 2018-01-26 09:34:58 +01:00
Zanz2 24e772d7e5 Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816 2018-01-26 08:26:38 +01:00
Zanz2 e484f0569b
Merge pull request #960 from Zanz2/fixed_styling_after_merge 
Fixed some styling bugs that happened after the merge
 2018-01-26 08:19:29 +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
okriuchykhin 0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970 
Add health check endpoint to API controller [SCI-1970]
 2018-01-25 14:33:37 +01:00
Oleksii Kriuchykhin 7dd9121072 Actually return 404 when requested asset doesn't exist [SCI-1994] 2018-01-25 14:30:04 +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
mlorb ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491 
Add notification for previous task has been completed [SCI-1491]
 2018-01-25 11:35:19 +01:00
Zmago Devetak 4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +01:00
Zmago Devetak 1e407bd9c5
removes unneeded classes 2018-01-25 11:00:48 +01:00
Zmago Devetak 4b2098c0c4
removes unneeded permissions 2018-01-24 16:34: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 9b836d04fa fixes per @mlorb 's request 2018-01-24 13:21:53 +01:00
Zanz2 7fe1c20ebe Finished the protocol reorder functions and implemented them 2018-01-24 09:31:43 +01:00
Zanz2 96253c1089 Made some functions to help solve reordering of the protocols io steps 2018-01-23 18:40:23 +01:00
Mojca Lorber ac8b1769be add notification for previous task has been completed 2018-01-23 15:53:33 +01:00
zmagod 88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
okriuchykhin a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949 
Allow first user seeding from env variables [SCI-1949]
 2018-01-23 14:02:54 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod 259880c441 add permission helpers for view project and experiment 2018-01-23 08:52:10 +01:00
Oleksii Kriuchykhin 28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +01:00
zmagod ee7c646b1d update user settings controllers to new permission system [fixes SCI-1960] 2018-01-22 16:42:26 +01:00
okriuchykhin 73b56beae9
Merge pull request #950 from okriuchykhin/ok_SCI_1329 
Clear selected rows when changing pages on samples table[SCI-1329]
 2018-01-22 15:07:38 +01:00
Oleksii Kriuchykhin 959eddacda Clear selected rows when changing pages on samples table[SCI-1329] 2018-01-18 17:41:35 +01:00
Oleksii Kriuchykhin df28503ec1 Fix fetching protocol name in protocol import [SCI-1951] 2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin d1a515da90 Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00
zmagod 2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Zmago Devetak 7b28bfa6d4
Merge pull request #937 from ZmagoD/feat/external-components-loader 
Enable loading of external React components
 2018-01-18 11:13:40 +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
Adrian Oprea f2f624cfa6 Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web:
  fix(AboutScinoteModal): Enable react optimizations
  Fix addons display in info modal [SCI-1875]
  Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
 2018-01-18 10:24:36 +02:00
Adrian Oprea 12fd630d0c fix(AboutScinoteModal): Enable react optimizations 
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-18 09:59:37 +02:00
Oleksii Kriuchykhin 91468faaf9 Fix addons display in info modal [SCI-1875] 2018-01-17 18:30:55 +01:00
Adrian Oprea 6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
 2018-01-17 18:14:41 +02:00
Zmago Devetak b4b6fddca3
Merge pull request #945 from ZmagoD/zd_SCI_1944 
fixes bug in the invitation_controller with full_name sanitization [f…
 2018-01-17 17:02:34 +01:00
Adrian Oprea 157969aa5e HACK: Comment out code which returns invalid data 
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 17:54:35 +02: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
zmagod 488dba378e fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944] 2018-01-17 15:06: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
Zmago Devetak b9e56c49ef
Merge pull request #944 from ZmagoD/zd_SCI_1938 
fixes bug with comment actions dropdown [fixes SCI-1938]
 2018-01-17 13:42:36 +01:00
Adrian Oprea b559f3cbd4 refactor(Navigation): Use identifier instead of screenName 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:40:33 +02:00
Adrian Oprea 4b9013bcab refactor(massageConfiguration): Create response only when we have addons 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:39:42 +02: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
Oleksii Kriuchykhin 819febb05b Remove skip_on_import from repository_cell [SCI-1939] 2018-01-17 12:54:32 +01:00
zmagod 5371f5a139 fixes bug with comment actions dropdown [fixes SCI-1938] 2018-01-17 12:54:21 +01:00
okriuchykhin 8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946 
Fix samples import [SCI-1946]
 2018-01-17 12:51:35 +01:00