Commit graph

5147 commits

Author SHA1 Message Date
SachaG
7acaaade25 Un-hardcode Intercom appId 2018-01-27 12:42:28 +09:00
SachaG
832fd5198d Make withDocument accept collectionName too like withList 2018-01-27 12:42:12 +09:00
Sacha Greif
479ab08e1f
Merge pull request #1843 from MHerszak/allVotes
revert allVotes
2018-01-27 12:36:57 +09:00
SachaG
3466d552a4 Merge branch 'justinr1234-vulcan-updates-jan-2018' into devel 2018-01-27 12:32:46 +09:00
SachaG
13a2453009 Merge branch 'vulcan-updates-jan-2018' of https://github.com/justinr1234/Vulcan into justinr1234-vulcan-updates-jan-2018
# Conflicts:
#	packages/vulcan-forms/lib/components/Form.jsx
#	packages/vulcan-lib/lib/modules/utils.js
2018-01-27 12:30:33 +09:00
Michel Herszak
3d1a62e628 fix allVotes resolveAs 2018-01-26 20:15:47 -07:00
Sacha Greif
00063e13d8
Merge pull request #1841 from justinr1234/fix-utils-settings-circular-dependency
Fix circular dependency between Utils and settings
2018-01-27 10:29:30 +09:00
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
Justin Reynolds
75b6ece0a4 Fix linting 2018-01-25 15:03:03 -06:00
Justin Reynolds
e25c95b0aa Fix CommentsItem flash prop 2018-01-25 14:12:29 -06:00
Justin Reynolds
04789bad94 Fix incorrect i18n email required key 2018-01-25 14:00:51 -06:00
Justin Reynolds
a2ef4cc6c7 Fix categories missing on new post from individual user page 2018-01-25 13:59:27 -06:00
Justin Reynolds
797aec51e3 Fix PostsCategoryParameter callback not setting enableCache 2018-01-25 13:47:37 -06:00
Justin Reynolds
d4ecf1b0fe Allow Intercom widget url to be customizable 2018-01-25 13:43:35 -06:00
Justin Reynolds
30b62cd33a Only show PostsNewButton if check passes 2018-01-25 13:39:58 -06:00
Justin Reynolds
4a3f9ae1ef Only show admin menu to admins 2018-01-25 13:37:48 -06:00
Justin Reynolds
5c67e4548e Fix React prop warnings for SmartForm 2018-01-25 13:36:20 -06:00
Justin Reynolds
0e5feab3fa Add Enroll Account component and route 2018-01-25 12:56:40 -06:00
Justin Reynolds
020d970beb Fix circular dependency in example-forum 2018-01-25 12:53:19 -06:00
Justin Reynolds
6f8e355fbb Upgrade to Meteor 1.6.1 2018-01-25 12:12:31 -06: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