Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,177 Commits 217 Branches 500 Tags 882 MiB
Commit Graph

2780 Commits

Author SHA1 Message Date
Robin Ward aeba5ca7d9 Merge pull request #2842 from techAPJ/patch-2 
FEATURE: show topic category in email subject
 2014-10-03 12:52:34 -04:00
Arpit Jalan 0ae0552543 FEATURE: show topic category in email subject 2014-10-03 22:08:59 +05:30
Neil Lalonde 4f461739fb Update translations 2014-10-03 10:41:37 -04:00
Sam 65156bd8f6 FIX: hide dangerous dev only site settings in production 
(port/force hostname/queue jobs)
 2014-10-03 15:53:01 +10:00
Jeff Atwood e7bc896210 add spam hiding ability to lounge welcome 2014-10-02 13:44:55 -07:00
Robin Ward 381814fd5d Adds support for a description to user fields. 2014-10-02 15:56:52 -04:00
Jeff Atwood cd3461dde8 remove "Loading more topics.." text 2014-10-02 12:16:16 -07:00
Robin Ward 9564ecde76 FEATURE: Site setting for words to censor in posts 2014-10-02 13:58:58 -04:00
Sam 29bb9eaa89 Merge pull request #2835 from techAPJ/patch-2 
add user email on account created page
 2014-10-02 17:29:26 +10:00
Arpit Jalan 41af2d79b5 add user email on account created page 2014-10-02 12:43:44 +05:30
Jeff Atwood b5c5c2fe37 copyedit on backup choices 2014-10-01 22:43:31 -07:00
Neil Lalonde 85d71ba362 improve description of the purge_inactive_users_grace_period_days site setting 2014-10-01 13:46:44 -04:00
Régis Hanol 0a4753510e should have a 's' there 2014-10-01 18:54:26 +02:00
Régis Hanol 98b6b9821a FEATURE: log topic/post deletions from staff members 2014-10-01 17:40:13 +02:00
Robin Ward be93f224a6 Revert "add user email on account created page" 
This reverts commit 164fc1108a.
 2014-10-01 10:30:26 -04:00
Arpit Jalan 164fc1108a add user email on account created page 2014-10-01 13:53:50 +05:30
Jeff Atwood 6846746531 shorter email reveal text 2014-10-01 00:21:39 -07:00
Jeff Atwood 91cbdb565d remove "required information" header on custom fields 2014-09-30 11:43:06 -07:00
Neil Lalonde 48b01ff003 Merge pull request #2829 from techAPJ/update-translations 
Update Translations
 2014-09-30 11:07:49 -04:00
Robin Ward 8b5a1cd20f Migrate `tosAccepted` to new user fields 2014-09-30 10:45:18 -04:00
Robin Ward edb34c178a FEATURE: Show user fields when the user is signing up 2014-09-30 10:45:18 -04:00
Arpit Jalan 6989557a26 Update Translations 2014-09-30 19:53:17 +05:30
Jeff Atwood 872d8fce58 shorter copy for "Reveal Email" 2014-09-30 01:31:37 -07:00
Sam 0fc6c751cb FEATURE: implement lock/unlock trust level mechanics 2014-09-30 13:16:34 +10:00
riking bff95a6a97 Rename 'leader' -> 'tl3' 2014-09-30 13:16:34 +10:00
riking 36b5f73e57 Change 24 hours to soon (it runs every 4 hours) 2014-09-30 13:15:14 +10:00
riking c8111ada6e FEATURE: Allow admins to lock users from TL3 promotion/demotion 
Also, update the display logic for the leader promotion screen to
account for the demotion grace period.
 2014-09-30 13:15:13 +10:00
Régis Hanol 7e309a21cf FEATURE: hide emails behind a button for staff members 2014-09-29 22:31:05 +02:00
Robin Ward ff795a267d Merge pull request #2826 from techAPJ/patch-1 
FEATURE: add site preference for standard subjects, including support for Re
 2014-09-29 15:29:22 -04:00
Neil Lalonde 6e11ae4f5c remove deprecated TOS text content 2014-09-29 14:04:53 -04:00
Arpit Jalan 330b7ba54a FEATURE: add site preference for standard subjects, including support for Re 2014-09-29 21:54:29 +05:30
Sam 8371837b21 Merge pull request #2808 from gschlager/i18n_fix07 
FIX: Category creation failed when translation was missing
 2014-09-29 16:20:02 +10:00
Robin Ward d0fb8bbcfc Instead of `.js.handlebars` use `.hbs` for handlebars templates 2014-09-26 15:23:15 -04:00
Jeff Atwood d26227ae3d minor copy improvement 2014-09-26 10:50:32 -07:00
Jeff Atwood 3d80b25f39 improve banner copy 2014-09-25 14:02:27 -07:00
Robin Ward 0fc0533134 FEATURE: Admin interface for adding custom fields for users 2014-09-25 16:17:51 -04:00
Jeff Atwood a3e2e1fa6e better link to emoji lookups 2014-09-25 12:42:38 -07:00
Régis Hanol 69400a802f FEATURE: auto-delete any hidden posts that stay hidden for more than 30 days 2014-09-25 19:51:00 +02:00
Sam 8f8ea735ee FIX: allow retry activation of account by username or password 2014-09-25 17:42:48 +10:00
Sam c248d28c38 FEATURE: display associated accounts in admin user 2014-09-25 16:15:01 +10:00
Sam 5e0623d1e5 FEATURE: airbrake dependency removed, can be added via a plugin if needed 2014-09-25 10:30:29 +10:00
Régis Hanol bfdbb70b3b FIX: automatic backup uploads to S3 when using a region 2014-09-24 22:52:09 +02:00
Robin Ward 6c275cd64d Update i18n keys for site_content rename 2014-09-24 16:13:48 -04:00
Robin Ward bc53d48bd7 Renaming site contents to site text 2014-09-24 16:08:14 -04:00
Robin Ward 84cf402482 Merge pull request #2805 from techAPJ/patch-1 
Suppress images for short emails
 2014-09-24 15:27:34 -04:00
Arpit Jalan 0a64657fab Suppress images for short emails 2014-09-24 23:52:27 +05:30
Jeff Atwood b2c4cd8aa5 a bit more new user welcome tweaks 2014-09-24 10:24:08 -07:00
Sam dc8eb6d737 FIX: backups not using x accl redirect 2014-09-24 16:51:41 +10:00
Jeff Atwood 5d9756a2ac tweaks to new user welcome 2014-09-23 16:19:13 -07:00
Robin Ward 3afe274ccd Rename "Content" header to "Text Content" to make it more clear 2014-09-23 17:27:48 -04:00