Commit graph

5128 commits

Author SHA1 Message Date
Justin Reynolds
6d8566bf09 Fix circular dependency between Utils and settings 2018-01-26 18:07:50 -06:00
Michel Herszak
a0c2d52a71
Merge pull request #1840 from justinr1234/smartforms-by-collection-name
Allow SmartForm to use collection or collectionName
2018-01-26 16:49:26 -07:00
Justin Reynolds
919f96a32e Allow SmartForm to use collection or collectionName 2018-01-26 17:41:15 -06:00
Michel Herszak
bd49bbccaf
Merge pull request #1839 from VulcanJS/revert-1836-patch-1
Revert "showEdit on Card"
2018-01-26 16:33:09 -07:00
Michel Herszak
f1ae1d014d
Revert "showEdit on Card" 2018-01-26 16:32:26 -07:00
Michel Herszak
ae3bdab448
Merge pull request #1838 from VulcanJS/revert-1828-fix-allvotes
Revert 1828 fix allvotes
2018-01-26 16:30:10 -07:00
Michel Herszak
e05c27201d
Revert "fix allVotes resolveAs" 2018-01-26 16:28:37 -07:00
Michel Herszak
b96ae7f230
Merge pull request #1828 from farjang/fix-allvotes
fix allVotes resolveAs
2018-01-26 16:25:58 -07:00
Michel Herszak
14577ad101
Merge pull request #1824 from codedeep/master
Add package Spanish Translation i18n-es-es
2018-01-26 16:25:21 -07:00
Michel Herszak
a5a560eb21
Merge pull request #1836 from eric-burel/patch-1
showEdit on Card
2018-01-26 16:22:55 -07:00
Michel Herszak
507c9dbbe0
Merge pull request #1837 from justinr1234/remove-circular-dependency-categories
Fix circular dependencies between schemas and collections
2018-01-26 16:18:18 -07:00
Justin Reynolds
651e3e6866 Fix circular dependencies between schemas and collections 2018-01-26 16:41:30 -06:00
Eric Burel
e85bbab894
showEdit on Card
This make the Card consistent with the Datatable, and allow to hide the `edit` button on cards using the `showEdit` prop.
2018-01-26 17:57:15 +01:00
SachaG
1260b59e75 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel
# Conflicts:
#	packages/example-forum/lib/modules/posts/schema.js
2018-01-26 18:42:45 +09:00
SachaG
67a763260b Formatting 2018-01-26 18:41:47 +09:00
SachaG
0a40e57312 only add search parameter if there are searchable fields 2018-01-26 18:41:29 +09:00
Michel Herszak
e8e15d1740
Merge pull request #1830 from Discordius/devel
Fixed graphQL schema for example-forum
2018-01-25 11:11:32 -07:00
SachaG
7b0f0defe4 Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2018-01-25 18:21:03 +09:00
SachaG
55494d3de2 Only show Edit and New buttons if user has proper permissions 2018-01-25 18:20:29 +09:00
SachaG
4985ba2571 Fix withAccess 2018-01-25 18:12:32 +09:00
SachaG
c131ccb167 Make sure GraphQL schema is properly formatted when outputted as a string 2018-01-25 18:12:26 +09:00
Discordius
1ed946727b Fixed graphQL schema for example-forum 2018-01-24 20:38:36 -08:00
Far Jangtrakool
3a6302f9ef fix allVotes resolveAs 2018-01-24 17:52:35 -08:00
Sacha Greif
a28ccc46ac
Merge pull request #1827 from Discordius/devel
Fixed voting bugs
2018-01-24 10:54:24 +09:00
Discordius
7ec9877d7f Fixed voting bugs 2018-01-23 12:35:16 -08:00
Lucas Martín
316aecb87f
Add comented Spanish i18n package 2018-01-22 18:25:23 +01:00
codedeep
feb4d14ca7 Add Spanish Translation i18n-es-es 2018-01-22 18:09:18 +01:00
Lucas Martín
94d6c29db6
Merge pull request #1 from VulcanJS/master
Update to 1.8.5
2018-01-22 16:26:41 +01:00
SachaG
af4c44a2af v1.8.5 2018-01-20 16:51:20 +09:00
SachaG
279cb8d469 Merge branch 'devel' 2018-01-20 16:49:39 +09:00
SachaG
efd5984f56 Pass parent props to FormWrapper in render instead of componentWillReceiveProps; make Form props updatable through FormWrapper 2018-01-20 13:31:34 +09:00
SachaG
172e789b99 Merge branch 'devel' 2018-01-20 11:07:43 +09:00
SachaG
c9936ed69f v1.8.4 2018-01-20 11:07:27 +09:00
Sacha Greif
db8c148d89
Merge pull request #1820 from b-d-m-p/master
Added comments from the example-simple video tutorial for reference f…
2018-01-20 11:03:40 +09:00
SachaG
2ae8176c71 Small fixes 2018-01-20 11:02:11 +09:00
SachaG
8723ec55f1 Add option to disable all redirects on login form 2018-01-20 11:02:01 +09:00
SachaG
9169735128 Add queryFragmentName and mutationFragmentName props to FormWrapper; add componentWillReceiveProps to update Form props on FormWrapper props change 2018-01-20 11:01:45 +09:00
SachaG
fcd946a75b Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2018-01-15 09:33:46 +09:00
SachaG
37781ce907 versions update 2018-01-15 09:33:43 +09:00
Sacha Greif
0873862772
Merge pull request #1817 from luhagel/fix-newsletter-ssr
Fix Newsletter Banner SSR
2018-01-14 14:29:20 +09:00
Sacha Greif
edff18fa86
Merge pull request #1816 from luhagel/fix-disabled-buttons-prod
Set default waiting state to false to avoid SSR override
2018-01-14 14:25:47 +09:00
Luca Hagel
bd9c082e34 Move showBanner check from constructor to componentDidMount 2018-01-12 13:24:46 +01:00
Luca Hagel
428422fd10 Set default waiting state to false to avoid ssr override 2018-01-12 13:12:49 +01:00
Sacha Greif
5e9f841cfe
Merge pull request #1813 from Sebi55/patch-1
Use getComponent for childRoutes
2018-01-12 08:28:21 +09:00
Sebastian Grebe
bb15e4f549
Use getComponent for childRoutes 2018-01-11 22:59:25 +01:00
SachaG
50a485166e Import registerSetting 2018-01-11 22:20:45 +09:00
SachaG
63df1fdd3e Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel 2018-01-11 21:30:41 +09:00
SachaG
b21dac2c3d Card component tweaks 2018-01-11 21:30:34 +09:00
Sacha Greif
0384122a6f
Merge pull request #1810 from luhagel/feature-apolloengine-loglevel
Allow the ApolloEngine LogLevel to be set via the settings
2018-01-11 21:17:09 +09:00
Luca Hagel
7c9ccb3fc0 Register new apolloEngine.logLevel setting 2018-01-11 13:06:10 +01:00