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 |
|
Luka Murn
|
070450f813
|
Merge branch 'release-1.12.11'
Conflicts:
config/initializers/extends.rb
|
2018-03-01 14:04:57 +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
|
5bda53eebf
|
Overall refactoring of all canaid permissions and code related to their calls.
|
2018-02-16 10:54:06 +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 |
|
mlorb
|
806fcbce36
|
refactor update protocol in repository permission
|
2017-12-14 14:18:16 +01:00 |
|
Oleksii Kriuchykhin
|
4fac6484b5
|
Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]
|
2017-04-14 16:05:35 +02:00 |
|
zmagod
|
7b16e5643e
|
fix assets preprocesor for wopi files
|
2017-03-13 13:20:49 +01:00 |
|
zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +01:00 |
|