Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,004 Commits 242 Branches 502 Tags 901 MiB
Commit Graph

7004 Commits

Author SHA1 Message Date
Sam e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam 1b66ed903f Merge pull request #2091 from Xenograph/fix-sso-override 
Added spec for SSO override username/email changes
 2014-03-10 13:11:25 +11:00
Douglas Browne a1e70ac57e Added spec for SSO override username/email changes 2014-03-09 21:38:36 -04:00
Sam bf23c7a0c4 Merge pull request #2066 from riking/red-popup 
Style 'urgent' composer popups differently
 2014-03-10 10:46:15 +11:00
Sam b0bbb1ce82 Merge pull request #2028 from ligthyear/fix-contrib-guide 
Make contribution process less restrictive on commit history
 2014-03-10 10:33:49 +11:00
Sam cbf269fdbf Merge pull request #2080 from Xenograph/fix-sso-override 
Username/email change should not be allowed with SSO and username/email override enabled
 2014-03-10 10:32:08 +11:00
Sam 57626a3930 Merge pull request #2064 from staryume/patch-5 
Update client.zh_TW.yml
 2014-03-10 10:30:48 +11:00
Sam 766c8f8f64 Merge pull request #2075 from riking/second-person 
Standardize on second person on preferences page
 2014-03-10 10:29:23 +11:00
Sam 0de759e734 UI: remove usercard hacks, specify width explictly 2014-03-10 10:27:58 +11:00
Sam 36ae165392 Merge pull request #2082 from Mikulas/czech-localization-march14 
update czech localization
 2014-03-10 10:14:12 +11:00
Sam 3f0964bf60 BUGFIX: spec would blow up when DST kicked in 2014-03-10 10:12:09 +11:00
Sam 68630af718 Merge pull request #2083 from vikhyat/firefox-paste-image 
Hack for supporting pasting images into the composer in Firefox
 2014-03-10 10:06:31 +11:00
Sam 5e83778fc1 PERF: remove ember renderspeed until we make it optional (disabled by default in prd) 2014-03-10 09:50:23 +11:00
Sam d60c7966eb PERF: remove jQuery.UI monkey patch 2014-03-10 09:50:23 +11:00
Sam c9bd12c429 Merge pull request #2090 from bcjordan/poll-readme 
Add README for poll plugin (#2089)
 2014-03-10 09:27:43 +11:00
Sam c1d998cd4b Merge pull request #2086 from vikhyat/new-unread-i18n 
i18n of new/unread text next to topics
 2014-03-10 09:27:04 +11:00
Brian Jordan 489007c700 Add README for poll plugin (#2089) 2014-03-09 15:17:58 -07:00
Sam b7ece53966 BUGFIX: rescue should splat 2014-03-09 23:06:54 +11:00
Vikhyat Korrapati b0d1d7a3e8 i18n of new/unread text next to topics. 2014-03-09 16:31:44 +05:30
Jeff Atwood 6b241a5ebf Merge pull request #2085 from awesomerobot/master 
fixing mobile notificaiton badge
 2014-03-08 21:06:50 -08:00
Kris Aubuchon c751567c04 fixing mobile notificaiton badge 2014-03-08 23:08:32 -05:00
Vikhyat Korrapati c8c150dfbe Hack for supporting pasting images into the composer in Firefox. 2014-03-09 04:24:05 +05:30
Mikulas 3fb4e36766 update czech localization 
Contributors: marmat, OukiDouki, Mirek2, zoul, MikulasDite
 2014-03-08 23:53:36 +01:00
Douglas Browne 23d7b17f1a Disabled editing of SSO overridden fields 2014-03-08 01:16:49 -05:00
Jeff Atwood c5b1ddab54 Merge pull request #2079 from awesomerobot/master 
some incremental style enhancements
 2014-03-07 22:06:28 -08:00
Kris Aubuchon 10858d3c87 some incremental style enhancements, as discussed here https://meta.discourse.org/t/discourse-design-experiments/13479 2014-03-08 00:55:02 -05:00
riking 3f7f272550 Standardize on second person on preferences page 2014-03-07 15:26:33 -08:00
Jeff Atwood 4efabef8f2 add btn-primary class to PM in usercard 2014-03-07 14:27:13 -08:00
Robin Ward 145b2931c6 FIX: Forward button would break on some topics 2014-03-07 16:28:53 -05:00
Jeff Atwood 1403d303b6 Merge pull request #2074 from awesomerobot/master 
fixing close topic/footer button/suggested topics alignment
 2014-03-07 12:13:30 -08:00
Kris Aubuchon 3be1b0decf fixing close topic/footer button/suggested topics alignment 2014-03-07 15:04:18 -05:00
Robin Ward dc9003b8d4 In the event of a misconfigured locale, don't raise an exception. 2014-03-07 14:59:29 -05:00
Robin Ward 055b367e2b Add link counts to `alt` tags of their badges. 2014-03-07 14:43:29 -05:00
Robin Ward f5c3199b38 FIX: Do not consider hidden elements when wanting to load more 2014-03-07 14:23:13 -05:00
Régis Hanol be8128b0c2 force refresh when the 'top_menu' setting changes 2014-03-07 19:07:53 +01:00
Régis Hanol 8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Robin Ward c3e5ee1d7e FIX: Failing specs 2014-03-07 12:06:20 -05:00
Robin Ward 78889163bf BUGFIX: We were tring to delete the mail string, not the mail itself. 2014-03-07 11:28:55 -05:00
Régis Hanol 18e9d319fd BUGFIX: catch STMP client errors in email sending background job 
Will log the exception message in the skipped reason instead of keeping
the job in the queue whenever the email address is invalid
 2014-03-07 16:33:15 +01:00
Régis Hanol b81f77541c Merge pull request #2073 from awesomerobot/master 
fixing the profile page that I broke
 2014-03-07 15:43:24 +01:00
Kris Aubuchon ba52091330 fixing the profile page that I broke 2014-03-07 09:36:28 -05:00
Régis Hanol 87c5c59257 Revert "Fix unmatched braces of "nav.post-controls button"" 
This reverts commit c43e86d7c6.
 2014-03-07 12:43:50 +01:00
Régis Hanol 084f51b013 FEATURE: do not show category definition topic on top pages 2014-03-07 12:02:52 +01:00
Régis Hanol f52ab7fc77 Merge pull request #2067 from riking/better-backup-name 
Add site name to beginning of backup filename
 2014-03-07 11:47:58 +01:00
Régis Hanol 2c2d3ac071 Merge pull request #2068 from riking/site_settings_refresh 
Refresh the site after updating certain site settings
 2014-03-07 11:46:15 +01:00
Régis Hanol dbb383497c Merge pull request #2072 from ligthyear/fix-edit-body-too-similar-issue 
Be more liberal when users wants to change their own body to a previous version
 2014-03-07 11:38:59 +01:00
Régis Hanol f618278b42 make sure topic specs aren't DST sensitive 2014-03-07 11:38:24 +01:00
Régis Hanol f25bcc5067 couple of bugfixes identified while importing from VB 2014-03-07 10:44:04 +01:00
Régis Hanol 7670598658 Merge pull request #2070 from nschonni/fix-mailformed-rule 
Fix unmatched braces of "nav.post-controls button"
 2014-03-07 10:37:25 +01:00
Sam e9fe8f6063 Revert "BUGFIX: if uploads is in a symlinked directory stuff breaks" 
This reverts commit 894bb0716c.

The issue here was that docker was not mounting stuff properly post
reboot, then we had a broken symlink that "exists"
 2014-03-07 19:22:40 +11:00