hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-05 09:31:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6321 commits 32 branches 57 tags 17 MiB
Commit graph

6321 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SachaG
0af75807e5 No need for getModel() anymore 2019-01-28 17:57:25 +09:00
SachaG
5e916f6604 Use getPath to get valid path for intl fields; use isEqual for array and/or object comparisons 2019-01-28 17:54:44 +09:00
SachaG
064e172fed Merge branch 'mutator-cleanup' into devel 2019-01-27 09:48:57 +09:00
SachaG
02f0f9bb58 Use horizontal form layout; add FormElement component; pass itemProperties to FormItem 2019-01-27 09:48:45 +09:00
SachaG
8da17a8872 More clean-up 2019-01-27 09:36:49 +09:00
SachaG
691e0623da Revert formatting change 2019-01-26 21:31:55 +09:00
SachaG
595ed5a545 Refactor and clean up mutators some more 2019-01-26 21:22:04 +09:00
SachaG
602aff7820 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2019-01-26 21:21:23 +09:00
SachaG
f0fab18380 More work on bootstrap form items 2019-01-26 21:21:09 +09:00
Sacha Greif
8e5440724d
Merge pull request #2174 from OrigenStudio/feature/update-package-script 
Add script to update package.json dependencies
 2019-01-24 21:12:31 +09:00
SachaG
e51c0bef81 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2019-01-24 18:02:22 +09:00
SachaG
5f941d7d76 Remove Formsy dependency 2019-01-24 18:01:53 +09:00
eric-burel
c7aeaea949 can reproduce getIntrospectionQuery error with minimal schema 2019-01-23 19:51:30 +01:00
Apollinaire
e2f58c54bd Reset error catcher on route change 2019-01-23 14:29:59 +01:00
neobii
945556952c added tests for min and max 2019-01-22 19:34:00 -06:00
SachaG
c63ceb4dc4 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2019-01-23 09:56:22 +09:00
SachaG
12ec3190ff Clean up Form component's render function 2019-01-23 09:56:15 +09:00
neobii
5da98fa30b Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into formTest 2019-01-22 12:35:18 -06:00
Apollinaire
e128cd7650 prettier 2019-01-22 14:58:16 +01:00
Apollinaire
4597fefa22 Add error message for wrong registered hoc 2019-01-22 14:52:38 +01:00
SachaG
5378331599 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 
# Conflicts:
#	packages/vulcan-lib/lib/server/mutators.js
 2019-01-22 09:53:24 +09:00
SachaG
12df83e23f Revert "Add support for running multiple callback hooks at the same time" 
This reverts commit ffb2ed555b.
 2019-01-22 09:52:16 +09:00
Apollinaire
b2e3aaaeb5 fix lint errors 2019-01-21 18:10:34 +01:00