Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,785 Commits 250 Branches 502 Tags 918 MiB
Commit Graph

9785 Commits

Author SHA1 Message Date
Jeff Atwood fba2a00265 very minor copy update 2014-07-03 12:50:50 -07:00
Jeff Atwood e10dee64fc Merge pull request #2499 from toolness/patch-4 
Added a link to the configuring SSO thread.
 2014-07-03 11:47:48 -07:00
Atul Varma 6981d5c833 Added a link to the configuring SSO thread. 
Lots of folks who want SSO might not realize it's supported by Discourse out-of-the-box, so I linked to the appropriate thread on the meta forum.
 2014-07-03 13:02:08 -04:00
Robin Ward 4f09317cb3 ES6: A bunch of modal views 2014-07-03 12:39:14 -04:00
Robin Ward e5059137d0 TRIVIAL: Remove log statement 2014-07-03 11:32:10 -04:00
Robin Ward f247ea89b0 TWEAK: Show subcategory name even if there is a logo 2014-07-03 11:31:42 -04:00
Neil Lalonde a4a90475cf FIX: scrub freedom_patch should take the optional replacement_char argument. Mysql2::Error uses it. mysql2 is used by some import scripts. 2014-07-03 11:11:21 -04:00
Robin Ward 7ac4372427 Merge pull request #2455 from riking/error-route 
Fancy error page for topic lists
 2014-07-03 10:53:19 -04:00
riking 0d4163e0a2 FEATURE: Nice error handling page 2014-07-03 07:52:14 -07:00
riking 0612018569 Include the 'textStatus' field in DC.ajax rejection 2014-07-03 07:52:12 -07:00
Neil Lalonde 4e1f76d3b9 Merge pull request #2497 from BenLubar/benlubar-import-id-on-imported-posts 
set import_id on imported posts
 2014-07-03 10:22:25 -04:00
Sam 0de564f598 Correct reqs 2014-07-03 22:34:45 +10:00
Sam 5a28609afc FIX: listable badges need more logic 2014-07-03 20:34:26 +10:00
Sam decff6dc85 revert viewport change on mobile 
(truncates stuff on iphone)
 2014-07-03 20:34:13 +10:00
Sam 9157f51618 FEATURE: upgrade font awesome to head 2014-07-03 17:58:12 +10:00
Sam 6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Sam db34b534e6 Merge pull request #2494 from techAPJ/bulk-invite-4 
FEATURE: support txt file to be uploaded for bulk invite
 2014-07-03 17:33:16 +10:00
Sam 2ba35ae707 Merge pull request #2498 from awesomerobot/master 
fixing a handful of issues
 2014-07-03 17:32:14 +10:00
Sam 1ed97437ef Merge pull request #2490 from techAPJ/update_rake_task-2 
Update admin create task
 2014-07-03 17:31:55 +10:00
Sam 9a9ad9bda8 FEATURE: Badge progress 
- Refactor model so it stores backfill query
- Implement autobiographer
- Remove sample badge
- Correct featured badges to only include a badge once
 2014-07-03 17:29:44 +10:00
Kris Aubuchon aee73d901a fixing a handful of issues 2014-07-02 23:21:45 -04:00
Sam 8701a39044 FIX: improve matching algorithm 2014-07-03 11:29:02 +10:00
Sam 6d8200b1b1 FIX: smarter suppression of name 
match on lowercase, trim.
 2014-07-03 11:20:58 +10:00
Robin Ward 554e5c8482 XSS: Escape the custom title (admin only) when displaying group titles. 2014-07-02 19:55:52 -04:00
Jeff Atwood 162b5abae6 don't need thanks here 2014-07-02 15:13:34 -07:00
Régis Hanol 9b43333f3f TRIVIAL: removes unecessary #if bindings 2014-07-02 23:01:23 +02:00
Régis Hanol e148d2340f removes summary filter when clicking on the likes count in topic lists 2014-07-02 22:58:07 +02:00
Robin Ward 334becd0ed SECURITY: Upgrade Rails to latest version 2014-07-02 16:55:18 -04:00
Neil Lalonde 67b9fec204 FEATURE: option to use ruby-bbcode-to-md to convert bbcode to markdown before importing posts 2014-07-02 16:53:53 -04:00
Robin Ward 462dcadd01 FEATURE: Subcategory list on parent subcategory page. 2014-07-02 16:47:43 -04:00
Robin Ward 4592916026 ES6: Convert route builders to initializer 
Remove deprecated `Discourse.addInitializer`
 2014-07-02 16:47:43 -04:00
Neil Lalonde 3cb74577a3 Version bump to v0.9.9.11 2014-07-02 16:43:37 -04:00
Neil Lalonde 337630a216 Update translations 2014-07-02 16:42:59 -04:00
Régis Hanol 9abef57312 BUGFIX: staff counters weren't taking into acount deleted posts/actions 2014-07-02 22:33:18 +02:00
Régis Hanol 791fb704f7 Merge pull request #2496 from discourse/revert-2495-master 
Revert "background on topic-list, more width on extra-info-wrapper, meta...
 2014-07-02 16:55:52 +02:00
Régis Hanol 7feab2fc99 Revert "background on topic-list, more width on extra-info-wrapper, meta viewport fix" 2014-07-02 16:55:43 +02:00
Jeff Atwood 2a705fff6c Merge pull request #2495 from awesomerobot/master 
background on topic-list, more width on extra-info-wrapper, meta viewport fix
 2014-07-02 07:01:15 -07:00
Kris Aubuchon e0194e69a5 adding background to topic-list, making max-width larger on extra-info-wrapper, and changing viewport config 2014-07-02 09:54:40 -04:00
Arpit Jalan 85ba55dc26 FEATURE: support txt file to be uploaded for bulk invite 2014-07-02 19:21:15 +05:30
Régis Hanol 18f5751f3f BUGFIX: cap image widths in usercards & user profiles 2014-07-02 14:56:09 +02:00
Régis Hanol 1bd7c90168 Merge pull request #2493 from techAPJ/system-user-notifications 
TRIVIAL: remove obsolete comments
 2014-07-02 14:11:37 +02:00
Arpit Jalan af4101f783 TRIVIAL: remove obsolete comments 2014-07-02 17:05:06 +05:30
Jeff Atwood 94fd592dfa lock alignment is better with vertical-align:middle 2014-07-02 03:37:10 -07:00
Régis Hanol bcad8f6441 Merge pull request #2492 from techAPJ/system-user-notifications 
Send notifications for backup/restore from system user
 2014-07-02 11:57:55 +02:00
Arpit Jalan d0753ec7a5 Send notifications for backup/restore from system user 2014-07-02 15:01:32 +05:30
Régis Hanol d23c7cdc65 Merge pull request #2491 from techAPJ/system-user-notifications 
FEATURE: Send notification by system user for bulk invite
 2014-07-02 11:19:04 +02:00
Arpit Jalan aeec5067d5 FEATURE: Send notification by system user for bulk invite 2014-07-02 14:28:57 +05:30
Jeff Atwood df59f0a6e1 add one more SPF syntax link to email test 2014-07-02 01:03:30 -07:00
Jeff Atwood 89adbae3ca better email deliverability guidance 2014-07-02 01:01:04 -07:00
Arpit Jalan 7cb67b028d Update admin create task 2014-07-02 13:30:38 +05:30