Commit graph

3364 commits

Author SHA1 Message Date
zmagod 5371f5a139 fixes bug with comment actions dropdown [fixes SCI-1938] 2018-01-17 12:54:21 +01:00
okriuchykhin 8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946
Fix samples import [SCI-1946]
2018-01-17 12:51:35 +01:00
okriuchykhin 1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945
Fix repository item export [SCI-1945]
2018-01-17 12:50:22 +01:00
okriuchykhin 2c2914f691
Merge pull request #942 from okriuchykhin/ok_SCI_1940
Fix task repository row selector [SCI-1940]
2018-01-17 12:50:11 +01:00
zmagod 0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin 74a62c41eb Fix task repository row selector [SCI-1940] 2018-01-17 11:21:41 +01:00
okriuchykhin 016ead607e
Merge pull request #935 from okriuchykhin/ok_SCI_1936
Fix export samples button [SCI-1936]
2018-01-17 10:43:09 +01:00
Oleksii Kriuchykhin 86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin 3c8d8e2fbb Fix samples import [SCI-1946] 2018-01-16 17:50:33 +01:00
Matej Zrimšek 9ef04a6a2b Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version. 2018-01-16 17:01:44 +01:00
Adrian Oprea d71f6161e4 feat(Navigation): Enhance navigation with addons
Use the withExtras HOC to add external functionality without embedding that knowledge in the core.
2018-01-16 17:24:11 +02:00
Adrian Oprea d7b63f5941 feat(massageConfiguration): Add data-transformation function
The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.
2018-01-16 17:23:15 +02:00
Adrian Oprea a5ecc1a36e refactor(addons_loader): Extract paths to variables / build mega-config file
- Create variables for the paths the script impacts
- Create a file to host the configuration, import each add-on config and re-export them through a single object
2018-01-16 17:22:00 +02:00
Adrian Oprea 583efbc9c4 refactor(componentLoader): Add component path at module level
Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.
2018-01-16 17:19:56 +02:00
Adrian Oprea 350862b0cc feat: Re-export availableAddons
This will probably be removed and the config will be exported through the main entrypoint.
2018-01-16 17:18:46 +02:00
Adrian Oprea f6f2bc4c3d feat: Create availableAddons empty config
This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.
2018-01-16 17:17:39 +02:00
zmagod 3e95503017 adds(addon_loader) a generator that creates a js file with available addons
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 14:18:31 +01:00
zmagod a931a1bc15 adds first date to _list.html.erb view 2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
zmagod fc5daabb73 fix(addon_loader): make symlink to target addon/client
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 10:54:11 +01:00
Adrian Oprea b64b71f9eb chore: Ignore external components container dir
The components will not be committed nor will they need versioning. Code
for the components is kept separately and is brought in at build time.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:58:51 +02:00
Adrian Oprea 8d6cbd8351 chore: Update application dependencies
Add react-hijack module to project dependencies.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:56:01 +02:00
Adrian Oprea da4053552d chore: Ignore macOS-specific desktop config file
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:17:14 +02:00
Adrian Oprea 894e0afd0a feat(componentLoader): Add external component loader module
For render hijacking to work, imports need to be peformed at core level.
This loader ensures that Webpack is able to resolve the paths to the
external components' code, without the need for extra loaders or custom
built plugins.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin 79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin deabd39a98 Fix protocol import button [SCI-1931] 2018-01-15 13:43:09 +01:00
zmagod ed44762ff2 adds rescue 2018-01-15 08:44:59 +01:00
zmagod 0bfa92046d add an initializer that creates symlinks to react components in core [fixes SCI-1902] 2018-01-12 17:14:27 +01:00
okriuchykhin 00927be287
Merge pull request #932 from okriuchykhin/ok_SCI_1915
Improve XLSX parsing with Roo [SCI-1915]
2018-01-12 14:57:17 +01:00
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