Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRACKING: master → feature/redux #1084

Closed
wants to merge 108 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
fcd98f1
Add redux and react-redux dependencies
langpavel Apr 16, 2016
69fb34f
Redux + React-redux
langpavel Apr 16, 2016
ced8a93
Merge branch 'langpavel-redux' into feature/redux
koistya Apr 18, 2016
64ab5ce
Merge branch 'master' into feature/redux
koistya Apr 21, 2016
cf55d63
Merge branch 'master' into feature/redux
langpavel Apr 23, 2016
6b40eb7
Merge pull request #618 from langpavel/feature/redux
koistya Apr 24, 2016
51ffc76
Merge branch 'master' into feature/redux
koistya Apr 28, 2016
4a73920
Merge branch 'master' into feature/redux
koistya May 3, 2016
2ea534e
Add support for helpers in redux-thunk actions (#650)
langpavel May 17, 2016
9ecbcbc
[feature/redux] Fix: Redux helpers client configuration (#663)
langpavel May 18, 2016
7f7e9a2
Merge branch 'master' into feature/redux
langpavel May 18, 2016
02393af
Merge branch 'master' into feature/redux
koistya May 19, 2016
cf07117
Enhanced Redux Logger
langpavel Jun 5, 2016
f0efee8
Add eslint global-require exception (#703)
EdikoCruz Jun 16, 2016
9b59658
Merge branch 'master' into feature/redux
salttis Jun 20, 2016
5cc2777
fix conflicts
salttis Jun 20, 2016
8aab2f3
Updated some packages
salttis Jun 23, 2016
3ba4ecc
ignore react/jsx-no-bind
salttis Jun 28, 2016
19ac41a
Updated packages
salttis Jun 28, 2016
178cc8e
include store in server side context
salttis Jun 28, 2016
0dd8363
Merge branch 'master' into feature/redux
langpavel Jul 10, 2016
cb0eb7f
[feature/redux] merge master (#733)
langpavel Jul 10, 2016
888088c
Revert "[feature/redux] merge master (#733)"
langpavel Jul 10, 2016
96bf03b
Merge branch 'feature-redux-merge-master' into feature/redux
langpavel Jul 10, 2016
6b34329
Merge branch 'better-redux-logger' into feature/redux
langpavel Jul 10, 2016
64a7582
Merge branch 'feature/redux' of https://github.com/3bola/react-starte…
langpavel Jul 14, 2016
06cb583
Merge branch '3bola-feature/redux' into feature/redux
langpavel Jul 14, 2016
c9d5d70
Merge branch 'master' into feature/redux
langpavel Jul 18, 2016
f749a6d
Merge branch 'master' into feature/redux
langpavel Jul 27, 2016
1c74e77
Merge branch 'master' into feature/redux
langpavel Jul 29, 2016
d4dc11f
Isomorphic redirect
langpavel Jul 29, 2016
173f9e1
Merge pull request #776 from langpavel/isomorphic-redirect
langpavel Jul 31, 2016
b16bc90
Exclude `navigate` from <a> in Link component [closes #788]
langpavel Aug 4, 2016
9195ea1
Merge pull request #791 from langpavel/fix-788
langpavel Aug 4, 2016
d75f2fa
Merge branch 'master' into feature/redux
langpavel Aug 4, 2016
f6bc091
Merge branch 'master' into feature/redux
langpavel Aug 7, 2016
9534fd4
Merge branch 'master' into feature/redux
langpavel Sep 2, 2016
01f0914
Fix lint errors
langpavel Sep 2, 2016
4a10ea6
Merge branch 'master' into feature/redux
langpavel Sep 4, 2016
453c5a9
Merge branch 'master' into feature/redux
langpavel Sep 6, 2016
7889588
Merge branch 'master' into feature/redux
langpavel Sep 12, 2016
13e3397
A bare minimum Redux integration
koistya Sep 27, 2016
7d577ed
Merge remote-tracking branch 'koistya/redux' into new-redux
langpavel Oct 3, 2016
b9d6aa7
Merge branch 'feature/redux' into new-redux
langpavel Oct 3, 2016
76cb841
Merge pull request #894 from langpavel/new-redux
langpavel Oct 3, 2016
f0dd23e
[feature/redux] Pass context to router
langpavel Oct 5, 2016
44f6176
Merge branch 'master' into feature/redux
langpavel Oct 9, 2016
ba46426
Add empty user reducer and clean import react.children (cherry-picked)
keremciu Oct 12, 2016
785b44e
Merge branch 'master' into feature/redux
langpavel Oct 17, 2016
51aed5f
fixed test for required store props in App Layout
granda Oct 17, 2016
188bafb
fixed eslint errors about semicolon and absolute import priority
granda Oct 17, 2016
3f8a98d
Merge branch 'master' into feature/redux
langpavel Oct 21, 2016
7f347c4
Merge branch 'master' into feature/redux
langpavel Oct 21, 2016
c4809b1
Merge branch 'fix/redux-test' of https://github.com/granda/react-star…
langpavel Oct 22, 2016
7bd938e
Merge branch 'granda-fix/redux-test' into feature/redux
langpavel Oct 22, 2016
3250501
Better test code
langpavel Oct 22, 2016
eb1011a
Merge branch 'master' into feature/redux
langpavel Oct 25, 2016
d65beba
Pin redux packages versions
langpavel Oct 25, 2016
f15b19a
Merge branch 'master' into feature/redux
langpavel Nov 2, 2016
f1304cf
fix lint
langpavel Nov 2, 2016
b7bd543
Merge branch 'master' into feature/redux
langpavel Nov 10, 2016
91546e5
Merge branch 'master' into feature/redux
langpavel Nov 11, 2016
d4c1693
Merge branch 'master' into feature/redux
langpavel Dec 1, 2016
2589743
Merge master to feature-redux
langpavel Dec 10, 2016
835b7ca
Merge branch 'master' into feature/redux
langpavel Dec 15, 2016
111fbdd
Merge pull request #1040 from kriasoft/master
langpavel Dec 20, 2016
8b14ce9
Merge branch 'master' into feature/redux
awesomejerry Jan 11, 2017
be51d42
Merge pull request #1077 from awesomejerry/feature/redux
langpavel Jan 12, 2017
0269d46
Merge branch 'master' into feature/redux
langpavel Feb 1, 2017
43671da
No await on return
langpavel Feb 1, 2017
2db64df
Merge branch 'master' into feature/redux
langpavel Feb 11, 2017
4455ecb
Merge branch 'master' into feature/redux
langpavel Feb 13, 2017
1a7599a
Merge branch 'master' into feature/redux
langpavel Feb 14, 2017
6fcb193
Merge branch 'master' into feature/redux
langpavel Feb 16, 2017
e432077
Merge branch 'master' into feature/redux
langpavel Feb 27, 2017
bb36158
Merge branch 'master' into feature/redux
langpavel Mar 12, 2017
cdb874f
Merge branch 'master' into feature/redux
langpavel Mar 16, 2017
fd46817
Custom Redux logger on server
langpavel Mar 25, 2017
04fd6b0
Upgrade redux-logger, update packages
langpavel Mar 31, 2017
9aa7619
Merge branch 'master' into feature/redux
langpavel Apr 10, 2017
8185c13
Merge branch 'master' into feature/redux
langpavel Apr 16, 2017
f448fbe
Merge branch 'master' into feature/redux
langpavel Apr 29, 2017
fe90e5e
Merge branch 'master' into feature/redux
langpavel May 23, 2017
cc4bd69
Merge branch 'master' into feature/redux
langpavel May 25, 2017
0b88fdf
Merge branch 'master' into feature/redux
langpavel Jun 28, 2017
59ae7af
Merge branch 'master' into feature/redux
langpavel Jun 30, 2017
3f5eadd
Merge branch 'master' into feature/redux
langpavel Jul 1, 2017
65b1142
Merge branch 'master' into feature/redux
langpavel Jul 10, 2017
eb73d72
Merge branch 'master' into feature/redux
langpavel Jul 14, 2017
2fe5f87
Merge branch 'master' into feature/redux
langpavel Aug 11, 2017
e065640
Merge branch 'master' into feature/redux
langpavel Aug 22, 2017
87271da
Merge branch 'master' into feature/redux
langpavel Aug 22, 2017
e18f7d9
Merge branch 'master' into feature/redux
langpavel Jan 5, 2018
26173d3
Minimize differences between master and feature/redux
langpavel Jan 7, 2018
703472f
Merge branch 'master' into feature/redux
langpavel Jan 8, 2018
a857017
Merge branch 'master' into feature/redux
langpavel Jan 14, 2018
ccd18a3
Merge branch 'master' into feature/redux
langpavel Jan 23, 2018
74c989c
Change a reference url for redux store fix (#1202)
zirho Jan 31, 2018
ebdd710
Merge branch 'master' into feature/redux
langpavel Jan 31, 2018
d61a501
Merge branch 'master' into feature/redux
langpavel Feb 8, 2018
c51416c
chore(redux): use redux-devtools-extension package
langpavel Feb 8, 2018
efea26d
Merge branch 'master' into feature/redux
langpavel Mar 24, 2018
10fa71b
chore: yarn upgrade
langpavel Mar 24, 2018
d8df5bd
chore: pick docs from master branch - decrease diversity
langpavel Mar 24, 2018
9309fc7
Merge branch 'master' into feature/redux
langpavel Mar 24, 2018
5787cec
docs: Redux Actions
langpavel Mar 24, 2018
020e25b
Merge branch 'master' into feature/redux
langpavel Mar 25, 2018
2d16e49
[feature/redux] Merge master in feature/redux (#1877)
patsa Feb 24, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated some packages
Packages: bluebird, body-parser, express, jsonwebtoken, markdown-it,
file-loader
  • Loading branch information
salttis committed Jun 23, 2016
commit 8aab2f3772a64277344c47dbbdca60991b397e58
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"dependencies": {
"babel-polyfill": "6.9.1",
"babel-runtime": "6.9.2",
"bluebird": "3.4.0",
"body-parser": "1.15.1",
"bluebird": "^3.4.1",
"body-parser": "^1.15.2",
"classnames": "2.2.5",
"cookie-parser": "1.4.3",
"core-js": "2.4.0",
"eventemitter3": "1.2.0",
"express": "4.13.4",
"express": "^4.14.0",
"express-graphql": "0.5.3",
"express-jwt": "3.4.0",
"fastclick": "1.0.6",
Expand All @@ -24,16 +24,16 @@
"history": "3.0.0",
"isomorphic-style-loader": "1.0.0",
"jade": "1.11.0",
"jsonwebtoken": "7.0.0",
"markdown-it": "6.0.5",
"jsonwebtoken": "^7.0.1",
"markdown-it": "^7.0.0",
"node-fetch": "1.5.3",
"normalize.css": "4.1.1",
"passport": "0.3.2",
"passport-facebook": "2.1.1",
"pretty-error": "2.0.0",
"react-redux": "^4.4.5",
"react": "15.1.0",
"react-dom": "15.1.0",
"react-redux": "^4.4.5",
"redux": "^3.4.0",
"redux-thunk": "^2.1.0",
"sequelize": "3.23.3",
Expand Down Expand Up @@ -74,7 +74,7 @@
"eslint-plugin-jsx-a11y": "^1.2.2",
"eslint-plugin-react": "^5.1.1",
"extend": "^3.0.0",
"file-loader": "^0.8.5",
"file-loader": "^0.9.0",
"gaze": "^1.0.0",
"git-repository": "^0.1.4",
"glob": "^7.0.3",
Expand Down Expand Up @@ -102,8 +102,8 @@
"react-addons-test-utils": "^15.1.0",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"redux-logger": "^2.6.1",
"redbox-react": "^1.2.6",
"redux-logger": "^2.6.1",
"sinon": "^2.0.0-pre",
"stylelint": "^6.6.0",
"stylelint-config-standard": "^9.0.0",
Expand Down