Commit graph

8479 commits

Author SHA1 Message Date
Sam
7fee3d7f8f Annotate models 2014-05-22 09:00:38 +10:00
Sam
30c86d834f * Increase pool size to allow for a few extra bg threads in sidekiq 2014-05-22 09:00:24 +10:00
Neil Lalonde
742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Sam
ca95bdb023 Username length is now minimum 20 2014-05-22 08:28:16 +10:00
Jeff Atwood
a409223141 Merge pull request #2373 from riking/patch-2
Copy: Change {x} new topics -> {x} new posts
2014-05-21 14:11:40 -07:00
Kane York
8c0841dd8f Copy: Change {x} new topics -> {x} new posts 2014-05-21 13:40:13 -07:00
Robin Ward
5e07d18069 FIX: Don't track pageView on initial load. Let the router signal that. 2014-05-21 14:04:08 -04:00
Neil Lalonde
7061f6a570 FIX: displayErrors is undefined in flags.js controller 2014-05-21 12:19:27 -04:00
Neil Lalonde
68747c8d2d FIX: category_list_spec would sometimes fail. It was passing only by luck. 2014-05-21 10:37:37 -04:00
Robin Ward
00fefb8e45 If both GA endpoints are provided, don't use both. 2014-05-21 07:36:58 -04:00
Robin Ward
3f6bf2fda0 FIX: Home key was broken due to some HTML changes 2014-05-21 07:30:47 -04:00
Sam
1714bfe441 SECURITY: fix XSS when expanding quotes 2014-05-21 15:03:31 +10:00
Jeff Atwood
0ea11fbb81 Merge pull request #2371 from riking/nojs-layout
Tweak the no-js layout
2014-05-20 17:13:51 -07:00
riking
7f0b66246b Tweak the no-js layout 2014-05-20 16:34:18 -07:00
Robin Ward
64355c989e FIX: Don't extract links from empty quotes 2014-05-20 17:20:52 -04:00
Robin Ward
010da29957 FIX: Plugin transpilation should work in workspaces that aren't called
`discourse`
2014-05-20 16:54:59 -04:00
Neil Lalonde
4d3c19f736 OOPS: fix broken spec 2014-05-20 15:32:42 -04:00
Robin Ward
6dd1880f1f FIX: More safety when displaying link counts on blogs 2014-05-20 15:20:33 -04:00
Neil Lalonde
9445bea530 FIX: add line numbers and file names to generated css 2014-05-20 14:23:50 -04:00
Robin Ward
f698ffd522 FIX: Weird back button behavior when going from group members -> profile
and then back.
2014-05-20 13:38:16 -04:00
Robin Ward
18eca4605b Merge pull request #2370 from techAPJ/update-transifex-link
update Transifex project link
2014-05-20 13:17:14 -04:00
Arpit Jalan
dbe525b9de update Transifex project link 2014-05-20 22:24:19 +05:30
Robin Ward
8a24a34b1b ES6: More controllers 2014-05-20 12:49:38 -04:00
Robin Ward
29fa2d2fc2 Merge pull request #2355 from vikhyat/poll-plugin
Set up poll plugin javascript using an Ember initializer
2014-05-20 11:25:35 -04:00
Robin Ward
5bbe938e82 FIX: Backwards compatibility layer was not handling constants that ended
with 's'
2014-05-20 11:13:43 -04:00
Jeff Atwood
1ed56eba7a Merge pull request #2366 from riking/patch-5
Allow anonymous to see raw posts
2014-05-20 01:01:15 -07:00
Jeff Atwood
ebcfdde752 Merge pull request #2369 from riking/anchors-internal
Consider URLs starting with # as internal
2014-05-20 00:56:38 -07:00
riking
96f97d9d4c Consider URLs starting with # as internal 2014-05-20 00:54:22 -07:00
riking
41332ab7ad Allow anonymous to see raw posts 2014-05-19 23:33:27 -07:00
Harry Seo
2ef2afa06c korean translation: *.ko.html.erb 2014-05-20 14:40:21 +09:00
Jeff Atwood
32000228e6 correct error in CSS 2014-05-19 22:27:33 -07:00
Jeff Atwood
f36bdc984d Merge pull request #2364 from riking/patch-4
Remove the special styling on the Categories link
2014-05-19 22:22:47 -07:00
riking
2c6ab4c699 Remove the special styling on the Categories link 2014-05-19 22:21:35 -07:00
Jeff Atwood
6617bfa454 add glyph to Sign In to Reply button 2014-05-19 22:10:47 -07:00
Jeff Atwood
6b864474ea Merge pull request #2363 from awesomerobot/master
some simple style cleanup
2014-05-19 21:43:41 -07:00
Kris Aubuchon
7accf5aafa some simple style cleanup 2014-05-19 23:55:46 -04:00
Sam
c1776fa1ae Merge pull request #2360 from vikhyat/badge-system
Badge system updates
2014-05-20 08:24:26 +10:00
Sam
094cee828b Merge pull request #2352 from riking/patch-2
Include pry-rails in production
2014-05-20 08:23:26 +10:00
Jeff Atwood
0e160cc5b3 minor copyedit 2014-05-19 13:51:03 -07:00
Jeff Atwood
9c51d79d81 shorten "all subcategories" 2014-05-19 00:11:32 -07:00
Jeff Atwood
b352f70c5c Merge pull request #2357 from techAPJ/master
Update MIGRATION.md
2014-05-18 23:39:53 -07:00
Jeff Atwood
84ead32956 Merge pull request #2361 from awesomerobot/master
making the color customizer a little nicer with dark themes
2014-05-18 22:40:38 -07:00
Vikhyat Korrapati
a25087b62a Badges admin UI improvements.
* Query param to allow linking.
* Better handling of deleting unsaved badges.
* New badge list item style improvement.
2014-05-19 10:50:57 +05:30
Kris Aubuchon
ffa33c572c making the color customizer a little nicer with dark themes 2014-05-19 01:17:59 -04:00
Vikhyat Korrapati
4de700b49b Change badge user list limit to 96 so that it is divisible by 8. 2014-05-19 10:32:59 +05:30
Vikhyat Korrapati
6b7b328c66 Badges page ordering and titles. 2014-05-19 10:27:09 +05:30
Vikhyat Korrapati
6225b83f4a Show system badges in the admin interface but don't allow editing them. 2014-05-19 10:27:04 +05:30
Sam
8bc8052ab8 BUGFIX: show usernames logic, logic failure 2014-05-19 09:11:01 +10:00
Sam
832a730e36 BUGFIX: re-enable CDN js debugging in a robust way
May be disabled if needed via site setting
2014-05-19 08:46:28 +10:00
Jeff Atwood
5901ed6842 Merge pull request #2358 from fantasticfears/css_tweak
Fix c6ef85d517. Align reply area, 10px padding.
2014-05-18 11:04:43 -07:00