Commit graph

8760 commits

Author SHA1 Message Date
Jeff Atwood
2531e4e3a1 old legacy css rule, not needed 2014-05-22 21:29:42 -07:00
Sam
90508fa251 oops 2014-05-23 13:11:10 +10:00
Sam
ff6755f1e5 Merge pull request #2343 from knutaldrin/patch-1
Fix suspended scope
2014-05-23 12:56:32 +10:00
Sam
019ef0afb2 Merge pull request #2375 from rl7greg/patch-1
Update INSTALL-digital-ocean.md
2014-05-23 12:46:08 +10:00
Sam
8e6843ea24 Merge pull request #2377 from derwiki/master
Add `db:create` before `db:migrate` in advanced docs
2014-05-23 12:41:42 +10:00
Sam
2350227a6f Merge pull request #2379 from awesomerobot/master
topic list highlight fix, some quote style fixes
2014-05-23 12:36:26 +10:00
Sam
cc681c729d FIX broken test 2014-05-23 12:23:12 +10:00
Kris Aubuchon
00278b42d8 topic list highlight fix, some quote style fixes 2014-05-22 21:55:50 -04:00
Sam
40d397e278 FEATURE: Unhide max username length 2014-05-23 11:36:35 +10:00
Sam
e06da1821d BUGFIX: notifications were not updated correctly live
- missing notifications when multiple replies in topic (till refresh)
- not cleared properly on click
2014-05-23 11:34:34 +10:00
Sam
1fcd72231a Use pry in development as advertised. 2014-05-23 09:49:36 +10:00
Neil Lalonde
d412cd370e FIX: compare Time with nil error in dev env. Remove nils when looking for max mtime. 2014-05-22 18:46:29 -04:00
Adam Derewecki
afe666abdf Add db:create before db:migrate in advanced docs 2014-05-22 15:44:05 -07:00
Sam
67db561429 BUGFIX: missed a key rename
BUGFIX: API spec not enabling CSRF
2014-05-23 08:43:19 +10:00
Sam
cf254000cf Revert "Revert "BUGFIX: improve error messages for invalid API keys""
This reverts commit e9afe28586.
2014-05-23 08:43:19 +10:00
Sam
43bac5467a No need to watch this dir 2014-05-23 08:43:19 +10:00
Neil Lalonde
3a023a7473 Merge pull request #2376 from techAPJ/update-translations
Update translations
2014-05-22 18:26:47 -04:00
Neil Lalonde
e9afe28586 Revert "BUGFIX: improve error messages for invalid API keys" 2014-05-22 14:55:36 -04:00
Arpit Jalan
f8255f4443 Update translations 2014-05-22 22:28:47 +05:30
rl7greg
6acbb5579a Update INSTALL-digital-ocean.md
Add link to howto to configure Google Oauth2 authentication.
2014-05-22 09:46:02 -07:00
Neil Lalonde
77845ec114 FIX: don't enable new google auth setting on an existing site 2014-05-22 11:41:31 -04:00
Neil Lalonde
c913c50c68 Remove that spec 2014-05-22 11:14:22 -04:00
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