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

2760 commits

Author SHA1 Message Date
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 5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +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 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
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 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
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
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 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
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