Commit graph

1968 commits

Author SHA1 Message Date
Sacha Greif
33f8f066ec display future posts in pending view 2014-12-05 08:21:02 +09:00
Sacha Greif
1bd798fad1 Look for settings in Meteor.settings too (fix #561) 2014-12-04 14:25:51 +09:00
Sacha Greif
64e142c298 Show settings field privacy in admin settings form 2014-12-04 13:36:17 +09:00
Sacha Greif
1795552287 Mark some settings field as private and don't publish them 2014-12-04 13:36:06 +09:00
Sacha Greif
716f329908 Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-12-04 13:10:27 +09:00
Sacha Greif
3e415dce78 Merge branch 'telescope-master-profile-hooks' of github.com:AdmitHub/Telescope into AdmitHub-telescope-master-profile-hooks
Conflicts:
	client/views/posts/modules/post_info.html

Note:
	adapted PR to only keep some of the added features
2014-12-04 12:38:20 +09:00
Sacha Greif
45ccf1d8f1 Merge pull request #588 from anthonymayer/urls_by_route_name
Switching from manually generating urls to using IronRouter functions.
2014-12-04 11:44:44 +09:00
Sacha Greif
f06b43b603 finish epic editor clean up and fix #591 2014-12-04 11:32:44 +09:00
Sacha Greif
5b72a09c7d don't need updateCategoryInPosts method anymore (fix #590) 2014-12-04 11:27:40 +09:00
Sacha Greif
2eb31e0647 do not make call to CDN when language is english (fix #589) 2014-12-04 11:20:41 +09:00
Anthony Mayer
23b72b9cb8 Switching from manually generating urls to using IronRouter functions.
Using {{pathFor}}, path(), and url() where possible. Passing in path
to Meteor.absoluteUrl() where the IronRouter functions didn't make sense.
Also deleting some random unused code.
2014-12-03 00:06:00 -08:00
Sacha Greif
93fbe47f79 updating rss server-side routes for new IR syntax 2014-12-03 09:35:41 +09:00
Sacha Greif
111baee125 Merge pull request #587 from anthonymayer/email-header-site-link
Fixes #562 - Adds site link to email header.
2014-12-03 09:25:54 +09:00
Sacha Greif
5fc4b73780 Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-12-03 09:04:33 +09:00
Sacha Greif
db472c7359 removing unneeded dependency 2014-12-03 09:04:15 +09:00
Sacha Greif
6d7cacd3df version bump 2014-12-03 09:00:56 +09:00
Sacha Greif
8a9af125ca Fix #584 2014-12-03 08:45:43 +09:00
Sacha Greif
9bf9ee6f30 renaming embedly package 2014-12-03 08:43:26 +09:00
Sacha Greif
82aed922a2 fix mark as read bug 2014-12-01 16:53:41 +09:00
Sacha Greif
2e534c4e22 Merge branch 'fr2' of github.com:arunoda/Telescope into arunoda-fr2
Conflicts:
	lib/router/posts.js
2014-12-01 11:03:54 +09:00
Sacha Greif
5251e66874 adding spinner 2014-12-01 10:14:03 +09:00
Anthony Mayer
5674269072 Fixes #572 - Expands search box when focused or not empty.
Also, changed when empty class is removed to avoid text box shrinking and then expanding after it loses focus but has content.
2014-11-30 17:03:30 -08:00
Sacha Greif
8a2fea0c76 do not overwrite title and body if they already exist 2014-12-01 09:12:39 +09:00
Sacha Greif
680f3fc12c Merge branch 'master' into quickform 2014-11-30 14:40:15 +09:00
Sacha Greif
7f016e9256 Merge pull request #571 from anthonymayer/fix-duplicate-search-logs
Fixes #543 - duplicate search logs.
2014-11-30 14:39:00 +09:00
Sacha Greif
003d40d6c3 i18n 2014-11-30 14:32:19 +09:00
Sacha Greif
025861f40c better error handling for incorrect URLs 2014-11-30 13:03:35 +09:00
Sacha Greif
d2b24794bc working on form i18n 2014-11-30 12:36:56 +09:00
Sacha Greif
69b3ec2352 making embedly thumbnail width and height configurable 2014-11-30 11:31:07 +09:00
Sacha Greif
aa25a75dc8 adding sass and i18n to embedly module 2014-11-30 11:30:48 +09:00
Anthony Mayer
34081ca775 Removing accidentally added css rule 2014-11-28 23:01:16 -08:00
Anthony Mayer
dbf640ce2b Fixes 447 - Hide mobile nav with css rather than js.
Also, removing random unused class.
2014-11-28 22:57:30 -08:00
Sacha Greif
0cca37a253 refactoring embedly module and triggering API call on URL field change 2014-11-29 15:24:01 +09:00
Anthony Mayer
d61e4311a3 Fixes #562 - Adds site link to email header. 2014-11-28 19:26:06 -08:00
Sacha Greif
19eb57fdb4 normalising categories 2014-11-29 11:38:53 +09:00
Sacha Greif
d36bbf69ab refactoring submitPost and editPost 2014-11-29 11:14:44 +09:00
Anthony Mayer
494f27bf9b Fixing duplicate search logs. 2014-11-28 17:46:23 -08:00
Sacha Greif
618371636d working on post edit form 2014-11-29 10:25:11 +09:00
Sacha Greif
0031d07468 finishing post submit form refactoring 2014-11-28 15:18:55 +09:00
Sacha Greif
672be96c9b working on post submit form 2014-11-28 11:19:55 +09:00
Arunoda Susiripala
75278fbae2 added fast-render 2.0 support 2014-11-27 17:25:01 +05:30
Sacha Greif
96176398e3 create datetimepicker custom field type package 2014-11-27 17:43:27 +09:00
Sacha Greif
ab639798d7 only apply primary button color to .btn-primary style 2014-11-27 17:43:11 +09:00
Sacha Greif
019ae375fd Merge branch 'master' into quickform
Conflicts:
	packages/telescope-theme-base/lib/client/css/screen.css
2014-11-26 17:32:25 +09:00
Sacha Greif
6fde67fc2b Merge pull request #547 from anthonymayer/compass-to-node-sass
Compiling scss as part of build rather than with compass.
2014-11-26 17:27:35 +09:00
Anthony Mayer
55f151bab2 Fixes #555.
Also, updated a couple strings that google translate seemed straightforward enough for
2014-11-25 23:45:11 -08:00
Anthony Mayer
aaa2efb05f Merge branch 'master' of https://github.com/TelescopeJS/Telescope into compass-to-node-sass
Conflicts:
	.meteor/packages
	packages/telescope-theme-base/versions.json
	packages/telescope-theme-hubble/lib/client/css/screen.css
	packages/telescope-theme-hubble/lib/client/scss/modules/_comments.scss
	packages/telescope-theme-hubble/lib/client/scss/modules/_posts.scss
	packages/telescope-theme-hubble/versions.json
2014-11-25 22:12:01 -08:00
Sacha Greif
b8dc56ea40 Merge branch 'master' into quickform
Conflicts:
	.meteor/versions
	client/views/settings/quickFormSettings.html
	collections/posts.js
	lib/router.js
	packages/telescope-api/versions.json
	packages/telescope-base/versions.json
	packages/telescope-module-embedly/versions.json
	packages/telescope-module-share/versions.json
	packages/telescope-notifications/versions.json
	packages/telescope-rss/versions.json
	packages/telescope-theme-base/versions.json
	packages/telescope-theme-hubble/versions.json
2014-11-26 11:22:54 +09:00
Sacha Greif
a1645e0572 Merge pull request #549 from yourcelf/patch-1
Fix telescope-search route for iron:router 1.0
2014-11-26 10:25:45 +09:00
Jamie Wilson
331f25e593 correcting template for post body 2014-11-25 15:42:17 -06:00