github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 18:29:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,594 Commits 190 Branches 500 Tags 938 MiB
e690c1ff14
Commit Graph

2180 Commits

Author SHA1 Message Date
Neil Lalonde
9f059b1090 User lowercase names for seeded categories. Change colors of meta category badge for new sites. 2014-05-09 12:57:19 -04:00
Robin Ward
aa9a8aa217 Merge pull request #2327 from fantasticfears/patch-3 
One more line for more space in new version email
 2014-05-09 12:03:10 -04:00
Sam
084ec87850 FEATURE: admins can invite users to groups via the web UI 2014-05-09 18:22:36 +10:00
Erick Guan
f2fd38a7b8 One more line for more space in new version email 2014-05-09 15:02:22 +08:00
Claus Strasburger
b53248178b Added openssl_verify_mode parameter for action_mailer. 
- parameter in `environments/production.rb`
- documentation & default value (nil) in `discourse_defaults.conf`
 2014-05-08 22:21:36 +02:00
Robin Ward
c3ccc3e309 Transpile ES6 even without node, just using rubyracer 2014-05-08 11:35:33 -04:00
Sam
31c575687b memory_profiler should be shipped with mini profiler 2014-05-08 14:47:54 +10:00
Sam
e6418cd582 Merge pull request #2324 from kohenkatz/bugfix/puma-socket-name 
Fix Puma socket name
 2014-05-08 12:42:09 +10:00
MK
620e8aa73d Prevent IE Compatibility Mode 
As discussed at https://meta.discourse.org/t/ie10-user-is-getting-your-browser-is-too-old/15289
 2014-05-07 22:16:20 -04:00
MK
baafa15bc3 Fix Puma socket name 
As mentioned in f784a188c6 (commitcomment-5277066)
 2014-05-07 21:58:49 -04:00
Jeff Atwood
1d98d70834 update new version email with release notes too 2014-05-07 17:31:44 -07:00
Jeff Atwood
a40cf28423 update new version email copy 2014-05-07 16:36:35 -07:00
Sam
0334179c6e give logster its own redis connection 2014-05-08 06:52:59 +10:00
Régis Hanol
22d3bb1dd0 Merge pull request #2320 from shime/master 
fix inconsistency with bookmark icon label under post
 2014-05-07 21:48:04 +02:00
Neil Lalonde
11c0eb8db3 Update translations 2014-05-07 10:33:41 -04:00
Hrvoje Šimić
52066e6f00 fix inconsistency with bookmark icon label under post 
the bookmark icon under post should follow style from other
icons - downcased, no ending dot
 2014-05-07 13:06:49 +02:00
Sam
c25cd4e78d A new logster, that gets rid of a pile of 404s being logged as fatal errors. 2014-05-07 17:01:19 +10:00
Sam
19dec8c87c mini profiler too chatty 2014-05-07 08:33:07 +10:00
Sam
4af0aa9cbc logster integration (in production as well) 2014-05-07 08:24:15 +10:00
Sam
692f099807 Remove uneeded hack 2014-05-07 08:24:15 +10:00
Jeff Atwood
19867c147b minor copyedit 2014-05-06 14:47:18 -07:00
Robin Ward
9e719e49da Only show a few topic links in the gutter and allow the user to expand 
them.
 2014-05-06 14:11:17 -04:00
Jeff Atwood
3d2cb17719 who needs friends anyway? 2014-05-06 01:19:02 -07:00
Jeff Atwood
2cbebd85c6 clarify that global notice for urgent/emergency 2014-05-05 15:02:10 -07:00
Neil Lalonde
a15714899e Better forgot password message 2014-05-05 13:48:11 -04:00
Régis Hanol
c21d3f41d0 BUGFIX: only redirect new users to top page once 
Actually, new users will still be redirected to the top page during the first 30 seconds of their first visit.
 2014-05-05 19:00:40 +02:00
