Commit Graph

8588 Commits

Author SHA1 Message Date
Neil Lalonde d2c34d17b7 Fix failing spec. Stubbing intermittently does not stub... 2014-05-22 11:06:19 -04:00
Jeff Atwood 11348a15ea improve domain/url block message 2014-05-21 21:51:13 -07:00
Jeff Atwood 3445661898 Merge pull request #2374 from awesomerobot/master
darkening the too-light-grey and the primary black a bit
2014-05-21 18:50:36 -07:00
Kris Aubuchon e439df4b6b darkening the too-light-grey and the primary black a bit 2014-05-21 21:18:25 -04:00
Neil Lalonde 8f76b76cf3 FIX: new sites would get enable_google_logins true, should be false now 2014-05-21 19:40:59 -04:00
Neil Lalonde 867c56d9c7 Add link to google config instructions. Fix dashboard warning for google oauth2. 2014-05-21 19:11:10 -04:00
Sam 8f445e835b FIX broken spec 2014-05-22 09:08:09 +10:00
Sam eeef775f21 BUGFIX: improve error messages for invalid API keys
BUGFIX: don't track last seen for message bus
2014-05-22 09:01:29 +10:00
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
Vikhyat Korrapati d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
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