Commit graph

2206 commits

Author SHA1 Message Date
Sacha Greif
77fee86303 updating Meteor 2015-03-18 10:40:23 +09:00
Sacha Greif
aaf0ba013b Merge branch 'gabrielhpugliese-master' into devel 2015-03-18 09:47:31 +09:00
Sacha Greif
274f5ef577 Merge branch 'master' of https://github.com/gabrielhpugliese/Telescope into gabrielhpugliese-master 2015-03-18 09:47:15 +09:00
Sacha Greif
7be7276980 commenting and tweaking the post by feed package 2015-03-18 09:45:44 +09:00
Sacha Greif
5b3e098167 Merge branch 'delgermurun-post-by-feed-fix' into devel 2015-03-18 09:14:14 +09:00
Sacha Greif
0d27313b03 Merge branch 'post-by-feed-fix' of https://github.com/delgermurun/Telescope into delgermurun-post-by-feed-fix 2015-03-18 09:14:08 +09:00
Sacha Greif
2f5a72e8f2 Merge branch 'razvansky-master' into devel 2015-03-18 09:10:36 +09:00
Sacha Greif
793c6450e7 small fix 2015-03-18 09:10:11 +09:00
Sacha Greif
31dffc58fb Merge branch 'lowercase-usernames' into devel 2015-03-18 08:43:59 +09:00
Sacha Greif
578c201ede Merge branch 'devel' into lowercase-usernames 2015-03-18 08:43:16 +09:00
Razvan Andrei Ionescu
00b9858c0f i18n added romanian translation based on the german translation strings 2015-03-17 20:57:32 +02:00
Delgermurun
a05fa134e4 Assign feed item's categories to post.
Changed htmlparser2 to node-feedparser
2015-03-17 10:40:45 +08:00
Gabriel Pugliese
80fd546e96 Fix #754 2015-03-16 21:51:36 -03:00
Sacha Greif
7c14e6b065 fix bug with same posts being sent twice 2015-03-16 14:16:32 +09:00
Sacha Greif
27ab9ec82b use bootstrap's sr-only class 2015-03-16 10:37:08 +09:00
Sacha Greif
e4cff72e28 hide screen reader content 2015-03-16 10:05:54 +09:00
Sacha Greif
ea24b5242d Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2015-03-16 10:01:22 +09:00
Sacha Greif
553ab6d9a3 update release notes 2015-03-16 10:01:08 +09:00
Sacha Greif
ed9ba1d765 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-03-16 10:00:26 +09:00
Sacha Greif
95cd46cbcb sort hero modules by order 2015-03-16 10:00:11 +09:00
Sacha Greif
6f9e11bfe5 Merge pull request #814 from saimeunt/devel
Refactor postAfterEditMethodCallbacks execution on server
2015-03-15 12:28:51 +09:00
saimeunt
39f08a97b3 Refactor postAfterEditMethodCallbacks execution on server 2015-03-14 10:04:52 +01:00
Sacha Greif
76223dfabd Merge pull request #811 from Juaanma/patch-1
Correct base score calculation in vote.js
2015-03-14 12:28:34 +09:00
Juaanma
9e4b152ec7 Correct base score calculation in vote.js
When we downvote an item or cancel one of its upvotes, we should decrese, not increase, the base score.
2015-03-13 23:53:26 -03:00
Sacha Greif
7bdc62d9b1 Merge pull request #783 from thingista/mailchimp-fix
Mailchimp limits email subject to 150 characters
2015-03-14 10:35:01 +09:00
Sacha Greif
cae4562c9a Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-03-14 10:23:37 +09:00
Sacha Greif
b390259650 fix op tag styling 2015-03-14 10:23:22 +09:00
Ben Gott
9f70a9167b Merge pull request #810 from bengott/devel
Fix broken twitter avatars (for real this time)
2015-03-13 11:50:27 -07:00
Ben Gott
a520620856 Fix broken twitter avatars (for real this time)
- didn't notice avatarOptions object last time
2015-03-13 10:15:28 -07:00
Sacha Greif
6c13989cc3 small tweaks 2015-03-13 15:27:45 +09:00
Sacha Greif
a516c7a99d added message about signing in to reply 2015-03-13 10:18:24 +09:00
Sacha Greif
a1d304445d highlight OP's comments 2015-03-13 09:41:15 +09:00
Sacha Greif
735f3cd17d Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-03-13 08:23:37 +09:00
Sacha Greif
42994d51bb Merge pull request #809 from bengott/devel
Fix broken twitter avatars
2015-03-13 08:22:39 +09:00
Ben Gott
2af1f21d24 Fix broken twitter avatars
- services.twitter.profile_image_url_https field wasn't being published
2015-03-12 12:31:36 -07:00
Sacha Greif
5088f8e195 order items in mobile nav as well 2015-03-12 18:15:59 +09:00
Luca Mussi
73bb536c52 profile.name -> profile.username 2015-03-12 10:12:47 +01:00
Luca Mussi
dfb32ee47c cleanup 2015-03-12 10:11:48 +01:00
Luca Mussi
4dc433c757 updated updateUserNames 2015-03-12 10:11:10 +01:00
Luca Mussi
ca334b898b aligned to devel 2015-03-12 09:44:06 +01:00
Luca Mussi
a5e7295d90 aligned to devel 2015-03-12 09:43:25 +01:00
Luca Mussi
f46efc1255 Merge remote-tracking branch 'origin/devel' into lowercase-usernames
Conflicts:
	.meteor/packages
	.meteor/release
	.meteor/versions
	lib/config/at_config.js
2015-03-12 09:40:05 +01:00
Sacha Greif
0e3a96f50b fix embedly bug 2015-03-12 16:04:54 +09:00
Sacha Greif
937b37f319 show different embedly missing api key to non admins 2015-03-12 07:01:55 +09:00
Sacha Greif
eb0a792dc7 vote power tweaks 2015-03-11 17:49:42 +09:00
Sacha Greif
74f1ec9a0c Merge branch 'devel' of https://github.com/Baxter900/Telescope into Baxter900-devel 2015-03-11 17:42:21 +09:00
Bandersnatch
a8ba82eeaf Moved the method callbacks to operate before the vote is applied. 2015-03-10 21:05:29 -06:00
Sacha Greif
3e97b453de make thumbnail URL work with https 2015-03-11 11:54:57 +09:00
Sacha Greif
ce4b357abd fix for non-admin users 2015-03-11 11:34:01 +09:00
Bandersnatch
81b7c4e3fb Change votePowerEq to getVotePower. getVotePower can now be a function, or a number. 2015-03-10 20:31:31 -06:00