Régis Hanol
b6dd0cfb7d FEATURE: add a link to PMs in the post shown to users when their message has been hidden 2014-05-02 22:54:03 +02:00
Jeff Atwood
80e9e74df9 drop the "in", Omit Needless Words 2014-05-02 13:52:01 -07:00
Jeff Atwood
ee08ace63a can't stop, won't stop, don't stop. ONW 2014-05-02 13:11:57 -07:00
Jeff Atwood
585997f97e I really need to stop editing this. 1 word less! 2014-05-02 12:28:29 -07:00
Neil Lalonde
cb2bcb89ff Update translations 2014-05-02 14:01:27 -04:00
Neil Lalonde
014bfc0512 Use 10k most common passwords instead of 5k 2014-05-02 12:01:21 -04:00
Neil Lalonde
df538f63d9 Add Hebrew 2014-05-01 11:00:53 -04:00
Jeff Atwood
a8b1cb66af omit needless words 2014-04-30 22:07:08 -07:00
Jeff Atwood
9f16bc9048 digest footer copyedit 2014-04-30 16:21:18 -07:00
Jeff Atwood
0fa7aec74a minor copyedits on faq and digest 2014-04-30 16:20:23 -07:00
Régis Hanol
11af466737 FEATURE: add a specific flag reason when a post has been hidden 2014-04-30 16:58:01 +02:00
Jeff Atwood
4b83a6f0a0 minor copyedits on flagging 2014-04-30 02:03:13 -07:00
Jeff Atwood
7006f47488 copyedit to explain reply rule 2014-04-30 01:22:31 -07:00
Jeff Atwood
f13e9e58e8 change "Log In" to "Sign In" 
because
http://www.designcult.org/2011/08/why-do-we-call-in-logging-in.html
 2014-04-30 01:10:32 -07:00
Jeff Atwood
dd1ebff956 more accurate description of newuser_max_replies 2014-04-29 13:19:07 -07:00
Jeff Atwood
4442ae1c8a apparently that's not markdown-ified 2014-04-29 12:56:16 -07:00
Robin Ward
f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
Neil Lalonde
f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Régis Hanol
4371374ba6 FEATURE: support for enabling all upload file types 
BUGFIX: authorized extensions is now case insensitive
 2014-04-29 19:12:35 +02:00
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Jeff Atwood
c6d9829092 It's these COLONS! HE HATES THESE COLONS! 
https://www.youtube.com/watch?v=Tcwz8-EfFYE
 2014-04-27 01:35:39 -07:00
Neil Lalonde
1156c57cf6 Update translations 2014-04-25 10:17:20 -04:00
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Neil Lalonde
0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Régis Hanol
d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system 
Incrementally load users in the badge page
 2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30
Régis Hanol
3036490d05 Merge pull request #2260 from riking/download_blacklist 
Add site setting for domains to never download images from
 2014-04-24 11:13:03 +02:00
Jeff Atwood
3dedb0ce05 better S3 bucket name guidance 2014-04-24 00:13:15 -07:00
Jeff Atwood
d094fc91d7 minor digest copyedit 2014-04-23 23:14:26 -07:00
riking
b309deef11 Add site setting for domains to never download images from 2014-04-23 22:24:35 -07:00
Neil Lalonde
51cc39cad6 Add comments to the top of client.en.yml and server.en.yml about Transifex stuff 2014-04-23 16:47:20 -04:00
Jeff Atwood
387ac342ce slightly improve disk space limit reached message 2014-04-23 11:31:01 -07:00
Régis Hanol
de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02:00
Régis Hanol
b61abe3107 FEATURE: warn the admin whenever we disable the download_remote_images_to_local site setting 2014-04-23 12:43:10 +02:00
Sam
7c57d74e85 FEATURE: unicorn sidekiq will restart sidekiq on complete failure. 
(checks every 30 minutes for complete failure)
 2014-04-23 13:13:18 +10:00
Sam
4aaedb82d0 FEATURE: alllow unicorn master to fork sidekiqs, keep alive coming 2014-04-23 11:03:36 +10:00
Sam
c6f9cc0787 UPGRADE: sidekiq to sidekiq 3.0 2014-04-23 11:01:17 +10:00
Robin Ward
af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Robin Ward
4eb5474858 Add a SiteSetting to configure how many topics are in the email digest. 2014-04-21 17:49:10 -04:00
Jeff Atwood
fa4c21c28f better first boot register admin account help 2014-04-21 11:36:35 -07:00
Jeff Atwood
a24d910470 improve test email error message 2014-04-21 10:46:09 -07:00
Jeff Atwood
ef018db2e6 minor digest email copyedits 2014-04-21 10:36:33 -07:00
Jeff Atwood
a8157efdfe copyedits on editor entry errors 2014-04-21 10:15:13 -07:00
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in 
user.
 2014-04-21 11:52:11 -04:00
Jeff Atwood
7e3dd43e9a missed a pin copy 2014-04-20 22:52:26 -07:00
Jeff Atwood
1ee039f786 fix pin message copy 2014-04-20 22:45:48 -07:00
Régis Hanol
454f11e597 FEATURE: new title_sanitize site setting 2014-04-18 21:01:21 +02:00
Régis Hanol
756ea0178a Merge pull request #2276 from vikhyat/badge-system 
Badge system updates
 2014-04-18 11:46:19 +02:00
