Commit graph

1553 commits

Author SHA1 Message Date
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
77d21ea139 Merge pull request #493 from bengott/avatar-tweaks
Update to bengott:avatar 0.2.1
2014-10-18 12:04:19 +09:00
Ben Gott
663cb88d1c Update to bengott:avatar 0.2.1 2014-10-17 18:33:37 -05:00
steffenstraetz
1dcd8e5a22 Update migrations.js
Added migration for user´s data.commentsCount
2014-10-16 22:26:03 +02:00
steffenstraetz
bb0f8155a9 Update parameters.js 2014-10-16 22:14:12 +02:00
Steffen Strätz
6d0cf0abe2 Renamed "postCount" to "postsCount" to follow naming pattern of other counters 2014-10-16 08:28:28 +02:00
Sacha Greif
6ccf7d7d47 Merge pull request #491 from bengott/email_hash-fix
Fix email_hash bug (Issue #393)
2014-10-16 09:37:32 +09: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
Ben Gott
c84279cdfe Fix email_hash bug (Issue #393) 2014-10-15 16:48:04 -05:00
Steffen Strätz
e98f4f4da9 Fixed initial value for user commentCount 2014-10-15 22:38:05 +02:00
Steffen Strätz
1a4d5cc7a7 - Renamed user "commentCount" to match post "commentsCount"
- Refactored post click counting to match naming convention with viewsCount and commentsCount and removed security issue in client code
- Fixed bug that user commentsCount would not show correctly in list
- Added migrations "commentCountToCommentsCount" and "clicksToClicksCount"
2014-10-15 22:03:12 +02:00
Steffen Strätz
1ebdbad37b Merge remote-tracking branch 'origin/views-clicks-refactor' into views-clicks-counting 2014-10-15 21:55:12 +02:00
Steffen Strätz
46d85541b7 Merge remote-tracking branch 'origin/view-click-counting' into views-clicks-counting 2014-10-15 21:55:04 +02:00
Steffen Strätz
741dbc326f Added migrations "commentCountToCommentsCount" and "clicksToClicksCount" 2014-10-15 21:49:15 +02:00
Steffen Strätz
2fbd2f0fb2 Fixed bug that users comment count would not show correctly in list 2014-10-15 21:39:22 +02:00
Steffen Strätz
e7e1accc79 - Added view counting for posts
- Refactored click counting to match view counting
- Renamed User "commentCount" to match Post "commentsCount"
- Removed security issue in client side click counting (now calling server method instead)
2014-10-15 21:23:43 +02:00
Sacha Greif
87db6a3eb0 Merge pull request #488 from bengott/avatar-tweaks
Update to bengott:avatar 0.1.4
2014-10-15 14:34:18 +09:00
Ben Gott
75a74c599d Update to bengott:avatar 0.1.4 2014-10-14 18:53:09 -05:00
Sacha Greif
e69bdb44ee Merge pull request #487 from bengott/avatar-tweaks
Update to use bengott:avatar 0.1.2
2014-10-14 17:24:46 +09:00
Ben Gott
4bb13c9243 Update to use bengott:avatar 0.1.2 2014-10-13 16:14:48 -05:00
Sacha Greif
13484d6e6a Not using Notifications collection anymore, so get rid of this migration 2014-10-08 15:15:34 +09:00
Sacha Greif
d277adfc6d wrap newsletter banner helpers in startup block 2014-10-08 11:49:34 +09:00
Sacha Greif
c46cf1cb24 Merge branch 'Kestanous-herald-integration' 2014-10-07 13:46:30 +09:00
Sacha Greif
343029bb77 kadira version bump 2014-10-07 13:46:27 +09:00
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