Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,112 Commits 180 Branches 498 Tags 916 MiB
Commit Graph

11112 Commits

Author SHA1 Message Date
Robin Ward be93f224a6 Revert "add user email on account created page" 
This reverts commit 164fc1108a.
 2014-10-01 10:30:26 -04:00
Jeff Atwood 7a0b1c1dff Merge pull request #2832 from techAPJ/patch-1 
add user email on account created page
 2014-10-01 04:27:59 -07: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
Sam 3863553275 Merge pull request #2830 from Elberet/smf2-import 
FIX: made SMF2 importer compatible with Ruby 2.0
 2014-10-01 10:17:54 +10:00
Robin Ward 6746d96336 More deprecation fixes for `{{action}}` 2014-09-30 16:04:04 -04:00
Jens Maier b74a7d271a FIX: made SMF2 importer compatible with Ruby 2.0 2014-09-30 21:01:50 +02:00
Jeff Atwood 91cbdb565d remove "required information" header on custom fields 2014-09-30 11:43:06 -07:00
Robin Ward d7a8d053f5 Change deprecated `{{action xyz}}` to `{{action "xyz"}}` 2014-09-30 12:36:58 -04:00
Neil Lalonde 48b01ff003 Merge pull request #2829 from techAPJ/update-translations 
Update Translations
 2014-09-30 11:07:49 -04:00
Robin Ward 206bf99553 FIX: Use `cmd_tuples` instead of checking row index for migration. 2014-09-30 10:51:01 -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 c42b3ca657 fix messy merge 2014-09-30 13:22:45 +10:00
Sam 4bcd4e05b8 correct spec 2014-09-30 13:16:34 +10:00
Sam 0fc6c751cb FEATURE: implement lock/unlock trust level mechanics 2014-09-30 13:16:34 +10:00
riking e665bfd72a Fix test failure 2014-09-30 13:16:34 +10:00
riking bff95a6a97 Rename 'leader' -> 'tl3' 2014-09-30 13:16:34 +10:00
riking fa50723807 Fix wrong variable name 2014-09-30 13:15:14 +10:00
riking 760465959f Also skip locked users in the job query 2014-09-30 13:15:14 +10:00
riking 4aabc44264 Display grace period note even if not below requirements 2014-09-30 13:15:14 +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
riking 41d53c7222 FIX: Leader requirements weren't loading when visited directly 2014-09-30 13:15:13 +10:00
riking e69d084c88 Add trust_level_locked column 2014-09-30 13:15:13 +10:00
Régis Hanol a7a1dcadcc use the right HTTP verb 2014-09-29 22:41:54 +02: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
Robin Ward 9925b8b131 Merge pull request #2828 from Coren/import_mybb 
initial version, mostly inspired from phpbb script
 2014-09-29 15:26:50 -04:00
coren d1806649d2 initial version, mostly inspired from phpbb script 2014-09-29 20:37:35 +02:00
Neil Lalonde 6e11ae4f5c remove deprecated TOS text content 2014-09-29 14:04:53 -04:00
Régis Hanol 652cc3efba FEATURE: new rake task to clean up uploads & thumbnails 2014-09-29 18:31:53 +02:00
Arpit Jalan 330b7ba54a FEATURE: add site preference for standard subjects, including support for Re 2014-09-29 21:54:29 +05:30
Robin Ward 5d91a4ef0c FIX: Back button broke on customize routes in admin 2014-09-29 11:54:14 -04:00
Sam 4d1d5ca928 Merge pull request #2825 from lidlanca/patch-5 
Onebox Github Pull Request Styling
 2014-09-29 16:47:57 +10:00
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
lidlanca 48289dbc4f Onebox Github Pull Request Styling 2014-09-29 00:33:20 -04:00
Sam a6fcacec6b FIX: missing white space github onebox styling 2014-09-29 14:26:16 +10:00
Sam 85e885fcfa FIX: sync up all counts when visiting new and unread 2014-09-29 13:49:38 +10:00
Sam fdd6bcf38d less lines 2014-09-29 11:55:25 +10:00
Sam a659019ff6 Merge pull request #2823 from lidlanca/github-blob-style 
Add Styling for Github Code blob + Line numbers
 2014-09-29 11:52:15 +10:00
lidlanca 1cc3c8ff15 Add Styling for Github Code blob + Line numbers 2014-09-28 00:37:21 -04: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
Robin Ward 0a5c7b15e2 SECURITY: RegExp engine loopwith improperly formatted URLs. 2014-09-26 13:37:19 -04:00
Régis Hanol f283e2a996 FIX: there's no need to try to download relative images 2014-09-26 18:27:10 +02:00
Sam 8d75ab60ea FEATURE: github onebox improvements 
FIX: incorrect number on github onebox
 2014-09-26 18:29:03 +10:00
Sam 1daff24e7c FIX: typo, no grey unread in suggested topic list 2014-09-26 09:41:08 +10:00