Vikhyat Korrapati
27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
Vikhyat Korrapati
4eb7579d04 Notification copy. 2014-04-18 04:04:24 +05:30
Robin Ward
64faee0935 Break down new topic counts by category if a digest contains many. 2014-04-17 16:42:40 -04:00
Robin Ward
0e56157212 Basic "Also, there are x new topics" text for the digest 2014-04-17 16:04:26 -04:00
Neil Lalonde
87e5e4b8d0 Use a real link to docker manager in new version email 2014-04-17 14:36:26 -04:00
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Vikhyat Korrapati
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Vikhyat Korrapati
89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Neil Lalonde
abdfc2c7c1 Update translations 2014-04-16 10:42:21 -04:00
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Jeff Atwood
aca35f805e missed some other languages on assets topic 2014-04-15 22:12:28 -07:00
Jeff Atwood
fad31b6d9e More helpful assets topic explanation 2014-04-15 22:07:19 -07:00
Jeff Atwood
8114588c06 minor copyedit on auto image downloading 2014-04-15 21:52:40 -07:00
Sam
b7caa33841 Site setting to allow mods to create categories 2014-04-15 16:42:45 +10:00
Sam
e5f41b8a21 FEATURE: whitelist and blacklist selectors for embeds 2014-04-15 14:07:30 +10:00
Régis Hanol
2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02:00
Neil Lalonde
2c4ada6c7d FIX: give an accurate reason why a user's posts can be deleted from admin 2014-04-14 15:10:41 -04:00
Neil Lalonde
31043275d3 Update translations from Transifex 2014-04-14 11:53:25 -04:00
Sam
b0ed9082b3 FEATURE: Hidden site setting for max username length 2014-04-14 12:55:33 +10:00
Sam
d3810ba3bc Merge pull request #2212 from vikhyat/badge-system 
Show badges in the poster expansion card
 2014-04-14 10:54:43 +10:00
Jeff Atwood
20f324ec76 minor keyboard shortcut copyedit 2014-04-13 14:54:02 -07:00
Neil Lalonde
b7203c125e Merge pull request #2226 from CirnoKaster/patch-2 
client.zh_TW.yml: adding lines under filters.new
 2014-04-11 13:50:54 -04:00
Neil Lalonde
6b0cae8910 Update translations 2014-04-11 11:53:02 -04:00
Neil Lalonde
6e939c28fb Remove topic.notifications.title translation key since it's always an empty string 2014-04-11 10:54:02 -04:00
Vikhyat Korrapati
3f4c5ed451 Show badges in the poster expansion card. 2014-04-11 06:59:11 +05:30
Sam
668a5ff526 FEATURE: lock icon for archived topics 
remove model sniffing hack
 2014-04-11 10:27:04 +10:00
Neil Lalonde
2e3ba1d5dc Update ru translations from Transifex 2014-04-10 15:45:58 -04:00
Neil Lalonde
cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
Jeff Atwood
bc56bc62a6 better auto-close example text 2014-04-10 12:25:02 -07:00
Jeff Atwood
605e60b016 copyedit on pins 2014-04-10 09:50:53 -07:00
Robin Ward
caa2564b83 Start up the Job scheduler after all the other initializers have loaded. 
We do this so that plugins can register scheduled jobs.
 2014-04-10 12:41:13 -04:00
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +10:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Sam
ac097e2d0f Merge pull request #2244 from vikhyat/css-import 
Site Customization @import fixes
 2014-04-10 07:01:34 +10:00
Robin Ward
b0405d7cfa Adds a Site Setting to whitelist onebox domains 2014-04-09 16:57:45 -04:00
Robin Ward
f8964bf453 Remove unused SiteSetting 2014-04-09 16:18:31 -04:00
Vikhyat Korrapati
33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
Vikhyat Korrapati
8c129e480a Always use DiscourseSassImporter, add optional sprockets deps tracking. 2014-04-09 19:17:19 +05:30
Sam
8cdf25532c Merge pull request #2207 from riking/list-setting 
UI for list site settings
 2014-04-09 09:34:50 +10:00
