Commit graph

5599 commits

Author SHA1 Message Date
SachaG
b066ee5b60 Bug fixes 2018-05-21 10:02:43 +09:00
SachaG
2b0f8cdd88 Change data structure of translations in db to match MongoDB standards 2018-05-21 09:42:08 +09:00
Sacha Greif
ff7fd0edcd
Merge pull request #1984 from OrigenStudio/run-callbacks-await-between-hooks
Await between hooks in runCallbacks
2018-05-19 20:48:38 +09:00
ochicf
3d190b5394 revert last commits
For the moment only fix the await between callbacks issue (as discussed [here](https://github.com/VulcanJS/Vulcan/issues/1949)), so reverts the following commits:

1078943c1a
b2c8c52bc6
2534dde6d2
87e3721f34
83022a9e6d
22d7f80ab4
3f780f8511
822f73a0b6
2018-05-19 12:27:03 +02:00
SachaG
640a52d3c2 v1.10.1 2018-05-18 08:27:41 +09:00
SachaG
93bb3fd1ef Update cookies to use universal-cookie 2018-05-18 08:26:25 +09:00
SachaG
f298aca5ae Handle empty modifiers better 2018-05-17 09:53:16 +09:00
SachaG
fc67471a38 working on cookies+locale support 2018-05-16 11:43:19 +09:00
SachaG
1f9d3078a9 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2018-05-16 11:41:15 +09:00
SachaG
fc15a4df42 Small core/ui components improvements 2018-05-16 11:40:10 +09:00
Sacha Greif
157f5f5bc8
Merge pull request #1986 from Apollinaire/FRtranslation
update FR translation for SmartForm changes
2018-05-15 09:25:49 +09:00
SachaG
975155a843 Revert b6669a3 and add loadingInitial prop to be more explicit 2018-05-15 09:21:03 +09:00
ochicf
1078943c1a update callbacks' runs property accordingly to new hook definition 2018-05-14 20:46:58 +02:00
ochicf
b2c8c52bc6 await for stripe callbacks
they are called in an async context so we can give the consumers liberty to use async functions
2018-05-14 20:46:38 +02:00
ochicf
2534dde6d2 update callbacks' runs property accordingly to new hook definition 2018-05-14 20:45:56 +02:00
ochicf
4bbf5fc8c4 Merge remote-tracking branch 'upstream/devel' into run-callbacks-await-between-hooks 2018-05-14 20:34:40 +02:00
ochicf
87e3721f34 return results on runCallbacksAsync, update its documentation 2018-05-14 20:28:47 +02:00
ochicf
83022a9e6d update documentation 2018-05-14 20:26:40 +02:00
ochicf
22d7f80ab4 check for async context start after callback is run 2018-05-14 20:26:19 +02:00
ochicf
3f780f8511 skip returned promises by callbacks added to sync hooks 2018-05-14 20:25:46 +02:00
ochicf
822f73a0b6 wrap item in promise for async hooks 2018-05-14 20:24:12 +02:00
Apollinaire
a31a980744 update FR translation for SmartForm changes 2018-05-14 10:50:40 +02:00
SachaG
55d34bd328 Working on locale cookie support for SSR 2018-05-14 17:28:04 +09:00
SachaG
b10d8bdb5c Formatting 2018-05-11 09:52:04 +09:00
SachaG
ab674a1163 Merge branch 'devel' into i18n2
# Conflicts:
#	packages/vulcan-forms/lib/components/Form.jsx
#	packages/vulcan-forms/lib/components/FormComponent.jsx
2018-05-11 09:48:34 +09:00
SachaG
42dbb4fb57 Merge branch 'ErikDakoda-erikdakoda5' into devel 2018-05-11 09:43:50 +09:00
SachaG
9638e4a759 Merge branch 'erikdakoda5' of https://github.com/ErikDakoda/Vulcan into ErikDakoda-erikdakoda5
# Conflicts:
#	packages/vulcan-forms/lib/components/FormComponent.jsx
2018-05-11 09:40:45 +09:00
Erik Dakoda
2fe3b2cd28
Merge branch 'devel' into erikdakoda5 2018-05-10 10:10:27 -04:00
Erik Schannen
150d9392e7 Changes to SmartForm behaviour - refactoring
- Added new `FormComponent.isCustomInput` method
 - Pulled `renderComponent` up from `FormComponentInner` to `FormComponent`
 - Pulled some input-type-specific logic up when it was universal, or pushed it down when it should be handled by each ui library
2018-05-10 10:03:59 -04:00
ochicf
0b701a736b await between callbacks 2018-05-10 13:13:49 +02:00
ochicf
b517896a22 add isPromise function 2018-05-10 13:11:21 +02:00
SachaG
422b413f98 Enable context.locale in emails 2018-05-10 18:34:59 +09:00
SachaG
b30b1ae6e6 reset store after locale change 2018-05-10 18:17:53 +09:00
SachaG
c6b1611e98 Add fallback to default locale for content 2018-05-10 18:00:37 +09:00
SachaG
a5a43d2f89 Get locale from user 2018-05-10 17:57:12 +09:00
SachaG
c78cf47e85 Merge branch 'devel' into i18n2 2018-05-10 17:49:46 +09:00
SachaG
9ab1c0f808 Remove bio, karma, and website user fields 2018-05-10 17:49:32 +09:00
SachaG
5c43de929c Fix withEdit imports; fix dropdown bug 2018-05-10 17:48:22 +09:00
SachaG
af666027c3 Add locale field to user schema; change it when setLocale is called on client 2018-05-10 17:48:06 +09:00
SachaG
6979ac8bee addLocale -> registerLocale 2018-05-10 17:17:44 +09:00
SachaG
f320b3363b Move registerSetting to index 2018-05-10 10:18:55 +09:00
SachaG
d60b16ea0d Merge branch 'erikdakoda5' of https://github.com/ErikDakoda/Vulcan into ErikDakoda-erikdakoda5
# Conflicts:
#	packages/vulcan-forms/lib/components/FormComponent.jsx
2018-05-10 09:44:50 +09:00
SachaG
47f21e4740 Eslint clean up 2018-05-10 09:39:35 +09:00
SachaG
e2cba32b15 Clean up 2018-05-10 09:38:25 +09:00
SachaG
00b2a159c1 Add Strings object to email data, add locale support to emails 2018-05-10 09:22:24 +09:00
SachaG
6a30f44adf Merge branch 'devel' into i18n2
# Conflicts:
#	packages/vulcan-forms/lib/components/FormComponent.jsx
2018-05-10 08:34:50 +09:00
Sacha Greif
d80e76e616
Merge pull request #1982 from OrigenStudio/fix/multiple-datatypes
Restrict value altering to allow multiple datatypes in FormComponent
2018-05-10 08:32:40 +09:00
ochicf
d3cd373606 merge value only when is array or object and is an accepted type 2018-05-09 15:59:59 +02:00
SachaG
603fafae37 Merge branch 'devel' into i18n2 2018-05-09 11:23:17 +09:00
SachaG
df66de5861 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2018-05-09 11:22:54 +09:00