github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 02:03:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,125 Commits 214 Branches 500 Tags 960 MiB
37af13f6ea
Commit Graph

11125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
37af13f6ea FIX: badge notifications are marked read by the system after opening 2014-10-02 16:08:31 +10:00
Sam
72a28aeb7c FEATURE: always show highest trust level badge in card 
FEATURE: fa-user icon for trust level badges
 2014-10-02 16:08:31 +10:00
Jeff Atwood
b5c5c2fe37 copyedit on backup choices 2014-10-01 22:43:31 -07:00
Sam
890346f0b0 FIX: if quoting ends with link, quote reply does not show up 2014-10-02 15:24:11 +10:00
Jeff Atwood
2d12451ab1 Merge pull request #2837 from awesomerobot/master 
category badge now falls below topic title & other small fixes
 2014-10-01 22:02:00 -07:00
Kris Aubuchon
eb252bd670 category badge now falls below topic title & other small fixes 2014-10-01 22:54:03 -04:00
Jeff Atwood
ffae4929f0 hide category in docked header 2014-10-01 13:48:07 -07:00
Robin Ward
f8ac0bd7ef FIX: Drupal import was using wrong comments table 2014-10-01 14:25:49 -04: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
c8a6591b66 remove the /cookbook directory from the sublime project file 2014-10-01 18:53:38 +02:00
Régis Hanol
70884d2436 FEATURE: automatically hide posts made by TL0 users when flagged by a TL3 user 2014-10-01 18:53:17 +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
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