Commit graph

6238 commits

Author SHA1 Message Date
SachaG
59760bf40d Remove console.log 2019-02-16 18:08:14 +09:00
SachaG
43906cd121 Merge branch 'apollo2' of https://github.com/VulcanJS/Vulcan into apollo2
# Conflicts:
#	packages/vulcan-accounts/package.js
#	packages/vulcan-admin/package.js
#	packages/vulcan-cloudinary/package.js
#	packages/vulcan-core/package.js
#	packages/vulcan-debug/package.js
#	packages/vulcan-email/package.js
#	packages/vulcan-embed/package.js
#	packages/vulcan-errors-sentry/package.js
#	packages/vulcan-errors/package.js
#	packages/vulcan-events-ga/package.js
#	packages/vulcan-events-intercom/package.js
#	packages/vulcan-events-internal/package.js
#	packages/vulcan-events-segment/package.js
#	packages/vulcan-events/package.js
#	packages/vulcan-forms-tags/package.js
#	packages/vulcan-forms-upload/package.js
#	packages/vulcan-forms/package.js
#	packages/vulcan-i18n-en-us/package.js
#	packages/vulcan-i18n-es-es/package.js
#	packages/vulcan-i18n-fr-fr/package.js
#	packages/vulcan-i18n/package.js
#	packages/vulcan-lib/lib/server/mutators.js
#	packages/vulcan-lib/package.js
#	packages/vulcan-newsletter/package.js
#	packages/vulcan-payments/package.js
#	packages/vulcan-routing/package.js
#	packages/vulcan-subscribe/package.js
#	packages/vulcan-ui-bootstrap/package.js
#	packages/vulcan-users/package.js
#	packages/vulcan-voting/package.js
2019-02-16 18:07:51 +09:00
SachaG
c8a003d440 Merge branch 'devel-apollo1' into apollo2
# Conflicts:
#	package.json
#	packages/vulcan-core/lib/modules/components/Card.jsx
2019-02-16 18:04:19 +09:00
SachaG
0de16c4a67 Merge branch 'devel-apollo1' of https://github.com/VulcanJS/Vulcan into devel-apollo1 2019-02-16 18:01:33 +09:00
SachaG
f37ca18344 Remove default onChange event handler 2019-02-16 18:01:23 +09:00
Apollinaire
815a65d853 prettier & lint code 2019-02-12 13:00:46 +01:00
Apollinaire
11a9ebef85 Merge branch 'i18nLabel' into devel-apollo1 2019-02-12 12:12:14 +01:00
Apollinaire
0d5a81348c Add avoid-escape for quotes on eslint
Better accordance between eslint and prettier
2019-02-12 12:08:14 +01:00
SachaG
72fef82daf Show warning when core components are missing (fix #2196) 2019-02-09 21:14:26 +09:00
Apollinaire
d827e58926 prettier 2019-02-08 14:42:51 +01:00
Apollinaire
5df3e32916 Add tests 2019-02-08 14:37:08 +01:00
SachaG
ea3b5d7d27 Fix Date2 component 2019-02-08 16:57:18 +09:00
Apollinaire
7f8c76c877 prettier 2019-02-07 18:02:43 +01:00
Apollinaire
ef83562ee6 Fix SmartForm tests 2019-02-07 18:01:42 +01:00
eric-burel
c8b6b6efbf added try catch when running SSR 2019-02-05 19:39:39 +01:00
eric-burel
083a7d676b prettier commit 2019-02-05 19:36:13 +01:00
eric-burel
c7c5091a22 comment commit 2019-02-05 18:50:44 +01:00
eric-burel
67d115e70f Merge branch 'apollo2' of https://github.com/VulcanJS/Vulcan into apollo2 2019-02-05 18:50:12 +01:00
eric-burel
4f2044ea41 fixed regression in auth 2019-02-05 18:46:22 +01:00
SachaG
868c36cadd v1.12.16 2019-02-04 21:18:38 +09:00
SachaG
7b90dbec23 Merge branch 'master' into devel 2019-02-04 14:50:18 +09:00
SachaG
b175e2e5a7 v1.12.15 2019-02-04 14:39:37 +09:00
SachaG
921e7cd851 Fix users onCreate 2019-02-04 14:38:39 +09:00
SachaG
6d169c1efd Merge branch 'apollo2' of https://github.com/VulcanJS/Vulcan into apollo2
# Conflicts:
#	package.json
#	packages/vulcan-embed/lib/components/EmbedURL.jsx
2019-02-02 09:59:33 +09:00
SachaG
6626aa543a Merge branch 'devel' into apollo2
# Conflicts:
#	packages/vulcan-lib/package.js
2019-02-02 09:28:08 +09:00
SachaG
f56293b0f6 Remove Formsy dependency 2019-02-02 09:27:13 +09:00
SachaG
882d760540 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2019-02-02 09:22:22 +09:00
Sacha Greif
6e67995dce
Merge pull request #2192 from jimrandomh/upstreamFixDefaultSort
Default view sort doesn't take precedence over selected view
2019-02-02 09:21:51 +09:00
James Babcock
18df91fa1b Default view sort doesn't take precedence over selected view 2019-02-01 12:58:50 -08:00
SachaG
7dd2479af3 v1.12.14 2019-01-31 22:04:00 +09:00
SachaG
0823d693ed Update EmbedURL component 2019-01-31 22:03:38 +09:00
SachaG
ff22d893aa react-bootstrap 1.0.0-beta.5 compatibility 2019-01-31 21:38:47 +09:00
SachaG
a292f0908d Fix newDocument/document issue; keep newDocument for backwards compatibility 2019-01-31 21:27:20 +09:00
eric-burel
ab6df4f448 cleanup, remove console.log 2019-01-30 21:31:12 +01:00
eric-burel
fb16f38d97 prettier commit + fix startup 2019-01-30 21:26:43 +01:00
eric-burel
02cfafabc2 Fixed versions issues (react-bootstrap + apollo) 2019-01-30 18:17:55 +01:00
Apollinaire
54b8ed1385 Prettier 2019-01-30 12:39:30 +01:00
Apollinaire
99012d5673 Rewrite Card getLabel 2019-01-30 12:38:24 +01:00
Apollinaire
bf227ac8a7 Add formatLabel to Datatable 2019-01-30 11:39:51 +01:00
Apollinaire
3df1ee4fbb add camelToSpace on fieldName 2019-01-30 11:39:22 +01:00
Apollinaire
f16b3dc480 Merge remote-tracking branch 'upstream/devel' into i18nLabel 2019-01-30 11:37:56 +01:00
SachaG
fd33c7675b More linting fixes 2019-01-30 10:45:28 +09:00
SachaG
a13327340c Linting 2019-01-30 10:42:17 +09:00
SachaG
6d1e8da40b Merge branch 'devel' into apollo2
# Conflicts:
#	packages/vulcan-core/lib/modules/components/App.jsx
#	packages/vulcan-core/lib/modules/components/Card.jsx
#	packages/vulcan-core/lib/modules/default_mutations.js
#	packages/vulcan-core/lib/modules/index.js
#	packages/vulcan-debug/lib/components/Routes.jsx
#	packages/vulcan-lib/lib/server/intl.js
2019-01-30 10:36:59 +09:00
SachaG
19ea8159b3 Merge branch 'devel' into apollo2 2019-01-30 10:34:27 +09:00
Apollinaire
78af913820 rewrite Form.getLabel 2019-01-29 18:41:50 +01:00
eric-burel
7008e4e6b1 delete old server file 2019-01-29 18:21:58 +01:00
Apollinaire
fe13c451cf typo in comments 2019-01-29 18:20:28 +01:00
eric-burel
f51f558cb1 prettier commit 2019-01-29 17:32:08 +01:00
SachaG
a42a3b492a Handle intl fields properly when specifying form fields with "fields" prop 2019-01-28 18:12:12 +09:00