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
