Commit graph

14186 commits

Author SHA1 Message Date
Sam
bbd5452b8d Do not alert if we have no topic (eg topic deleted) 2015-05-06 13:25:23 +10:00
Sam
ca2309c6ec correct concurrency issue in message bus 2015-05-06 13:19:41 +10:00
Sam
c6fe90006e correcly grap name, omit needless query 2015-05-06 12:55:33 +10:00
Sam
c96a057395 ignore routing errors on multisite 2015-05-06 12:47:30 +10:00
Sam
19e5304813 add hostname to fake env 2015-05-06 12:28:32 +10:00
Sam
124ae8ada6 correct spec 2015-05-06 12:01:47 +10:00
Sam
376b28b0ed FIX: raise a 404 if click tracker gets no url 2015-05-06 11:27:41 +10:00
Sam
0bbf6354eb FIX: in some cases link was not followable due to click tracker 2015-05-06 11:22:53 +10:00
Sam
6fab03b777 do not alert on deleted posts 2015-05-06 10:44:45 +10:00
Sam
b7e7da766d avoid static method so we can easily inherit off this class 2015-05-06 09:53:29 +10:00
Neil Lalonde
2139a6208b FIX: multisite migration fails when adding a new site because SiteSetting.slug_generation_method is nil 2015-05-05 18:50:54 -04:00
Sam
0f53fc8328 correct emergency regeneration in the controller 2015-05-06 07:33:32 +10:00
Sam
2625c3bb9a avoid work if nothing there 2015-05-06 07:12:38 +10:00
Régis Hanol
2d3a090060 FIX: poll design on mobile 2015-05-05 20:14:38 +02:00
Régis Hanol
73703dd557 FIX: poll fake 3D button effect with custom background color 2015-05-05 20:00:42 +02:00
Neil Lalonde
72cb784eae UX: mobile categories page is more like desktop categories page 2015-05-05 12:04:18 -04:00
Sam
ea670118c1 Add better error handling, correct the location on disk of stylesheet 2015-05-05 23:28:40 +10:00
Régis Hanol
eb244bac34 Merge pull request #3370 from fantasticfears/slug
FEATURE: add slug geneartion options
2015-05-05 14:26:40 +02:00
Erick Guan
a48dd1cc28 store the slug as the title is, only sanitize the slug
and prettify code
2015-05-05 18:33:16 +08:00
Erick Guan
b772ff6e13 FEATURE: add slug geneartion options 2015-05-05 18:08:30 +08:00
Sam
2344aa2fdd PERF: place letter avatars inside the tmp folder
this avoids transient recoverable data in our uploads directory
2015-05-05 15:58:49 +10:00
Sam
f58d85edea FEATURE: move stylesheet cache out of the uploads directory 2015-05-05 15:50:13 +10:00
Sam
8e372f3616 FEATURE: add op-bookmark class for op-bookmarks 2015-05-05 10:23:17 +10:00
Sam
b4f666630e make jshint happy 2015-05-05 10:10:50 +10:00
Sam
66423e62dc FIX: don't strip / mangle full quotes 2015-05-05 10:06:48 +10:00
Sam
8bea398cc1 Merge branch 'master' of github.com:discourse/discourse 2015-05-05 09:49:07 +10:00
Régis Hanol
90c05ff045 FIX: two-column poll 2015-05-04 22:29:45 +02:00
Jeff Atwood
a2d8cd501c Merge pull request #3430 from downeym/master
Fixing map-marker FontAwesome typo
2015-05-04 13:21:03 -07:00
Michael Downey
41a0b16cc6 Fixing map-marker FontAwesome typo
The correct icon is map-marker, not map-maker.
2015-05-04 15:53:10 -04:00
Neil Lalonde
963ebf5963 FIX: if approving a user when must_approve_users is false, don't send an email 2015-05-04 15:30:25 -04:00
Jeff Atwood
b84c4ef0c6 add warning around must_approve_users 2015-05-04 11:33:03 -07:00
Robin Ward
4745eca4ad FIX: Don't abort PurgeInactive if they have posts. Just skip. 2015-05-04 11:37:49 -04:00
Robin Ward
7e3eaf5b02 FIX: Never enqueue private messages 2015-05-04 11:07:46 -04:00
Régis Hanol
5c7b984d2f Merge pull request #3429 from gschlager/patch-1
Replace all occurrences of totalVotes with voters
2015-05-04 16:23:33 +02:00
Gerhard Schlager
409a367ab7 Replace all occurrences of totalVotes 2015-05-04 16:20:13 +02:00
Régis Hanol
86d7412f30 REFACTOR: rename "total_votes" poll field to the more accurate "voters"
FEATURE: automagically load plugin's migrations
2015-05-04 16:01:57 +02:00
Jeff Atwood
8f706f11cb remove trust level reference from flag unhide PM 2015-05-04 01:19:04 -07:00
Régis Hanol
e9ade9c0e1 Merge pull request #3428 from techAPJ/patch-2
UX: show caps lock warning on password reset page
2015-05-04 09:38:02 +02:00
Arpit Jalan
f3687b6e56 UX: show caps lock warning on password reset page 2015-05-04 13:01:35 +05:30
Sam
bbef1e3493 whitelisted correctly later on 2015-05-04 16:32:31 +10:00
Jeff Atwood
77992a11b9 correct copy and de-experimental browser icon count 2015-05-03 23:29:56 -07:00
Jeff Atwood
9a2d999d5a Merge pull request #3427 from techAPJ/patch-3
FIX: allow site_name to be present in rejection email subject
2015-05-03 23:23:54 -07:00
Sam
539ca73668 avoid N+1 query even if no custom fields exist 2015-05-04 16:12:03 +10:00
Sam
0369f26a39 add some ignores 2015-05-04 16:12:03 +10:00
Sam
c3e3afcb2c PERF: eliminate N+1 query due to polls 2015-05-04 16:12:03 +10:00
Arpit Jalan
d9ec6888e1 FIX: allow site_name to be present in rejection email subject 2015-05-04 11:22:54 +05:30
Sam
374e7325fa Merge pull request #3416 from gschlager/transifex
Simplify the pull_translations script
2015-05-04 14:39:02 +10:00
Sam
4dfc1907ac Simplify desktop notifications, only include if mention/reply/pm/link
Include post excerpt in the notification
2015-05-04 13:49:32 +10:00
Sam
803feefd54 MessageBus handles readonly redis now, no need to wrap it 2015-05-04 12:21:00 +10:00
Sam
1c7fa956dc Improve Notification probing 2015-05-04 11:14:03 +10:00