Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,806 Commits 245 Branches 502 Tags 902 MiB
Commit Graph

13806 Commits

Author SHA1 Message Date
Arpit Jalan fb0e7dc0b2 FIX: do not delete already redeemed invite 2015-03-25 23:30:09 +05:30
Régis Hanol 90de61ee3d S3 deprecation warning 2015-03-25 18:34:07 +01:00
Robin Ward 2b46b52b64 Merge pull request #3296 from techAPJ/patch-1 
FIX: delete duplicate invites
 2015-03-25 13:25:05 -04:00
Arpit Jalan 4862a93804 FIX: delete duplicate invites 2015-03-25 22:43:41 +05:30
Robin Ward 0c6faca7f4 FIX: Pass the `user` to `checkEmail` 2015-03-25 11:33:52 -04:00
Robin Ward 33e35930b0 FIX: Server error when no results on user directory while logged in 2015-03-25 11:18:46 -04:00
Sam e5c3266c30 Merge pull request #3295 from RaceProUK/master 
Swapped order of checks
 2015-03-25 16:55:54 +11:00
Sam eaab5c64f0 window scroll event wreaks havoc, get rid of it. 2015-03-25 16:37:30 +11:00
Sam 692433f0cf try to make it a bit smoother 2015-03-25 15:23:26 +11:00
Sam eec87b5513 workaround more missing click events 2015-03-25 14:11:17 +11:00
Sam 64cf14e19e increase timeout, so scroll event does not hit 2015-03-25 13:40:22 +11:00
Sam 908c4ce8e6 weird IOs hack to make the upload button work 2015-03-25 13:20:17 +11:00
Sam 707f4f9a58 more nasty iPad Safari and iPhone Safari hacks 2015-03-25 12:17:39 +11:00
RaceProUK 47d60ad86a Swapped order of checks 2015-03-24 22:36:54 +00:00
Sam 4bad697a8f Merge pull request #3294 from RaceProUK/master 
Added 'M' to the number formatter
 2015-03-25 09:22:20 +11:00
RaceProUK 33e37950f9 Added 'M' to the number formatter 2015-03-24 22:03:57 +00:00
Neil Lalonde 96a16743c3 add classes to global-notices so they can be found with selectors 2015-03-24 17:12:28 -04:00
Robin Ward 8fd339b994 Include the current user at the top AND in the user directory 2015-03-24 16:19:15 -04:00
Robin Ward 1e3e4135a3 Add Posts Read + Visits to User Directory 2015-03-24 15:31:54 -04:00
Neil Lalonde 66bda5267c Version bump to v1.3.0.beta4 2015-03-24 14:18:08 -04:00
Robin Ward 298098745e Allow users to reply as new to closed topics using quote functionality 
Previously, only users who could reply to a topic could use the quote
button. Now, if a user has the ability to reply as a new topic, that
operation will be used if the user selects text in a topic they can't
reply to.
 2015-03-24 14:05:08 -04:00
Robin Ward e3eaa7fa75 FIX: In long topics, filtering button was not always showing in card 2015-03-24 12:33:50 -04:00
Régis Hanol 34ee3fb059 Merge pull request #3293 from techAPJ/update-translations 
Update Translations
 2015-03-24 16:56:07 +01:00
Arpit Jalan 7acae703d9 Update Translations 2015-03-24 20:57:12 +05:30
Robin Ward 4aa2039238 Add full name in emails, tweak styles a bit. 2015-03-24 11:25:47 -04:00
Régis Hanol 944c0db00f Merge pull request #3292 from fantasticfears/discuz 
Discuz importer: update regex to remove the bbcode tags
 2015-03-24 11:16:18 +01:00
Erick Guan 186c99a1a7 update regex to remove the bbcode tags 2015-03-24 17:59:08 +08:00
Sam 1bdce815e2 FIX: workaround for Safari on iOS causing crazy composer positioning 
see: http://stackoverflow.com/questions/29001977/safari-in-ios8-is-scrolling-screen-when-fixed-elements-get-focus
 2015-03-24 17:43:05 +11:00
Sam 92e371f0b3 FEATURE: civilized mute 
Allow user to mute all notifications generated by specific users
 2015-03-24 11:55:22 +11:00
Robin Ward ff3e1e1dd7 FIX: User's topic lists weren't consistent WRT visibility 2015-03-23 18:13:06 -04:00
Régis Hanol 6930c8919e FIX: duplicate emojis in emoji-toolbar 2015-03-23 21:35:53 +01:00
Neil Lalonde 55f293d062 FEATURE: add a route to show the password reset dialog: /password-reset 2015-03-23 15:14:50 -04:00
Neil Lalonde 0124187e3a FIX: Ning json files sometimes have an extra ] at the end 2015-03-23 15:14:50 -04:00
Robin Ward 8513045381 Include user title in email notifications 2015-03-23 14:12:11 -04:00
Robin Ward 5bf7f3f4b5 FIX: Leaky DOM with `combo-box` 2015-03-23 13:04:33 -04:00
Régis Hanol 3954f69514 FIX: hoisting issue with regexp replacement patterns 2015-03-23 16:33:41 +01:00
Régis Hanol dce258017f FIX: Avatar shows over banner on mobile 
cf. https://meta.discourse.org/t/avatar-shows-over-banner-on-mobile/26668
 2015-03-23 16:08:46 +01:00
Régis Hanol ca9c350994 Merge pull request #3291 from awesomerobot/master 
clearfix for admin contents
 2015-03-23 15:32:58 +01:00
Kris Aubuchon 84d41be196 clearfix for admin contents 2015-03-23 10:23:42 -04:00
Sam 624b0b81b2 remove uneeded column 2015-03-23 17:24:23 +11:00
Sam 1601211617 Revert "FEATURE: allow end users to opt out of getting any private messages" 
This reverts commit 229ecc4f8a.
 2015-03-23 17:21:58 +11:00
Sam 229ecc4f8a FEATURE: allow end users to opt out of getting any private messages 2015-03-23 15:50:45 +11:00
Sam 8cb380354e leftover debug code 2015-03-23 15:49:02 +11:00
Sam 536c930090 update message bus so we pick up on Exception -> StandardError change 2015-03-23 12:26:18 +11:00
Sam bb20f64cb2 use standard error so its easier to catch 2015-03-23 12:20:50 +11:00
Sam 23513eaf87 get satisfaction has topics with no body 2015-03-23 12:16:43 +11:00
Sam 23ed7e9db8 Exceptions we use in the app should inherit off StandardError 2015-03-23 12:16:21 +11:00
Sam 24e4808aeb ensure titles exist 2015-03-23 11:58:17 +11:00
Sam acf6b253e1 FEATURE: pick a valid hostname for notification email based on hostname 
FEATURE: allow notification email to be set via ENV
 2015-03-23 11:57:59 +11:00
Sam 853c91d7d0 Merge pull request #3289 from fullfatthings/suppress_sso_welcome_emails 
Add an sso option to suppress welcome emails
 2015-03-23 10:36:58 +11:00