scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
4684 commits 77 branches 180 tags 167 MiB
Commit graph

4684 commits

This branch
This branch
All branches
Author SHA1 Message Date
okriuchykhin
b6e3774d0b
Merge pull request #931 from okriuchykhin/ok_SCI_1916 
Add allowed zip file type to Powerpoin and Word files [SCI-1916]
 2018-01-12 14:28:26 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854 
adds premissions service to FE
 2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor 
Protocols.io code beautification and refactoring [SCI-1929]
 2018-01-12 12:34:00 +01:00
zmagod
371491c259 refactor 2018-01-12 11:38:52 +01:00
Zanz2
3c6d37ce64 Fixed according to PR review 2018-01-11 18:37:36 +01:00
Oleksii Kriuchykhin
2ddb0ea009 Improve XLSX parsing with Roo [SCI-1915] 2018-01-11 17:52:57 +01:00
Oleksii Kriuchykhin
8b11427780 Add allowed zip file type to Powerpoin and Word files [SCI-1916] 2018-01-11 15:17:30 +01:00
mlorb
34a50bf010
Merge pull request #929 from mlorb/ml-sci-1797-v3 
Add create_teams permission checks [SCI-1797]
 2018-01-10 10:59:14 +01:00
Luka Murn
660ee6af81
Update VERSION to 1.12.9 2018-01-10 10:53:20 +01:00
mlorb
aba426091c add render 403 for create team permission 2018-01-10 10:47:45 +01:00
mlorb
6c4514f550 add create_teams permission checks 2018-01-09 15:28:27 +01:00
zmagod
0d7c116de1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-09 10:03:02 +01:00
zmagod
743a388a8d adds additional tests for permissions controller 2018-01-09 10:00:07 +01:00
zmagod
c5379896c0 fix HOC to recive objects 2018-01-08 16:28:20 +01:00
Zmago Devetak
4e4cae9a48
Merge pull request #927 from ZmagoD/zd_SCI_1867 
fix import protocol preview [fixes SCI-1867]
 2018-01-08 14:21:44 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
mlorb
6375f68d58
Merge pull request #928 from mlorb/ml-sci-1797-v2 
Renaming... [SCI-1797]
 2018-01-05 17:33:28 +01:00
zmagod
7af4816ce8 removes js brakepoint 2018-01-05 17:13:39 +01:00
zmagod
455534ef9a fixes list keys 2018-01-05 17:11:38 +01:00
zmagod
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb
fd6dfbd561 rename create_teams 2018-01-05 16:47:48 +01:00
Zmago Devetak
a2280a4075
Merge pull request #924 from ZmagoD/tiny_mce_asset_nil_guard 
Nil image guard [fixes SCI-1907]
 2018-01-05 16:45:15 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb
efb4ce289c fix and/or use 2018-01-05 15:52:41 +01:00
zmagod
11e47bbfc3 follow @duco 's suggestions 2018-01-05 15:37:58 +01:00
zmagod
3fae267547 fix import protocol preview [fixes SCI-1867] 2018-01-05 15:30:11 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
Zmago Devetak
151f8b828d
Merge pull request #925 from ZmagoD/zd_SCI_1870 
fixes bug with displaying assign/unassign button [fixes SCI-1870]
 2018-01-05 13:25:49 +01:00
zmagod
498f5eec13 add params to task so we can restart the script from the failed attempt in case it happens 2018-01-05 13:23:58 +01:00
Luka Murn
094841e03b
Merge pull request #926 from Ducz0r/lm-decoupling-metrics 
Add the decoupling metrics rake task
 2018-01-05 11:42:08 +01:00
mlorb
70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
Luka Murn
641afc4b8c Add the decoupling metrics rake task 
To get the metrics, run the following rake task:
`rake metrics:decoupling`
 2018-01-05 10:58:42 +01:00
mlorb
ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod
be014000ab fixes flow-types 2018-01-05 09:59:08 +01:00
zmagod
862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
zmagod
0d72851bb5 fixes bug with displaying assign/unassign button [fixes SCI-1870] 2018-01-04 17:20:17 +01:00
okriuchykhin
4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin
53f4db9352 Code refactoring [SCI-1869] 2018-01-04 14:56:16 +01:00
zmagod
a87c43e999 nil image guard [fixes SCI-1907] 2018-01-04 14:49:52 +01:00
okriuchykhin
b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
okriuchykhin
e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873 
Fix repositories [SCI-1873]
 2018-01-04 13:33:30 +01:00
mlorb
abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin
070711917e Code fixes [SCI-1873] 2018-01-04 11:25:34 +01:00
Luka Murn
7e2392f620
Update VERSION to 1.12.8 2018-01-04 08:33:33 +01:00
zmagod
e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +01:00
okriuchykhin
d149facd50
Merge pull request #922 from okriuchykhin/ok_SCI_1875 
Fix about modal [SCI-1875]
 2018-01-03 17:00:29 +01:00
mlorb
0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
okriuchykhin
3d3b1d3a44
Merge pull request #921 from okriuchykhin/ok_SCI_1648 
Fix assign repository record button in tasks when one record is selected [SCI-1648]
 2018-01-03 16:28:34 +01:00
okriuchykhin
ac7746ae91
Merge pull request #916 from okriuchykhin/ok_SCI_1871 
Fix canvas update [SCI-1871]
 2018-01-03 15:47:10 +01:00