Commit graph

62 commits

Author SHA1 Message Date
dependabot[bot] 57fbba0728
Bump lodash.merge from 4.6.1 to 4.6.2
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:25 +00:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar df3289c6f3 Fix dependencies for webpack 2019-07-02 18:05:09 +02:00
Jure Grabnar 8bcba61919 Add webpack-cli 2019-07-02 16:35:36 +02:00
Jure Grabnar 9ace3ce8ed Add config changes to support react.js to webpacker 2019-07-02 14:02:43 +02:00
Jure Grabnar 4bdefda2af Upgrade webpacker to ~> 4.0.0 2019-07-02 13:30:13 +02:00
Jure Grabnar 72cf169989 Upgrade axios to 0.18.1
Closes SCI-3589
2019-06-21 19:53:02 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
aignatov-bio cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Oleksii Kriuchykhin 0147b3e3d7 Switch from package-lock.json to yarn.lock [SCI-3402] 2019-05-06 14:04:41 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod 2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Adrian Oprea 6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
2018-01-17 18:14:41 +02:00
Adrian Oprea cade0ae686 chore: Use latest version of react-hijack
The render hijacking library wash updated to use our own version of
react-traversal. The original library did not provide ES5 build so the
overall app build was failing.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 17:21:46 +02:00
Adrian Oprea a0cb6c6bec chore: Update react-hijack to 2.0.0
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:41:10 +02:00
zmagod 0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01: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
zmagod 52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
Luka Murn 329dd4f1b0 Onboard Flow onto validation components. 2017-10-30 14:13:36 +01:00
Zmago Devetak a0eaec214b Merge pull request #821 from ZmagoD/zd_SCI_1572
Implement integration test: profile.feature + initial setup
2017-10-20 20:17:37 +02:00
zmagod e3e3f4c75d Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-19 16:06:40 +02:00
zmagod 2f68a90eff adds page titles [fixes SCI-1703] 2017-10-18 15:23:46 +02:00
zmagod 5afd65d2b1 fixes active tab bug, opt-in flow [fixes SCI-1688] 2017-10-18 13:59:52 +02:00
zmagod e5ebedb428 fix errors with polyfill 2017-10-12 16:49:33 +02:00
zmagod dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
Zmago Devetak e99791bd29 Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration
fixes webpack production build
2017-10-10 15:08:28 +02:00
Zmago Devetak d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629
adds bootstrap and font-awesome in webpacker build fixes the missing …
2017-10-10 14:09:52 +02:00
zmagod c014742a88 fixes webpack production build 2017-10-10 14:08:23 +02:00
zmagod 2d1c849106 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-09 09:43:29 +02:00
zmagod 839eaf8e03 downgrade to react 15 since bootstrap-react is not fully compatible 2017-10-06 17:02:14 +02:00
zmagod 3321fc495c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628 2017-10-06 15:54:52 +02:00
zmagod 754627efe7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564 2017-10-05 11:08:31 +02:00
zmagod e9568bcd47 optin flow in activities modal 2017-10-04 11:35:32 +02:00
zmagod 84f279de22 setup flow 2017-10-04 09:16:17 +02:00
zmagod ce6613ac63 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-03 16:05:45 +02:00
zmagod 55332e2957 adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629] 2017-10-03 16:01:33 +02:00
Luka Murn f8fc2737d5 Merge pull request #803 from Ducz0r/lm-sci-1599
Add global flash notifications/alerts [SCI-1599]
2017-10-03 11:15:27 +02:00
Luka Murn 8ba7ed5884 Change the generation to be done using Redux (instead of this.window...) 2017-10-02 19:25:04 +02:00
Luka Murn 6951755a92 Add animation, multiple alerts, make them float 2017-09-28 19:39:17 +02:00
zmagod 54c771804a upgrades to react 16.0 2017-09-28 15:10:20 +02:00
zmagod c8c8afdd1d update react-bootstrap 2017-09-28 15:00:54 +02:00
mlorb c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
zmagod 39025769ec Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564 2017-09-21 13:45:27 +02:00
zmagod ed2beefc08 fixed profile info inputs 2017-09-21 13:42:49 +02:00
mlorb 48c8922604 adds invite users modal 2017-09-21 10:45:35 +02:00
Luka Murn df44976fc6 Save input values into component state 2017-09-19 14:07:17 +02:00
zmagod 91d2d8a935 adds team details view 2017-08-31 15:56:55 +02:00
zmagod 34be62a648 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3 2017-08-25 08:58:20 +02:00
Toni Dezman 3c6f66ebd3 Merge branch 'decoupling-settings-page' into td_SCI_1494_v2 2017-08-24 10:23:30 +02:00