Commit graph

1527 commits

Author SHA1 Message Date
Sacha Greif
7b430bff72 re-enable emailNotifications setting 2014-10-07 13:45:48 +09:00
Sacha Greif
521afdc50d Merge branch 'herald-integration' of github.com:Kestanous/Telescope into Kestanous-herald-integration
Conflicts:
	.meteor/versions
	packages/telescope-kadira/versions.json
	packages/telescope-notifications/lib/notifications.js
2014-10-07 10:34:23 +09:00
Sacha Greif
ff0ef69e6d Merge pull request #472 from AdmitHub/telescope-master-add-queries
Add missing adminMongoQuery and notAdminMongoQuery
2014-10-07 09:29:39 +09:00
Charlie DeTar
b6a98e0deb Add missing adminMongoQuery and notAdminMongoQuery
These parameters, introduced in
ed09d0ea7c, weren't defined in that PR but
should have been.
2014-10-06 09:49:50 -06:00
Sacha Greif
73e05960e4 Merge pull request #466 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2014-10-06 13:46:28 +09:00
Sacha Greif
6c10c0e4a8 Merge pull request #469 from massimilianomarini/kadira-package-update
Kadira package update to latest release 2.11.2
2014-10-06 11:39:52 +09:00
Sacha Greif
29a57565e6 Merge pull request #468 from massimilianomarini/italian-translation
Update it.js
2014-10-06 11:39:32 +09:00
Sacha Greif
33b102c5cf Fixing #457 2014-10-06 10:27:28 +09:00
Massimiliano Marini
528a3b328d Update Kadira package to latest release 2.11.2 2014-10-05 12:31:50 +02:00
Massimiliano Marini
cb7ba31f9f Update Kadira package to latest release 2.11.2 2014-10-05 12:30:29 +02:00
Massimiliano Marini
8309738193 Update it.js 2014-10-05 12:13:28 +02:00
Sacha Greif
cd1496897d updating packages 2014-10-05 17:23:05 +09:00
Sacha Greif
73d1098646 Make it possible to hide fields from quickform; cleanup 2014-10-05 10:12:10 +09:00
Sacha Greif
f5c4908d12 Upgrading to 0.9.3.1 2014-10-04 12:51:44 +09:00
The Gitter Badger
06227de3c4 Added Gitter badge 2014-10-04 02:03:29 +00:00
Sacha Greif
29495788e8 Merge pull request #454 from bengott/avatar-tweaks
Update to use bengott:avatar package for user avatars
2014-10-04 10:14:49 +09:00
Sacha Greif
53442243b9 Merge pull request #462 from AdmitHub/telescope-master-search-querystring
Add querystring updates to search
2014-10-04 09:28:50 +09:00
Sacha Greif
99e82d41a5 Merge pull request #463 from AdmitHub/telescope-master-isadmin
Fully abstract isAdmin
2014-10-04 09:22:29 +09:00
Charlie DeTar
ed09d0ea7c Fully abstract isAdmin
We're using a fork with a different definition of "isAdmin" (using
``meteor-roles`` rather than the boolean user.isAdmin).  ``lib/user.js``
provides abstracted methods for reading admin state, which makes it very
easy to change our definition -- except that the abstractions weren't
used universally.

This commit finishes the job of using the abstractions, and adds a few
new parts to also allow abstracting setting and updating admin-ness:

 - setAdmin: sets admin status directly on a user object.
 - updateAdmin: executes a mongo update to set admin status.
 - adminMongoQuery: the query parameter for admin-ness, for composing
   user queries with other fields.
 - notAdminMongoQuery: the query parameter for not-admin-ness.
2014-10-03 16:21:06 -06:00
Charlie DeTar
582ee672ab Add querystring updates to search
Update and parse a "?q=" query string for search to improve cross-site
linkability.
2014-10-03 15:48:42 -06:00
Sacha Greif
3152474670 Merge pull request #458 from Helmi/master
German translation (de.js)
2014-10-03 22:23:48 +09:00
Helmi
6189fa40c8 German translation (de.js)
Some notes: there should be an option to use more than 2 characters for translation. For german you would at least need de_formal and de_informal. I did the informal translation as i found it more useful for myself and i think for most users.

