Commit graph

1054 commits

Author SHA1 Message Date
Sacha Greif
52ef153a2d make embedly work for non-admins too 2014-12-06 11:56:57 +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
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
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
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
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
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
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
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
680f3fc12c Merge branch 'master' into quickform 2014-11-30 14:40:15 +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
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
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
Sacha Greif
d36bbf69ab refactoring submitPost and editPost 2014-11-29 11:14:44 +09: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
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
e9f8f08156 updating labels 2014-11-26 11:25:39 +09: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
dbc42a7b51 renaming i18n helper from "i18n" to "_" 2014-11-25 17:16:00 +09:00
Sacha Greif
d3283e9b9c Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-11-25 15:47:49 +09:00
Ben Gott
f68ecba862 Upgrade to bengott:avatar 0.6.0
- Create new config file in lib/config/avatar.js (accessible to both
  client and server)
- Comment out some outdated SCSS/CSS
2014-11-24 01:48:04 -06:00
Sacha Greif
71e0376595 make moment i18n reactive; add global setLanguage function 2014-11-21 12:50:26 +09:00
Sacha Greif
e572274249 i18ning missing strings 2014-11-20 14:55:34 +09:00
Daniel Chcouri
2605dcb27c Convert translation keys format to tap:i18n standard
all_lower_cased_underscored_sperated names
2014-11-19 00:00:09 +08:00
Sacha Greif
e11b6db40f show error message on post edit page 2014-11-18 10:31:29 +09:00
Sacha Greif
bf90eedf37 URL can now be removed when editing a post 2014-11-18 10:27:58 +09:00
Charlie DeTar
50dd3ccece Add accumulator for userEditClientCallbacks 2014-11-17 17:11:13 -07:00
Charlie DeTar
2cf432b521 Clean up remaining throwError invocations 2014-11-17 17:00:21 -07:00
Sacha Greif
cddb3633fc Merge branch 'steffenstraetz-views-clicks-refactor' into meteor1.0
Conflicts:
	lib/router.js
	packages/telescope-notifications/versions.json
2014-11-17 11:31:58 +09:00
Sacha Greif
8d498923b2 Merge branch 'views-clicks-refactor' of github.com:steffenstraetz/Telescope into steffenstraetz-views-clicks-refactor 2014-11-17 11:25:02 +09:00
Sacha Greif
b40e490db1 updating form labels 2014-11-17 11:15:05 +09:00
Sacha Greif
73cb59a088 Working on IR 1.0 update 2014-11-17 11:01:37 +09:00
Charlie DeTar
ea7efc3550 Replace "throwError" with "flashMessage" and type
Currently, ``throwError`` is used for all manner of messages, including
errors, "success" messages, and "info" messages.  This makes appropriate
styling of the error message difficult.  In addition, the name
``throwError`` seems to create confusion, implying that an error will
actually be thrown (e.g. stopping execution when a user isn't logged in
[0][1]), when in fact it just displays a message.

Replace ``throwError`` with ``flashMessage``, and reliably include a
message "type" (e.g. "error", "success", "info") every time.  rename
``lib/errors.js`` to ``lib/messages.js`` to more accurately reflect its
function.

This commit doesn't rename the message collection (``Errors``), nor the
template responsible for rendering the messages (``error_item.html``) --
that should probably still be done, but has higher likelihood of
trouble for existing alternate themes and installations.

[0] 6ccf7d7d47/client/views/users/user_edit.js (L43)
[1] 083a4c4dc4/client/views/users/user_email.js (L13)
2014-11-05 13:12:09 -07:00
Charlie DeTar
83bb43ab46 Add hooks so packages can modify profiles
Add the following hooks:
 - ``addToUserSchema``: fields to add to the (currently unused) user
   Schema
 - ``postAuthor``: templates to use when rendering the post author in the
   byline
 - ``userProfileDisplay``: additional templates to add to the user
   profile display.
 - ``userProfileEdit``: additional templates to add to the user profile
   editing form.
 - ``userProfileFinishSignup``: additional templates to show in the view
   for completing user signup (adding email, username, etc).
 - ``userEditRenderedCallbacks``: Callbacks executed on "rendered" for
   user_edit view.
 - ``userEditClientCallbacks``: Callbacks used to further process user
   properties before saving changes in user_edit view.
 - ``userProfileCompleteChecks``: Functions called to determine whether
   a user profile is "complete" (e.g. has email, username, and whatever
   else).

These hooks facilitate package authors changing which profile fields are
displayed, which profile fields are required, and how to display
usernames next to posts.
2014-10-27 17:59:12 -06:00
Steffen Strätz
6e863598d1 Merged 2014-10-16 00:32:08 +02:00
Steffen Strätz
2fd22e9d41 Renamed "postCount" to "postsCount" to follow naming pattern of other counters 2014-10-16 00:12:13 +02:00
Steffen Strätz
226645b770 Refactored "data.commentsCount" to "commentsCount" 2014-10-15 23:59:02 +02:00