Oleksii Kriuchykhin
|
156a639e4c
|
Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]
|
2018-03-06 17:36:40 +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 |
|
mlorb
|
d19ca7fbdc
|
change validation
|
2018-03-02 16:32:46 +01:00 |
|
mlorb
|
d4e62c3c13
|
add Gemfile.lock
|
2018-03-01 18:03:13 +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 |
|
mlorb
|
e66eab7f57
|
fix typo
|
2018-03-01 09:45:52 +01:00 |
|
mlorb
|
9199f287ba
|
fix hound
|
2018-03-01 09:18:36 +01:00 |
|
Luka Murn
|
bdc124faa0
|
Bump VERSION to 1.12.11
|
2018-03-01 07:50:55 +01:00 |
|
mlorb
|
08439e7f58
|
sign up with linkedIn account
|
2018-02-28 18:12:21 +01:00 |
|
okriuchykhin
|
1330225796
|
Merge pull request #1008 from okriuchykhin/ok_PIP_46
Add extendable file types mappings for icons [PIP-46]
|
2018-02-26 15:19:18 +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
|
48bdd84163
|
Updated file upload text, to notify user of another approach to uploading files.
|
2018-02-22 14:18:53 +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 |
|
Zanz2
|
9d87d31a7e
|
Merge pull request #1001 from Zanz2/scroll_bar_table_fix_sci2044
Protocols io tables now have fixed 200 px height in preview [SCI-2044]
|
2018-02-16 20:20:48 +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 |
|