scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
4382 commits 39 branches 184 tags 168 MiB
Commit graph

1093 commits

Author SHA1 Message Date
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
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
zmagod
26883af386 fix assigned ordering 2018-03-08 17:36:10 +01:00
Oleksii Kriuchykhin
1082f7f93c Fix notification for user removal from a team [SCI-2131] 2018-03-07 13:20:17 +01:00
zmagod
fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +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
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
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
53f75f3cd6 Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +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
mlorb
f5949e9d10 refactor 2018-03-01 17:52:24 +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
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
Zanz2
29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +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
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
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
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
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
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
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
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
d058c371d4 Readded project archive permission. 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
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
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
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
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
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
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
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
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
b48fa3f231 fixes bug with step table update [fixes SCI-2026] 2018-02-05 17:32:38 +01:00