Sacha Greif
664c953744
fix bug with post submit error callback
2014-12-06 17:49:29 +09:00
Sacha Greif
d2d581fca9
rename errors to messages
2014-12-06 17:49:17 +09:00
Sacha Greif
b6c54c106d
renaming errors to messages
2014-12-06 17:41:15 +09:00
Sacha Greif
ff8bf40694
Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages
...
Conflicts:
client/helpers/handlebars.js
client/views/comments/comment_edit.js
client/views/comments/comment_form.js
client/views/comments/comment_item.js
client/views/posts/modules/post_upvote.js
client/views/posts/post_edit.js
client/views/posts/post_submit.js
client/views/users/user_edit.js
client/views/users/user_email.js
lib/router.js
packages/telescope-tags/lib/client/views/category_item.js
2014-12-06 17:34:08 +09:00
Sacha Greif
52ef153a2d
make embedly work for non-admins too
2014-12-06 11:56:57 +09:00
Sacha Greif
f2736c05c7
limit autoValue to inserts
2014-12-05 09:44:50 +09:00
Sacha Greif
053183f5b5
fix approve/unapprove links
2014-12-05 09:33:07 +09:00
Sacha Greif
365eb467a2
more epic editor clean up
2014-12-05 08:23:31 +09:00
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
5d5a8294fa
do not show admin field group at all if user is not admin
2014-12-04 13:10:18 +09:00
Sacha Greif
f2965feb5a
Merge branch 'AdmitHub-telescope-master-profile-hooks'
2014-12-04 13:04:45 +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
93e201de5f
Merge branch 'master' of https://github.com/TelescopeJS/Telescope
2014-12-03 09:36:08 +09:00
Sacha Greif
f8f52fd1f7
Merge branch 'delgermurun-feed-for-views'
2014-12-03 09:35:56 +09:00
Sacha Greif
93fbe47f79
updating rss server-side routes for new IR syntax
2014-12-03 09:35:41 +09:00
Sacha Greif
b2c51ddb85
Merge pull request #581 from anthonymayer/invites-cleanup
...
Fixes #444 - Adding UserEditController to show invites correctly
2014-12-03 09:26:52 +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
423b3f9c39
history
2014-12-03 09:13:53 +09:00
Sacha Greif
eda570d66f
clean up
2014-12-03 09:10:14 +09:00
Sacha Greif
17431dfb87
removing Epic Editor files
2014-12-03 09:07:59 +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
Anthony Mayer
c8d5e3ca25
Fixes #444 - Adding UserEditController to show invites correctly
...
Gets rid of AccountController in favor of UserEditController, which
shows data consistently for both admins and owners. Also, makes sure
that only authorized users can see the page.
2014-11-30 18:23:19 -08: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
Sacha Greif
f0f22b0c53
Merge pull request #580 from anthonymayer/expanding-search-box
...
Fixes #572 - Expands search box when focused or not empty.
2014-12-01 10:13:13 +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
278f3b5781
Merge pull request #573 from anthonymayer/hide-mobile-nav-dropdowns
...
Hide mobile nav dropdowns
2014-11-30 14:38:04 +09:00
Sacha Greif
0e2ec4ef1c
add placeholder templates before and after each post item
2014-11-30 14:36: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
f8474c30f7
working on settings form i18n
2014-11-30 12:04:21 +09:00
Sacha Greif
69b3ec2352
making embedly thumbnail width and height configurable
2014-11-30 11:31:07 +09:00