Also i decided to translate "Posts" into "Links" as generally this are links and "Posts" doesn't have a german word that is general enough to not translate more into "Articles" which definitely are not the right phrase to use.

Also i found some not yet translated features but as i translated based on the actual master and not on a release i guess this is a known Problem.
2014-10-03 15:01:18 +02:00
Kestanous
9be1bd7169 herald integration 2014-10-02 16:42:31 -04:00
Ben Gott
bab24860d6 Update to use bengott:avatar package for all user avatars 2014-09-30 12:34:42 -05:00
Sacha Greif
f994b0de5e Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-30 15:53:44 +09:00
Sacha Greif
9c1e00ac95 Make no_rights and not_found templates customizable 2014-09-30 15:53:36 +09:00
Sacha Greif
72d88831a7 Merge pull request #450 from delgermurun/posts-rss-refactor
Posts rss refactor
2014-09-29 17:39:09 +09:00
Delgermurun
4fd7c444e5 use getPostsParameters on posts rss 2014-09-29 16:31:41 +08:00
Delgermurun
1aef145973 use STATUS_APPROVED constant on getPostsParameters 2014-09-29 16:24:47 +08:00
Sacha Greif
44da19ff9d Merge pull request #449 from delgermurun/hide-future-posts
Hide future posts
2014-09-29 17:20:32 +09:00
Delgermurun
b5edbdf08e exclude future scheluded posts 2014-09-29 15:45:40 +08:00
Delgermurun
0ff3fc7dba rename getParameters to getPostParameters 2014-09-29 15:42:35 +08:00
Sacha Greif
5d4805c137 Merge pull request #448 from splendido/at-integration
update to accounts-templates-unstyled 0.9.7
2014-09-29 15:49:17 +09:00
Sacha Greif
a898debf3f version bump 2014-09-29 15:44:34 +09:00
Sacha Greif
2f23db1241 Updating history 2014-09-29 15:43:34 +09:00
Sacha Greif
0a118cb5c3 Minor form tweaks 2014-09-29 15:40:09 +09:00
Luca Mussi
efeeacb46d better language change for accounts-t9n 2014-09-29 08:26:53 +02:00
Luca Mussi
98769bb429 update to accounts-templates-unstyled 0.9.7 2014-09-29 08:22:23 +02:00
Sacha Greif
f886142c4f Renaming "test" autoform to "settings" 2014-09-29 11:09:36 +09:00
Sacha Greif
7625687860 Merge branch 'better-settings'
Conflicts:
	packages/telescope-daily/lib/client/routes.js
2014-09-29 11:08:07 +09:00
Sacha Greif
90bd327e22 call getTemplate inside anonymous function so that it's only evaluated on route run 2014-09-29 10:35:03 +09:00
Sacha Greif
f00ffd8498 Adding instructions to settings form 2014-09-29 10:15:21 +09:00
Sacha Greif
8262b97f50 wrap postsDaily helper in Meteor.startup() 2014-09-29 09:20:40 +09:00
Sacha Greif
aee7f4c629 put controller block in startup() 2014-09-29 09:06:40 +09:00
Sacha Greif
2a0c545757 Put controller block in Meteor.startup() 2014-09-29 09:05:21 +09:00
Sacha Greif
971822f7b4 fixing postsDaily template typo 2014-09-29 08:25:11 +09:00
Sacha Greif
51de4d79db splitting settings form into field sets 2014-09-28 16:31:12 +09:00
Sacha Greif
b6becdab3a Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-28 08:46:45 +09:00
Sacha Greif
8b6e5215fd fix #441 2014-09-28 08:46:20 +09:00
Sacha Greif
102077ac76 Merge pull request #438 from bengott/avatar-tweaks
Avatar Tweaks
2014-09-28 08:27:50 +09:00