Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,261 Commits 213 Branches 500 Tags 869 MiB
Commit Graph

9261 Commits

Author SHA1 Message Date
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
Sam 198731de23 FIX: 100% cpu while parsing feeds 2014-07-02 13:53:04 +10:00
Sam 700b3c010f FIX: tests to pass with badges enabled 2014-07-02 13:11:24 +10:00
Sam 5a0aed2bfa FIX: regression, forgot password broken 
also... mocks were invented by the devil
 2014-07-02 13:06:55 +10:00
Sam 58ada6f847 FEATURE: enable badges by default. 2014-07-02 12:32:16 +10:00
Sam a4b7b561dc Add link to badge reason on badge details page. 2014-07-02 09:46:28 +10:00
Sam 60d93a62f6 FIX: tighten up email token durations 2014-07-02 09:08:25 +10:00
Sam 2a998fd787 Merge pull request #2489 from techAPJ/update_rake_task 
Update admin rake task
 2014-07-02 08:43:25 +10:00
Jeff Atwood c40d999407 better generic "posting error" in email replies 2014-07-01 15:40:12 -07:00
Neil Lalonde 3f16e1e335 Enable trust level 3 promotion/demotion job 2014-07-01 17:34:07 -04:00
Robin Ward 1f829c4e70 WIP: New site setting to show subcategory list on category list 2014-07-01 17:12:03 -04:00
Arpit Jalan cd07bf5611 Update admin rake task 2014-07-02 02:03:02 +05:30
Robin Ward 37ed5a3001 FEATURE: Show logos on the categories page, if present 2014-07-01 16:25:22 -04:00
Jeff Atwood 7f817526c6 better copy for site update notice modal 2014-07-01 13:10:40 -07:00
Robin Ward f62b05c985 FIX: Apply category class when inside a topic of that category 2014-07-01 16:06:48 -04:00
Robin Ward c94cf78291 CSS: Alignment of category buttons for admins 2014-07-01 16:06:48 -04:00
Robin Ward 7a739eb373 FIX: Don't lose background class while navigating from `/latest` to 
`/new`
 2014-07-01 16:06:47 -04:00
Neil Lalonde 9a09817767 Show Create Topic button on /categories page, unless Create Category button is shown 2014-07-01 16:05:03 -04:00
Robin Ward 288bb5588f Use different approach for background image 2014-07-01 13:40:09 -04:00
Régis Hanol f683bda062 BUGFIX: staff counters weren't properly positioned in user profile 2014-07-01 19:39:45 +02:00
Neil Lalonde 292e9bb611 TL3: Add requirements for min all-time topics viewed, and min all-time posts read 2014-07-01 13:34:57 -04:00
Robin Ward d9e583af1a FEATURE: Add new site setting to restrict how many times you can click on an 
invite to "passthrough" as logged in, with a default of 0 hours. Also changes
default invite expiry from 7 days to 1.
 2014-07-01 12:52:52 -04:00
Robin Ward bad5938cdd ES6: All list views 2014-07-01 12:02:06 -04:00
Robin Ward de17c693fc Merge pull request #2487 from toolness/patch-2 
Update DEVELOPER-ADVANCED.md with Sidekiq info
 2014-07-01 11:28:47 -04:00
Robin Ward 366b9dae5c Merge pull request #2488 from toolness/patch-3 
Add imagemagick to basic setup apt-get install.
 2014-07-01 11:28:00 -04:00