Commit graph

2493 commits

Author SHA1 Message Date
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
d3665b9895 refactoring sidebar menu to use main nav 2015-03-13 15:27:24 +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
a51c71c392 Merge branch 'devel' into sidenav
Conflicts:
	client/views/nav/mobile_nav.js
2015-03-13 08:29:19 +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
Sacha Greif
d50ca78e0b order items in mobile nav too 2015-03-12 18:15:34 +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
Sacha Greif
63e2acabf5 side nav prototype 2015-03-12 18:07:23 +09: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
Sacha Greif
437466dd36 Merge branch 'devel' into af5
Conflicts:
	History.md
2015-03-11 08:43:05 +09:00
Sacha Greif
340c9c61ce updating settings form 2015-03-11 08:34:44 +09:00
Sacha Greif
b7ad74e6e6 Use new set of arguments for methods and hooks 2015-03-10 14:24:05 +09:00
Sacha Greif
7ac82b579d couple tweaks to make getFormSchema work 2015-03-10 14:09:06 +09:00
Sacha Greif
49c034c6e1 Using AutoForm.getFormSchema() 2015-03-10 13:37:12 +09:00
Sacha Greif
2d021cbf15 updating autoform 2015-03-10 12:09:05 +09:00
Sacha Greif
84249414d4 update isLoggedIn filter 2015-03-10 12:05:51 +09:00
Sacha Greif
288ce9eee8 fix #790 2015-03-10 11:50:21 +09:00
Sacha Greif
b6ccc63182 Merge pull request #797 from Baxter900/devel
Improved vote accessability for packages
2015-03-10 10:59:49 +09:00
Sacha Greif
61cf165194 Merge pull request #795 from brayancruces/patch-1
Better spanish
2015-03-10 10:52:59 +09:00
Sacha Greif
f5d6a2330f Merge pull request #794 from portokallidis/devel
Add greek translation, fix english translation
2015-03-10 10:52:01 +09:00
Sacha Greif
440c96e98b Merge pull request #785 from jshimko/extra-code-helper
extraCode helper in layout template was not defined
2015-03-10 10:51:36 +09:00
Sacha Greif
bdc3e4eba4 Merge pull request #766 from ndarilek/master
Various accessibility fixes, mainly hiding unnecessary elements from scr...
2015-03-10 10:49:20 +09:00
Sacha Greif
c7fbb490f3 Merge branch 'jshimko-users-list' into devel
Conflicts:
	.meteor/versions
2015-03-10 10:47:39 +09:00
Sacha Greif
3d283ac354 small style tweaks 2015-03-10 10:42:29 +09:00
Sacha Greif
b1bb4b5e96 Merge branch 'users-list' of https://github.com/jshimko/Telescope into jshimko-users-list 2015-03-10 09:32:13 +09:00
Sacha Greif
c6a3cefadc updating to Meteor 1.0.3.2 and pinning Autoform version 2015-03-10 09:32:00 +09:00
Ben Gott
7bfabcfb1d Merge pull request #799 from bengott/avatar-tweaks
update to bengott:avatar version 0.7.5
2015-03-09 11:42:08 -07:00
Ben Gott
48230d4fc3 update to bengott:avatar version 0.7.5 2015-03-08 20:59:08 -07:00