riking
6779bec58c Add UI for list site settings 2014-04-08 14:17:55 -07:00
riking
9c4dd1cb35 Change comma-delim site settings to pipe-delim 2014-04-08 14:17:55 -07:00
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Jeff Atwood
150081bf27 die, colon! DIEEEEEEeeeEEeee 2014-04-08 00:12:00 -07:00
Sam
3e41c8fd87 Merge pull request #2236 from ligthyear/mobile-styles-via-plugin 
Allow plugins to ship custom styles only for mobile
 2014-04-08 16:17:21 +10:00
Jeff Atwood
2e42b595f4 clean up "from the web" uploader copy a bit 2014-04-07 22:11:49 -07:00
Benedikt Lang
999c959dad Sync client.de.yml between transifex and github. 
Every string was checked for the most up-to-date version.
While merging both versions, transifex was used as reference for
newlines and deleted/missing translations.
 2014-04-07 17:46:39 +02:00
Benjamin Kampmann
d22df7731d Allow plugins to ship custom styles only for mobile 
- adds another :mobile-flag to register_assets
- adds test for plugin registering of assets
- load plugins when on desktop and plugins_mobile when on mobile
 2014-04-07 16:33:35 +02:00
Sam
0372b81d11 FEATURE: allow moderators to globally pin topics 2014-04-07 16:38:51 +10:00
Robin Ward
c82313595d Minor text change 2014-04-05 15:10:46 -04:00
Neil Lalonde
30b23a2450 FIX: notify_about_flags_after description said it sends to moderators. It actually sends to contact_email. 2014-04-04 15:24:00 -04:00
CirnoKaster
6e8d4625c0 adding lines under filters.new 
adding filters.new.lower_title_with_count and lower_title
 2014-04-04 17:23:22 +08:00
Neil Lalonde
ecf211aa3f Send email to contact_email if there are flags submitted more than 48 hours ago. Configurable with the notify_about_flags_after site setting. 2014-04-03 14:34:40 -04:00
Sam
d064dd241f BUGFIX: reload site settings on rails reload in dev 2014-04-03 10:39:30 +11:00
Robin Ward
558a06a117 Adds better reusable error message support. Added to fetching remote 
posts. /cc @riking
 2014-04-02 13:22:10 -04:00
Robin Ward
50fb048b99 Interface for expanding OP contents 2014-04-02 10:26:46 -04:00
Sam
bd7d1e62f6 BUGFIX: we need to precompile plugins.css ... otherwise there be dragons 2014-04-02 11:58:02 +11:00
Neil Lalonde
e86d3e5ce2 Revert "Change 5k passwords -> 10k passwords in locale files" 2014-04-01 15:39:31 -04:00
Régis Hanol
ef24a4c71c FEATURE: add redirect_users_to_top_page site setting (default to true) 2014-03-31 21:53:38 +02:00
Régis Hanol
682b0c4883 typo 
thanks @Naatan
 2014-03-31 18:23:42 +02:00
Régis Hanol
7e33834afe FEATURE: create hyperlinked images from the image insertion dialog 2014-03-31 18:19:16 +02:00
Benjamin Kampmann
2815e98e6d Make autohighighting for all Code-Blocks a SiteSetting 2014-03-31 09:44:35 +02:00
Sam
f3cc7360e0 BUGFIX: Correct after_fork semantics 
After fork SiteSettings was not getting a new process id,
causing site settings not to refresh properly in unicorn

This code also centralizes the logic
 2014-03-31 12:34:13 +11:00
riking
57051e896d Change 5k passwords -> 10k passwords in locale files 2014-03-29 14:06:09 -07:00
Jeff Atwood
32e398d484 omit needless words 2014-03-28 13:58:40 -07:00
Jeff Atwood
239d73c897 improve version update email 2014-03-28 13:35:09 -07:00
Régis Hanol
e6989b5313 Merge pull request #2192 from jorgemanrubia/configurable-emails-prefix 
Option to change the subject prefix in emails
 2014-03-28 15:08:50 +01:00
Régis Hanol
622448fc9c Merge pull request #2184 from Onaldanm/translate-fr-updates 
French Translations Updates
 2014-03-28 15:07:02 +01:00
Régis Hanol
f311d88d7b Merge pull request #2195 from fantasticfears/locale 
update zh_CN locale
 2014-03-28 15:06:14 +01:00
Erick Guan
dda643a1bf update zh_cn translation 2014-03-28 17:09:42 +00:00
Sam
e23e92647e Merge pull request #2170 from Mikulas/czech-140324 
update czech localization
 2014-03-28 10:21:20 +11:00
slainer68
6fb323fd71 Delete enable_local_account_create option as it is not used anywhere. 
JS fixture
 2014-03-27 00:55:06 +01:00