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

1061 commits

Author SHA1 Message Date
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
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
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 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
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 fa30278153 change dropdown lenght 2018-05-03 16:25:59 +02:00
zmagod 0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +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
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
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 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
zmagod c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11: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
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 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
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
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
zmagod ce52eb851b add validation to dropdown items 2018-04-19 14:02:42 +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 600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +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
mlorb dceef349a4 fix bug and some refectoring 2018-04-16 14:10:49 +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 4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +02:00
Luka Murn 09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +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 e4b49e62a3 fixes import limit 2018-04-10 15:45:51 +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
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 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
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
zmagod 515c95061c fixes delete column action 2018-04-05 09:56:09 +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 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
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +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
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
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 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 7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +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 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
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
zmagod c61efb0624 rename before_acton hook 2018-03-26 13:07:00 +02:00
Oleksii Kriuchykhin aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin ecd3c73772 Skip asset if file is missing in protocol export [SCI-2250] 2018-03-25 13:36:24 +02:00
zmagod baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +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
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
zmagod c46da5cc67 fixes import protocol bug for guest user [fixes SCI-2197] 2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod fad4001273 fix edit row action 2018-03-16 12:27:19 +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
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +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
okriuchykhin 503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +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
Oleksii Kriuchykhin 21c07371c9 Fix repository export to support file columns [SCI-2079] 2018-03-13 10:40:27 +01:00
zmagod e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +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 e4d974aa58 Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149] 2018-03-09 15:34:06 +01:00
zmagod 4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00