Commit graph

3473 commits

Author SHA1 Message Date
zmagod
3131ed0948 adds permission check to archived project actions dropdown [fixes SCI-2194] 2018-03-16 17:30:49 +01:00
okriuchykhin
95425dc64b
Merge pull request #1034 from okriuchykhin/ok_SCI_2148
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
2018-03-16 11:15:23 +01:00
Oleksii Kriuchykhin
27a605d974 Fix failing test [SCI-2148][SCI-2149] 2018-03-16 11:05:38 +01:00
Oleksii Kriuchykhin
f3385adb06 Merge branch 'master' into ok_SCI_2148 2018-03-16 10:21:02 +01:00
Zanz2
ce860a740e
Merge pull request #1029 from Zanz2/empty_step_hash_fix
protocols io hash key instead of index bug in null step checker [SCI-2166]
2018-03-14 21:01:15 +01:00
Zanz2
bf34d82791 refactored to PR 2018-03-13 17:42:26 +01:00
Oleksii Kriuchykhin
269f7d74fa Add explicit ordering to samples_tables [SCI-2148][SCI-2149] 2018-03-13 13:16:34 +01:00
Zanz2
97c01c386b pushing fix 2018-03-10 22:48:25 +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
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
okriuchykhin
10505ec4e4
Merge pull request #1025 from okriuchykhin/ok_SCI_2146
Fix user management on project [SCI-2146]
2018-03-09 16:42:16 +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
Oleksii Kriuchykhin
e4d974aa58 Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149] 2018-03-09 15:34:06 +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
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
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
okriuchykhin
0051271541
Merge pull request #1018 from okriuchykhin/ok_SCI_2135
Fix sample's custom column permissions [SCI-2135]
2018-03-06 17:43:55 +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
Oleksii Kriuchykhin
ca66858063 Fix edit project's users modal [SCI-2130] 2018-03-06 15:49:30 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011
Wrapping up the permissions [SCI-2011]
2018-03-06 07:10:40 +01:00
Matej Zrimšek
c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Zanz2
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
7b9425321b
Merge pull request #1000 from Zanz2/null_step_crash_sci2043
Fixed big crash that was caused by invalid or null step hash in protocol [SCI-2043]
2018-03-05 16:51:15 +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
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
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
mz3944
f40b0bd095
Merge pull request #1006 from mz3944/mz-SCI-2065
Extend description for adding files to step/result [SCI-2065]
2018-03-04 13:34:37 +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