codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-12 08:41:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
8858 commits 7 branches 179 tags 87 MiB
Commit graph

2235 commits

Author SHA1 Message Date
Dmitry Polushkin
5b197bcf6f Adding additional RU translations 2014-02-23 01:47:02 +00:00
Dreami
520c393960 Some small changes 
Will squash later...
 2014-02-22 12:05:39 +01:00
Jeff Atwood
41843e96b6 improved copy for watching/tracked adapted f/BBS 2014-02-21 17:26:32 -08:00
Jeff Atwood
a604ebb5b5 simplify category definition copy 2014-02-21 17:04:59 -08:00
Régis Hanol
68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00
Robin Ward
a07e9f7e71 FEATURE: Bulk reset read status. 2014-02-21 15:18:45 -05:00
Robin Ward
7a07f14dfc FEATURE: Can select topics and hit Dismiss Read on the /unread filter 2014-02-21 15:18:45 -05:00
Dreami
215f3b14d2 Update client.de.yml 
Changes in admin section
 2014-02-21 12:54:17 +01:00
Dreami
9252c7b3d1 Update client.de.yml 
Updated it to sound more natural in German and corrected some errors

Can anyone tell me where "latest_by: "latest by"" is used? I can't find it.
 2014-02-21 11:34:39 +01:00
Sam Saffron
2ab76f60d1 FEATURE: Discoruse.handle_exception 
to report exception via sidekiq helper, adds extra context
 2014-02-21 14:30:25 +11:00
Robin Ward
d95887c57d CHANGE: We now include the _escaped_fragment_ support by default, but 
only if the crawler check fails. It is a fallback for non-google search
engines that support the Ajax crawling API.
 2014-02-20 17:02:26 -05:00
Neil Lalonde
b696c96a19 Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered. 2014-02-20 12:29:40 -05:00
Régis Hanol
0fefdb3ed9 Merge pull request #1980 from Onaldanm/patch-fr-bulk 
Add topics.bulk french translation
 2014-02-20 10:15:30 +01:00
Onaldanm
7d1a39de84 Add topics.bulk french translation 
First proposition, I hope doing it correctly :)

Fix extra space
 2014-02-20 03:31:56 -05:00
Régis Hanol
d443ddd43d Merge pull request #1922 from joallard/language-toggle 
Allow users to toggle interface language in their preferences
 2014-02-19 18:28:00 +01:00
Régis Hanol
c8795d8aa4 fix typo 2014-02-19 17:21:47 +01:00
Neil Lalonde
7f6b2e5563 Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app. 2014-02-18 17:18:53 -05:00
Sam
2a8734f0d5 Suppress search in topic unless we have more than 10 posts 
(configurable in site setting)
 2014-02-19 08:59:18 +11:00
Robin Ward
f19b0b5fe0 Include members count on groups page. 2014-02-18 16:17:04 -05:00
Jonathan Allard
0592420e52 Add a site setting to allow users to toggle I18n.locale 
It is false by default.
 2014-02-18 14:54:00 -05:00
Jonathan Allard
c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Robin Ward
3f3c07f136 FEATURE: Can bulk update the notification level of topics 2014-02-18 13:02:22 -05:00
Sam
884346cbea Merge pull request #1951 from thoughtbot/bb-erb 
Use ERB to pull conf files into app
 2014-02-18 16:23:55 +11:00
Stephan Kaag
f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Matt Campbell
ef24882999 Adding additional ES translations 2014-02-17 10:55:08 -05:00
Régis Hanol
c6cf88470d Merge pull request #1952 from stackbuilders/spanish_translations 
Added and updated Spanish translations
 2014-02-17 09:49:39 +01:00
lonehangman
739c9688ae Added endpoint for site JSON 
Removed unneeded code
 2014-02-17 15:16:53 +09:30
Sam
2b10fdc97f FEATURE: search auto scopes on topic first 2014-02-17 13:54:51 +11:00
Sam
73aca9063d FEATURE: allow overriding server static asset if needed 2014-02-17 10:44:37 +11:00
Sam
c0d947aa98 allow bench to run with unicorn optionally 
memstats can output yaml now
 2014-02-16 16:44:51 +11:00
Jose Anasco
294d7cb555 Added and updated Spanish translations 
Updated:
1. client.es.yml
2. server.es.yml
3. server.en.yml
 2014-02-14 19:29:16 -05:00
Régis Hanol
683bf8c0a4 FEATURE: add all email logs tab 2014-02-15 01:17:13 +01:00
Britt Ballard
60e1a5aa69 Use ERB when importing conf files into app 2014-02-14 16:14:55 -08:00
Régis Hanol
3f3c9ca7cb FEATURE: add filters on email logs 2014-02-15 00:50:08 +01:00
Régis Hanol
21f757fd72 mention shortcut in the tooltip on the submit button 2014-02-15 00:49:36 +01:00
Robin Ward
5f080a9b5e Revert "Merge pull request #1943 from bdthinh/VietnameseLocale" 
This reverts commit b95db5fcae, reversing
changes made to 4a44cca2d7.
 2014-02-14 18:42:19 -05:00
Robin Ward
b95db5fcae Merge pull request #1943 from bdthinh/VietnameseLocale 
Add Vietnamese locale
 2014-02-14 14:14:30 -05:00
Robin Ward
4a44cca2d7 Merge pull request #1946 from bbonamin/es_locale 
Improve Spanish client locale considerably
 2014-02-14 14:13:09 -05:00
Neil Lalonde
e83ec810e1 FIX: heading shouldn't say Sent At on the page that shows email that were not sent. duh. 2014-02-14 13:09:22 -05:00
Neil Lalonde
35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
verg
de9cac0406 Add Private Message count to User Dropdown 2014-02-14 08:45:09 -05:00
Sam
b75620973f FEATURE: memory stats route for diagnostics in admin 2014-02-14 15:45:12 +11:00
bdthinh
71b6910a32 Fix server.vi.yml at header vi 2014-02-14 09:53:10 +07:00
Bruno Bonamin
406cfb1691 Improve Spanish locale considerably 
Adds some missing spanish translations

Translations up to es.admin_js.admin.flags

Translations up to admin_js.admin.groups

Translations up to admin_js.admin.logs

Translations up to admin_js.admin.users

Translations up to admin_js.admin.user

Finishes admin_js.admin translation to spanish

Adds translation for remaining keys
 2014-02-13 19:47:45 -03:00
Régis Hanol
50273ba815 rename site setting to 2014-02-13 13:31:14 -08:00
Régis Hanol
5725f02d9e allow full access to /admin/backups while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
0e941a6253 add an alert when trying to login while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
7993998fc5 update translations 2014-02-13 13:31:13 -08:00
Régis Hanol
e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol
faf03fdeb1 update NGINX sample to allow admin to download backups 2014-02-13 13:31:13 -08:00
Régis Hanol
67a8d784fc update routes 2014-02-13 13:31:13 -08:00
Régis Hanol
0e686aca95 update sidekiq initializer to use the pausable middleware 2014-02-13 13:31:13 -08:00
Robin Ward
d3b2f87f8e In email digests, try to get longer excerpts if we don't have enough 
characters from the first paragraph.
 2014-02-13 16:11:01 -05:00
Neil Lalonde
8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
bdthinh
e4a0ec1d8f Add Vietnamese locale 2014-02-13 17:41:13 +07:00
Sam
4ff6780758 Merge pull request #1935 from eriko/remove_cas 
Remove cas
 2014-02-13 17:26:20 +11:00
Ibragimov "MpaK" Renat
a04e4f388b Update puma.rb fixed: num_worker(S) 2014-02-13 11:08:27 +07:00
Robin Ward
669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd 
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
 2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Erik Ordway
98bac3b57d Purge settings and .en.yml translations. 2014-02-12 08:38:19 -08:00
Jeff Atwood
3ef65fffb8 clarify _to_block_new_user settings 2014-02-11 14:43:37 -08:00
Robin Ward
d98fee5fd4 Merge pull request #1918 from fabricioflores/master 
added translations to spanish
 2014-02-11 15:50:46 -05:00
Robin Ward
4dc24c6a77 Merge pull request #1925 from slainer68/cors_config 
Use GlobalSetting to enable CORS at application level
 2014-02-11 15:46:48 -05:00
Sam
7ad00f426c FEATURE REMOVAL: persona login 
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
 2014-02-11 16:56:48 +11:00
Robin Ward
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
slainer68
a89018db87 Use GlobalSetting to enable CORS at application level 2014-02-09 23:11:52 -08:00
Sam
212ece3e80 Remove memory profiler at least until I push a new docker image 2014-02-10 15:40:32 +11:00
Sam
ca170e4636 Add memory profiler gem for ruby 2.1 2014-02-10 15:27:46 +11:00
Fabricio Flores
5569f52f70 Update client.es.yml 2014-02-09 20:51:01 -05:00
Jonathan Allard
862faf2a17 Locales/fr: Add filter strings and change :read_more_MF 2014-02-08 18:51:18 -05:00
Sam
87a07e2355 attempt to work around concurrency issue with active record 2014-02-08 15:19:10 +11:00
Jeff Atwood
6c8e47bcc6 minor copyedits on name entry 2014-02-07 16:34:29 -08:00
Fabricio Flores
84fbb8028c added translations to spanish 2014-02-07 19:08:17 -05:00
Neil Lalonde
e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
Jeff Atwood
6bea09a82a clarify on mutes, because noise 2014-02-07 12:39:58 -08:00
Jeff Atwood
ecca66dbfe simpler copy for mailing list mode 2014-02-07 12:35:47 -08:00
Robin Ward
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
Robin Ward
2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Robin Ward
003eb06807 Move Discourse.Group into public models 2014-02-07 10:44:51 -05:00
Robin Ward
de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward
a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Jeff Atwood
7feb480e20 Merge pull request #1915 from riking/patch-2 
Update new_user top page redirect reason
 2014-02-06 16:28:38 -08:00
Sam
227873df78 FEATURE: proper mailing list mode 
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
 2014-02-07 11:07:52 +11:00
Kane York
d81519c0f8 Update new_user top page redirect reason 
The goal of this text is to sublty hint that reading is the way to graduate out of it.
 2014-02-06 16:04:16 -08:00
Jeff Atwood
929191ecd9 new intro message and better 404 copy 2014-02-06 14:51:24 -08:00
Neil Lalonde
113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Sam
4e3980896e Merge pull request #1906 from fabricioflores/patch-1 
Update client.es.yml
 2014-02-06 18:32:40 +11:00
Neil Lalonde
7d79d5a738 Change title of button from Starred to Star 2014-02-05 18:39:49 -05:00
Sam
e1f293ad66 FEATURE: new scheduler 
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
 2014-02-06 10:26:16 +11:00
Fabricio Flores
b27cc970a9 Update client.es.yml 
Added tranlations in admin.users.nav
 2014-02-05 14:15:20 -05:00
Robin Ward
1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Vikhyat Korrapati
6acc5c19e7 Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency. 2014-02-05 10:50:28 +05:30
Sam
df65371d72 BUGFIX: microcontroller was consuming too much CPU 
sleep 0.1 and file test were expensive compared to a signal every second
 2014-02-05 10:48:36 +11:00
Robin Ward
bf951689e8 FIX: Don't allow moving a category with children underneath another 
category (creating grandchildren)
 2014-02-03 15:09:35 -05:00
Régis Hanol
d2974c2a15 BUGFIX: proper handling of top_menu_items 2014-02-03 16:08:00 +01:00
Régis Hanol
854fdae7cd Merge pull request #1892 from vikhyat/plugin-tests 
Add rake task for running plugin tests.
 2014-02-02 08:09:12 -08:00
Michael Berg
fab72bcdbe German Translation updated (client.yml) 
German Locale - starred
 2014-02-02 15:47:57 +01:00
Vikhyat Korrapati
102352e205 Add rake task for running plugin tests. 2014-02-02 01:52:53 +05:30
macournoyer
9afe262942 Improve bluepill sample config. 
Add stop_command to use `thin stop`.
Fix stdout & stderr being redirected to the wrong log file.
Rename PID file name to use a dash (like the log file).
 2014-01-31 16:09:35 -05:00
Neil Lalonde
e6096b4524 Revert "Try secure: true again" It's definitely broken 2014-01-31 15:02:57 -05:00
Neil Lalonde
ad34a297fd Try secure: true again 2014-01-31 14:17:14 -05:00
Sam
d83548964c BUGFIX: invited to pm email was using wrong key 2014-01-31 16:37:24 +11:00
Neil Lalonde
f71c8bb533 Revert "Add secure flag to cookie" 2014-01-30 18:53:48 -05:00
Neil Lalonde
4e158b2316 Add secure flag to cookie 2014-01-30 17:07:08 -05:00
Robin Ward
f5019be477 Support for a /last route to go to the last post in a topic. 2014-01-30 15:24:04 -05:00
Robin Ward
6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward
e9664d5cfa Merge pull request #1885 from schmatz/master 
Fixed 'devloper' typo in quickstart config file
 2014-01-30 09:27:19 -08:00
Robin Ward
0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward
6ee266c7ee Modal for performing a bulk operation 2014-01-30 11:44:29 -05:00
Robin Ward
1696cde2ff Toggle button for bulk selection of topics 2014-01-30 11:44:29 -05:00
Michael Schmatz
9da657382c Fixed 'devloper' typo in quickstart config file 2014-01-30 08:35:07 -08:00
Jeff Atwood
dc24226893 better help for category names, prefer 1 word 2014-01-30 01:31:35 -08:00
Neil Lalonde
b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Neil Lalonde
946e837542 Add twitter to Onebox.options 2014-01-29 14:14:07 -05:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Francis Brunelle
94846f6a0a remplacer conversation par discussion (French locale) 2014-01-29 06:20:46 -05:00
sbaer
644c17d260 Trying again to merge changes to Chinese localizations done by Kelvin 2014-01-28 15:11:23 -08:00
Francis Brunelle
ca1695406b minor corrections for French locale 2014-01-28 07:27:14 -05:00
Régis Hanol
8ccf519db3 Mark features as experimental 
while we're fixing issues:

 - Keyboard shortcuts
 - Favcount
 2014-01-28 00:39:11 +01:00
Eric Carlson
bc033283c6 Google Universal Analytics 2014-01-25 17:42:25 -07:00
Neil Lalonde
90e195b2e7 More work on trust level 3 requirements page 2014-01-24 11:56:46 -05:00
Robin Ward
8493f4ad27 Merge pull request #1860 from ecuk/embed-category 
Add site setting for category of topics created by embedding
 2014-01-24 07:40:10 -08:00
Jeff Atwood
0634f3320a omit needless words 2014-01-24 01:44:02 -08:00
Jeff Atwood
05155c1bc1 /top tooltip clarification 2014-01-24 01:40:39 -08:00
Jeff Atwood
aa1a0782a9 copyediting on topnav tooltips 2014-01-24 01:33:07 -08:00
Eric Carlson
6766451ab4 Add site setting for category of topics created by embedding 2014-01-23 22:25:48 -07:00
Régis Hanol
01cd63fff7 FEATURE: add a 14 days window to consider topics new 2014-01-24 00:22:04 +01:00
Robin Ward
97dd560d84 Allow CORS on .ico files. Should help with Favcount.js 2014-01-23 10:41:22 -05:00
Neil Lalonde
ae3b53bb76 Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2. 2014-01-22 18:17:45 -05:00
Neil Lalonde
c1fec2d3e2 Lower default invite_expiry_days to 4 days 2014-01-22 18:17:45 -05:00
Jeff Atwood
a4605f597c minor copyedit 2014-01-22 12:58:15 -08:00
Jeff Atwood
226a6c0c71 improve default meta category definition 2014-01-22 12:55:41 -08:00
Sam
7e5a17f277 FEATURE: mute/watch/track buttons for private conversations 2014-01-22 17:46:52 +11:00
Sam
fc3bad8ff4 FEATURE: Seed a meta category, we want everyone to have it 2014-01-22 16:05:46 +11:00
Neil Lalonde
1dbc1c56b4 FIX: inviting a user again after the first invite expires will create a new invite 2014-01-21 16:56:40 -05:00
Neil Lalonde
ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Michael Brown
8bd7dbfc3e Merge branch 'ubuntu-install-notes' of github.com:bloomberg/discourse into sysadmin-docs 
Conflicts:
	docs/INSTALL-ubuntu.md
 2014-01-21 01:39:46 -05:00
Sam
4bea4cbcaa BUGFIX: add [PM] string to private message emails 2014-01-21 17:24:05 +11:00
Régis Hanol
5feb5ee54d Changed the topics_per_period_in_top_page default to 50 
100 was still too much
 2014-01-20 22:55:32 +01:00
Neil Lalonde
0289053a70 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 16:52:55 -05:00
Neil Lalonde
33c3e027b3 Revert "Add the Lounge category, an exclusive area for trust level 3 users" 2014-01-20 15:43:04 -05:00
Neil Lalonde
2d98720cc8 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 15:06:20 -05:00
Sander Datema
be5ecb7d3b Update client.nl.yml 2014-01-19 18:34:29 +01:00
Sander Datema
86ea3853a8 Update server.nl.yml 2014-01-19 18:33:29 +01:00
ofGEEK
b7a0bee170 Update client.zh_CN.yml 2014-01-19 21:36:32 +08:00
Régis Hanol
0a8e791e14 changed topics_per_period_in_top_page default to 100 2014-01-18 22:58:29 +01:00
Régis Hanol
8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Régis Hanol
129617b415 Lots of bugfixes 
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
 2014-01-18 19:27:25 +01:00
Robin Ward
4981525047 REFACTOR: Fixes poor class hierarchy for listing topics 
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
 2014-01-18 19:26:24 +01:00
worminfo
53b8baec4b Update server.zh_TW.yml 
modify chinese words/sentences to HK/TW style.
 2014-01-19 01:30:08 +08:00
ofGEEK
7bd1f0fc3a Update client.zh_CN.yml 2014-01-18 23:32:28 +08:00
Robin Ward
18e719b0af In development mode, if an avatar is missing just serve up a placeholder 2014-01-17 11:47:23 -05:00
Jeff Atwood
e7c100aed3 another minor /top copyedit 2014-01-16 17:07:49 -08:00
Jeff Atwood
8e59b0cafd minor /top copyedit 2014-01-16 17:03:51 -08:00
Jeff Atwood
7b7fd25070 whoops, I meant "Topics Viewed" 2014-01-16 16:31:40 -08:00
Jeff Atwood
17a1c8759b Topics Entered -> Topics Visited 2014-01-16 16:30:31 -08:00
Régis Hanol
c1a66b70bb BUGFIX: use previous_visit_at instead of last_seen_at to determine the best period to display in the top summary 2014-01-16 01:36:32 +01:00
Jeff Atwood
defc450691 a bit more private cue on flag tooltip 2014-01-15 15:14:12 -08:00
Jeff Atwood
cfcd4692b6 mention "privately" in flagging dialog 2014-01-15 14:45:00 -08:00
Régis Hanol
a177732d28 FEATURE: top page should not be infinite. Limite them to 200 topics by default 2014-01-15 22:12:53 +01:00
Régis Hanol
0b2ead2248 rename topics_per_period_in_summary settings to topics_per_period_in_top_summary 2014-01-15 22:12:47 +01:00
Régis Hanol
812f195cae FEATURE: 2x the default number of topics showed in the top page 2014-01-15 19:47:59 +01:00
Sam
a247389d4e FEATURE: automatically update site to latest version of assets 
if a user neglects to move around the site it will prompt to do so 2 hours in
 2014-01-15 12:08:35 +11:00
Sam
abe814412e Source DB config more cleanly, fixes issues with socket in prd 2014-01-15 12:08:35 +11:00
Sam
fd95dbe75a FEATURE: Automatically force a full refresh between pages if assets change 2014-01-15 12:08:35 +11:00
Neil Lalonde
b9bda77abd Page title includes page number for web crawlers 2014-01-14 11:16:10 -05:00
Régis Hanol
3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Robin Ward
af3edfd5eb FEATURE: Show Reply count on blog index page when embedding 2014-01-13 12:47:41 -05:00
Sam
e076682bc6 BUGFIX: Improve copy and correct instruction alignment 2014-01-13 10:11:40 +11:00
Sam
2b64118df1 Merge pull request #1782 from ligthyear/group-mention 
Allow groups to be used as aliases for user mentions
 2014-01-12 14:36:45 -08:00
Sam
e20f5f89e6 Merge pull request #1795 from ok-harry/master 
internationalize Discourse.Formatter.tinyDateYear
 2014-01-12 14:34:10 -08:00
Sam
630507b83d Merge pull request #1813 from bbs4us/master 
Update Simp Chinese (zh_CN) translation.
 2014-01-12 14:23:00 -08:00
Jonathan
f926eab055 Update Simp Chinese (zh_CN) translation #4. 2014-01-11 12:13:09 +08:00
Jonathan
b5b33c8027 Update Simp Chinese (zh_CN) translation #3. 2014-01-11 09:33:36 +08:00
Jonathan
f7695a83ac Update Simp Chinese (zh_CN) translation #2. 2014-01-11 09:27:54 +08:00
Julien Grillot
8bf8ab03fc Restore fr.topic.notifications.title 2014-01-11 00:19:38 +01:00
Neil Lalonde
52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Neil Lalonde
888060d5d9 Add a link to meta.discourse.org in the new version notification email. 2014-01-10 11:31:26 -05:00
Jonathan
703e42a315 Update Chinese Translation. 2014-01-10 21:11:29 +08:00
Sam
166a8d2932 don't insert middleware its a problem 2014-01-10 13:51:02 +11:00
Sam
5242a49c02 BUGFIX: in some proxy scenarios https was not propergated properly 2014-01-10 12:21:09 +11:00
Jeff Atwood
20aa8bc224 Merge pull request #1805 from shivpkumar/master 
username characters validation error should include underscores
 2014-01-09 15:23:59 -08:00
Shiv Kumar
7df71f7bce username characters validation error should include underscores 2014-01-09 15:18:28 -08:00
Neil Lalonde
259295d865 Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year. 2014-01-09 11:55:04 -05:00
Shiv Kumar
6051b1a19c Update client.en.yml 2014-01-08 22:17:22 -08:00
Shiv Kumar
1f9d2e1dea add tooltip for user icon when not logged in 2014-01-08 22:13:44 -08:00
Sam
adc9a58f4a BUGFIX: anon cache was mucking with params 2014-01-09 16:49:12 +11:00
Sam
1b8a32ba19 correct nginx rule forwarding header 2014-01-09 16:39:30 +11:00
Sam
d4cc367a6f Disable cache for a bit to see if its killing the build 2014-01-09 16:08:59 +11:00
Sam
177983afe6 BUGFIX: mobile ui was being cached for anon views 2014-01-09 14:08:42 +11:00
Sam
e8afe87412 BUGFIX: attempt to forward on the protocol set by haproxy 2014-01-09 12:40:45 +11:00
Régis Hanol
cac3257b43 Merge pull request #1802 from voisintotoro/trad20140108 
Updated French translation
 2014-01-08 16:07:13 -08:00
Sam
1533a1163c use_ssl is just confusing, it means use_https , fix name of setting 2014-01-09 10:51:38 +11:00
Sam
5a036fc17e incorrect warning on site setting 2014-01-09 10:41:49 +11:00
Jeff Atwood
a48fb956f0 increase delete user max age from 14->60 2014-01-08 14:50:08 -08:00
Jeff Atwood
cf1c759cc3 minor copyedit on deleting user 2014-01-08 14:47:58 -08:00
voisintotoro
e1dcb0272a Updated French translation 2014-01-08 22:00:17 +01:00
Harry Seo
bb54de1e96 internationalize Discourse.Formatter.tinyDateYear 
missed client.??_??.yml
 2014-01-08 14:46:50 +09:00
Neil Lalonde
e7975f25b8 Remove remaining code for two-column categories page 2014-01-07 18:13:49 -05:00
Robin Ward
b268ea8363 Improved Embedded templates slightly. 2014-01-07 15:48:39 -05:00
Régis Hanol
0e246e65ad Merge pull request #1796 from wulff/feature-wulff-update-danish-l10n 
Merged new strings from *.en.yml and completed the Danish translation
 2014-01-07 07:53:55 -08:00
Benjamin Kampmann
c743a985a4 Allow groups to be used as aliases for user mention 
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
 2014-01-08 02:36:24 +11:00
Morten Wulff
63bd9da071 Merged new strings from *.en.yml and completed the Danish translation 2014-01-07 14:13:48 +01:00
Harry Seo
7713dfb8b0 internationalize Discourse.Formatter.tinyDateYear 2014-01-07 21:32:33 +09:00
Jeff Atwood
4d0ceb7551 copyedit on /top page orientation text 2014-01-07 00:48:23 -08:00
Sam
af3d262bf3 BUGFIX: dots in the wrong spot 2014-01-07 11:22:55 +11:00
Sam
164418b3f6 FEATURE: added suppress_uncategorized_badge 
site setting to remove the suppression of the uncategorized badge from topic lists
 2014-01-07 11:00:01 +11:00
Sam
3bb2948437 BUGFIX: missing localization for auto watching topics 2014-01-07 11:00:01 +11:00
Régis Hanol
f6cc3a798e fix typos in EN translations 2014-01-06 21:42:04 +01:00
Neil Lalonde
3328973f04 Category description placeholder text mentions that the category won't appear on categories page unless it has topics or the placeholder text is replaced with a real category description. 2014-01-06 11:21:46 -05:00
Robin Ward
14ec64a36a Give a better error message from the server if you've been replying too much. 2014-01-06 11:10:37 -05:00
Régis Hanol
87217d940e Merge pull request #1457 from skisulli/keyboard-shortcuts 
Global Gmail style keyboard shortcuts
 2014-01-06 06:40:55 -08:00
Régis Hanol
d3c223e464 Merge pull request #1791 from vikhyat/smtp-auth-option 
Make SMTP authentication mechanism configurable.
 2014-01-06 05:28:21 -08:00
Vikhyat Korrapati
6d50504a83 Make SMTP authentication mechanism configurable. 2014-01-06 18:19:42 +05:30
Régis Hanol
8d73b7f94d BUGFIX: hide sensitive site settings 2014-01-06 13:03:53 +01:00
Régis Hanol
a1f80e9e51 fixed a couple typos in the French translations 🇫🇷 2014-01-06 12:14:01 +01:00
Régis Hanol
bd043ba60f Merge pull request #1790 from Bahanix/master 
Update french locales
 2014-01-06 03:12:26 -08:00
Sam
b703d8c77a BUGFIX: redis-rails has always been a problem child 
implemented an ActiveSupport::Cache::Store for our internal use.
* allows for expire by family
* works correctly in multisite
* namespaced correctly

Removed redis-rails from the project, no longer needed
 2014-01-06 16:50:04 +11:00
Sam
c7d99a288b try to default to sockets, so less people have issues configuring in prd 2014-01-06 12:25:29 +11:00
Sam
887ac10013 get rid of cache db, not needed 2014-01-06 12:24:11 +11:00
Sam
f91163e146 FEATURE: added UI for tracking categories 2014-01-06 11:57:27 +11:00
Sam
3a2ae0061b Merge pull request #1788 from matsprea/patch-1 
Update client.it.yml
 2014-01-05 16:32:38 -08:00
Sam
f1c5f4fa93 Merge pull request #1667 from cassiuschen/puma 
Using Puma as Discourse's Webserver
 2014-01-05 16:29:05 -08:00
Sam
92aee27028 Merge pull request #1765 from thisgeekza/patch-1 
Add a few extra ProxyPass calls
 2014-01-05 16:26:07 -08:00
Sam
6c60c9efc1 Merge pull request #1789 from ofgeek/patch-1 
Update client.zh_CN.yml
 2014-01-05 16:20:57 -08:00
Julien Grillot
9c049d9e43 Update french locales 2014-01-05 15:48:29 +01:00
ofGEEK
8a386eac49 Update client.zh_CN.yml 2014-01-05 22:14:10 +08:00
Matteo Spreafico
1522f1b44c Update client.it.yml 2014-01-04 23:40:32 +01:00
Robin Ward
25caec0e62 Change text at the bottom of embedded comments to be (x more replies) 2014-01-03 14:55:37 -05:00
Régis Hanol
2a79ed97ed BUGFIX: allow top to be the homepage 2014-01-03 19:36:49 +01:00
Régis Hanol
584a9f310b FEATURE: add a message explaining the user why they're being redirected to the top page 2014-01-03 19:20:40 +01:00
Robin Ward
1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00
Neil Lalonde
a897c2b091 Add default_external_links_in_new_tab site setting 2014-01-02 15:27:37 -05:00
Régis Hanol
abf910d210 FEATURE: allow for custom HTML inside the <head> tags 2014-01-02 16:22:04 +01:00
Sam
2da5d2311b FEATURE: Added UI for adding and removing watched and muted categories 2014-01-02 17:59:08 +11:00
Sam
1b259c59a5 Merge pull request #1780 from ofgeek/patch-1 
Update client.zh_CN.yml
 2014-01-01 17:01:00 -08:00
ofGEEK
8835e743a0 Update client.zh_CN.yml 2014-01-01 21:29:10 +08:00
Robin Ward
cab6a3f339 Don't forget to precompile the embed css 2013-12-31 18:12:07 -05:00
Neil Lalonde
df220ae973 Get detailed info about new versions from the Discourse Hub. Include version notes from the latest version in notification email. 2013-12-31 15:52:35 -05:00
Robin Ward
4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward
62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl 
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
 2013-12-31 12:52:31 -05:00
Robin Ward
6c4417e0f0 Use the standard .jshintrc file for JSHint options. 2013-12-31 12:41:40 -05:00
Robin Ward
e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
Sam
d150bc20cf no need to remove what is not there 2013-12-31 15:12:07 +11:00
David Celis
0ed42707cc Allow configuration of Redis DB and cache DB 
Hardcoding the Redis DB and Redis Caching DB to 0 and 2 in
`config/database.yml` makes an unsafe assumption that Discourse is the
only application using that install of redis-server. Instead of forcing
users to undergo yet another form of configuration, allow Discourse
admins a nicer way to configure the Redis databases used.

Signed-off-by: David Celis <me@davidcel.is>
 2013-12-30 13:39:43 -08:00
Robin Ward
a502266c42 Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Sam
81eec5ff06 remove "host" so it uses sockets by default, easier to configure 2013-12-30 13:02:38 +11:00
Sam
db1d01d1a2 Discourse as a Mailing List improvements 
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
  When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
  was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
 2013-12-30 13:02:12 +11:00
Neil Lalonde
ad375e231a Fix wrapping of validation messages on signup form 2013-12-27 14:36:36 -05:00
Neil Lalonde
b5d24c72b4 Improve wording of common password validation error 2013-12-27 14:07:51 -05:00
Régis Hanol
393ffeb6ad Merge pull request #1767 from Bahanix/master 
similar_topics french locale was rough
 2013-12-27 11:03:03 -08:00
Neil Lalonde
aafb155db2 Merge pull request #1761 from hzeroo/patch-1 
Added some missing spanish translations
 2013-12-27 11:00:52 -08:00
Neil Lalonde
ab12695d63 Block passwords that are in the top 5000 most common passwords. Site setting block_common_passwords can disable this feature. 2013-12-27 11:00:21 -05:00
Sam
b4f547b3e2 oops missing quote 2013-12-27 13:40:13 +11:00
Régis Hanol
567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Régis Hanol
fe6fc3e9b0 Merge pull request #1766 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-12-23 05:45:31 -08:00
Julien Grillot
54b2242d6b similar_topics french locale was rough 2013-12-23 14:42:57 +01:00
ofGEEK
e452517b18 Update client.zh_CN.yml 2013-12-23 21:05:29 +08:00
thisgeekza
42f42270b8 Add a few extra ProxyPass calls 
These avoid a lot of 404 errors, and things like the style editor not working because the browser can't reach scripts, etc.
 2013-12-23 13:15:39 +02:00
Sam
0d63197e7a update psuedo locale 2013-12-23 10:34:54 +11:00
Sam
b67a3a85dd split js with vendor/application 
avoid one huge js bundle and instead break it down
to application and vendor (3rd party) our app changes
a lot, vendor changes a lot less
 2013-12-23 10:32:07 +11:00
Sam
f7827456af move unhashed images into public images directory. asset precompile does not keep around unhashed urls in prd 2013-12-23 10:06:33 +11:00
Ryan Sullivan
5100c2bbd2 Add Global Keyboard Shortcuts 
Not all of these have been fully implemented yet.

**Jump To**
* `g` then `h` - Home (Latest)
* `g` then `l` - Latest
* `g` then `n` - New
* `g` then `u` - Unread
* `g` then `f` - Favorited
* `g` then `c` - Categories List

**Navigation**
* `u` - Back to topic list
* `k` / `j` - Newer/Older conversation or post
* `o` or `Enter` - Open selected conversation
* <code>`</code> - Go to next section
* `~` - Go to previous section

**Application**
* `c` - Create a new topic
* `n` - Open notifications menu
* `/` - Search
* `?` - Open keyboard shortcut help

**Actions**
* `f` - Favorite topic
* `s` - Share topic
* `<Shift>` + `s` - Share selected post
* `r` - Reply to topic
* `<Shift>` + `r` - Reply to selected post
* `l` - Like selected post
* `!` - Flag selected post
* `b` - Bookmark selected post
* `e` - Edit selected post
* `d` - Delete selected post
* `m` then `m` - Mark topic as muted
* `m` then `r` - Mark topic as regular
* `m` then `t` - Mark topic as tracking
* `m` then `w` - Mark topic as watching
 2013-12-22 12:16:42 -07:00
bent
6d47d9d249 Really add that file! 2013-12-22 00:33:17 +00:00
[Zero]
b7b0c4a20b Added some missing spanish translations 2013-12-21 21:31:47 +01:00
illspirit
e47efa6b7a Update failing_emails_warning 2013-12-20 22:08:49 -05:00
illspirit
1b2e3bf141 Fix smtp settings, added password 2013-12-20 20:50:17 -05:00
Neil Lalonde
f91cb11666 Show why a user can't be deleted on the page instead of as a tooltip 2013-12-20 11:37:01 -05:00
Neil Lalonde
6135d1d214 Add a button to clear filters on site settings page 2013-12-20 11:37:01 -05:00
Jeff Atwood
12f89aef95 invite new users to visit OTHER topics 2013-12-20 02:30:04 -08:00
Jeff Atwood
ac0bcceaf1 clarify reply limit is only for THIS topic 2013-12-20 02:27:51 -08:00
Sam
bac2d21382 strip out nil settings from config 2013-12-20 19:12:08 +11:00
Sam
8b33b45c2d should be commented out 2013-12-20 18:01:41 +11:00
Sam
4b04ac4c2b correct defaults 2013-12-20 16:23:01 +11:00
Sam
f5f09933df Merge branch 'master' of github.com:discourse/discourse 2013-12-20 16:17:52 +11:00
Sam
7b8d2547d0 globals now implemented and documented 2013-12-20 16:17:21 +11:00
Sam
b312b4d563 clean up config to use global settings 2013-12-20 15:12:23 +11:00
Jeff Atwood
2ac9ad6d51 edit copy on new user topic reply limit 2013-12-19 16:06:06 -08:00
Neil Lalonde
854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Robin Ward
1cac9fa257 New users can only post newuser_max_replies_per_topic times per topic. 2013-12-19 13:45:55 -05:00
Robin Ward
3dffa763c5 Merge pull request #1741 from abbat/master 
Russian translation (actual version)
 2013-12-19 08:33:56 -08:00
Robin Ward
40327c25e8 Merge pull request #1747 from alxndr/rss-tweak 
tweak RSS elements for W3C compatibility
 2013-12-19 08:26:04 -08:00
Robin Ward
c2f0bdcf49 Merge pull request #1746 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-12-19 08:24:35 -08:00
Sam
66afabcf4c stop messing with asset pipeline defaults 
stripping postfixes is wasteful and uneeded. It messes up our build
 2013-12-19 12:33:17 +11:00
Sam
9cecabd023 don't warn unless in production 2013-12-19 09:59:44 +11:00
Régis Hanol
380f60d17c shorter text is better text 2013-12-18 22:10:45 +01:00
Neil Lalonde
beef3008b6 Shorter instructions for the name field in the signup form. 2013-12-18 15:37:59 -05:00
Alexander
8294dced6c tweak RSS elements for W3C compatibility 
installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
 2013-12-18 11:06:36 -05:00
ofGEEK
51f92fd87b Update client.zh_CN.yml 2013-12-18 20:55:09 +08:00
Sam
14d21ec865 improve config so you can use it with a socket optionally 2013-12-18 19:23:58 +11:00
Sam
a85333790f attempt to bypass setting port if socket is provided 2013-12-18 17:48:54 +11:00
Sam
a7421f8612 correct parsing 2013-12-18 17:21:01 +11:00
Sam
573e3bd348 fix error message 2013-12-18 17:17:12 +11:00
Sam
5232f0efd1 default to a db called postgres 2013-12-18 16:54:47 +11:00
Sam
ffffee3ae1 IMPORTANT - removed all sample files 
This is very likely to cause merge conflict, it is for the greater good
Discuss at: http://meta.discourse.org/t/enough-with-the-sample-files/10351

From now on we use ENV to customise if needed
 2013-12-18 16:46:37 +11:00
Neil Lalonde
39a360f6e3 Improve tooltip on categories stats. 2013-12-17 17:43:04 -05:00
Sam
5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Neil Lalonde
7fb985a02e Improve spacing of registration form, and add instructions to the password field. 2013-12-16 17:31:21 -05:00
Anton Batenev
12535d645b Russian translation (actual version) 2013-12-17 01:08:37 +04:00
Neil Lalonde
341adc93a4 Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories. 2013-12-16 15:13:57 -05:00
Robin Ward
0c3a3f38e7 Merge pull request #1740 from davh/master 
Updated Swedish client translations
 2013-12-16 10:55:14 -08:00
Robin Ward
acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Sam
646cca3128 Good luck getting this updated everywhere, kicking myself really hard for allowing these stupid sample files 
see: http://meta.discourse.org/t/enough-with-the-sample-files/10351

Our default sample setup was not minifying css or js causing js and css to be 2.5x larger than it needed

Anyone using my docker setup, please run a new bootstrap. Anyone else, apply diff manually.
 2013-12-16 18:21:24 +11:00
David Hedqvist
036eb3e5a5 Updated Swedish client translations 2013-12-15 22:13:05 +01:00
Alexander
d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08:00
Robin Ward
3f2907a924 Merge pull request #1735 from piac/patch-2 
Update client.it.yml to have category section
 2013-12-13 12:52:40 -08:00
Neil Lalonde
49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00
Giulio Piacentino
3360d9daee Update client.it.yml to have category section 
As outlined in this question:
http://meta.discourse.org/t/all-categories-on-non-english-sites/11417
 2013-12-13 20:26:52 +01:00
ofGEEK
e4b2e59daa Update client.zh_CN.yml 2013-12-13 21:36:11 +08:00
voisintotoro
cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva) 
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
 2013-12-12 11:46:36 +01:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward
6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
ofGEEK
29eda817f2 Update client.zh_CN.yml 2013-12-07 08:30:21 +08:00
Neil Lalonde
9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Robin Ward
b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward
314a0e3fad Some style changes for omitted posts, also mobile style. 2013-12-06 12:51:00 -05:00
Robin Ward
cece283667 Merge pull request #1714 from moorchegue/locale/russian/transliteration_fix 
Russian locale transliteration table tiny fix.
 2013-12-06 08:38:16 -08:00
Neil Lalonde
9cef677867 Add comment in database.yml samples about port number 2013-12-06 11:01:22 -05:00
Neil Lalonde
082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward
79427732b2 Show Gaps in the post stream when filters are active 
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
 2013-12-05 16:46:59 -05:00
Neil Lalonde
0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Sander Datema
56b9d4e380 Updated (and corrected) Dutch translation 2013-12-04 10:22:02 +01:00
murchik
8eff2f0172 Russian locale transliteration table tiny fix. 2013-12-04 04:22:29 +04:00
Robin Ward
0b86067be9 Merge pull request #1705 from albandiguer/tests_performance 
Test performance: define a lower post max length
 2013-12-02 12:31:32 -08:00
Neil Lalonde
79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Sam
051fb5bb5b cors for fonts, so firefox stays happy 2013-12-01 15:18:59 +11:00
Alban Diguer
70bd5832a9 Performance: reduce max length post model for testing purpose 2013-11-30 15:13:41 +13:00
Régis Hanol
298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward
781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Régis Hanol
78b2c5acff use CDN_URL environement variable in production 2013-11-29 18:35:29 +01:00
Neil Lalonde
09e3767998 Add base_url to link in pending_users_reminder email 2013-11-28 14:49:11 -05:00
Robin Ward
a86d2b8f03 Merge pull request #1700 from jamiew/en-typo 
Fix "remotes images" typo
 2013-11-28 11:23:28 -08:00
Régis Hanol
52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01:00
Neil Lalonde
c91d1624cf Oops, add browser-update to config.assets.precompile 2013-11-27 14:41:35 -05:00
Jamie Wilkinson
26a726e8e4 Fix "remotes images" typo 2013-11-27 10:42:40 -05:00
Neil Lalonde
a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
jjangg96
c2e7e72b74 faq.ko.html.erb Added 
Korean translate updated.
 2013-11-27 12:21:59 +09:00
Régis Hanol
4e310dd75f Merge pull request #1696 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-11-26 05:39:07 -08:00
ofGEEK
68ee1059f3 Update client.zh_CN.yml 2013-11-26 20:58:45 +08:00
Sam
9d13c6b931 we need this eager load thing 2013-11-26 15:16:56 +11:00
Sander Datema
2d21e64367 Update client.nl.yml 2013-11-25 17:06:05 +01:00
Sander Datema
6a7e71885d Updated server.nl.yml 2013-11-25 17:03:54 +01:00
Jeff Atwood
8df30fa48e minor copyedit on summary text 2013-11-22 17:18:38 -08:00
Neil Lalonde
35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Robin Ward
4c0642cbe1 Merge pull request #1684 from abbat/master 
Russian translation (actual version)
 2013-11-22 08:07:25 -08:00
Neil Lalonde
574a8c92c4 Change enforce_global_nicknames to false until we start giving out access keys 2013-11-21 15:44:09 -05:00
Cassius Chen
ee5f35d4e9 Update puma.rb 2013-11-21 23:00:14 +08:00
Anton Batenev
a734878930 Russian translation (actual version) 2013-11-21 13:46:19 +04:00
Régis Hanol
fb4fb50b7b Merge pull request #1683 from GManzato/fix_fr_translation 
Update french translation
 2013-11-21 00:36:41 -08:00
Régis Hanol
7ad21b0f90 Merge pull request #1682 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-11-21 00:28:31 -08:00
Gilles Manzato
e6995945ea Update french translation 2013-11-21 09:17:15 +01:00
Jeff Atwood
5bc3176ffb minor copyedits 2013-11-20 17:21:51 -08:00
ofGEEK
fe21ffdab4 Update client.zh_CN.yml 2013-11-21 09:06:33 +08:00
Sam
bcc9d749ad load up routes in master 2013-11-20 12:36:19 +11:00
Jeff Atwood
724f81258c copyedit on summarize 2013-11-19 17:27:28 -08:00
Jeff Atwood
e2458fa892 brevity for user card filter 2013-11-19 17:21:55 -08:00
Sam
7603faa20d add rbtrace for production tracing 2013-11-20 10:10:12 +11:00
Sam
325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales 
Provides Japanese locales
 2013-11-19 14:58:06 -08:00
Neil Lalonde
1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
Neil Lalonde
68a69f06e3 Say All instead of All Results 2013-11-19 16:46:20 -05:00
German Viscuso
3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Neil Lalonde
981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Régis Hanol
291acca4fa autoload server/client locales in plugins 2013-11-19 16:42:28 +01:00
ofGEEK
2d66fd38ea Update client.zh_CN.yml 2013-11-19 22:21:20 +08:00
Gilles Manzato
231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Robin Ward
a8f9ba7566 Change "Cancel Summary" -> "Show All Posts" 2013-11-18 17:00:19 -05:00
Régis Hanol
6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde
ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Robin Ward
629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol
dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
cassiusChen
f784a188c6 Locate the Puma config file. 2013-11-18 12:53:36 +08:00
Régis Hanol
482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde
d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Régis Hanol
8a83f1a88f add disk space usage failsafe 2013-11-15 16:48:38 +01:00
Régis Hanol
16267e4887 add download_remote_images_to_local site setting 2013-11-15 15:22:18 +01:00
Sam
461972844e unicorn out of band GC 2013-11-15 12:15:49 +11:00
Neil Lalonde
c57232b73d Move some site settings around 2013-11-14 16:02:14 -05:00
Neil Lalonde
ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde
df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde
1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
Neil Lalonde
791f5ac94e Load site settings from config/site_settings.yml 2013-11-14 16:02:13 -05:00
Sam
ee280c5c04 correct param expansion 2013-11-14 12:54:52 +11:00
Régis Hanol
a01b423263 remove empty plugin.rb file 2013-11-13 16:14:22 +01:00
Sam
8339337cd1 strip out docker stuff, put into a plugin 2013-11-13 17:42:31 +11:00
Sam
0e8914cee6 add unicorn launcher to support live reloads 
add oobgc rudimentary support
 2013-11-13 15:29:36 +11:00
Sam
11428ef9d6 filter out android from mini profiler 2013-11-12 16:47:01 +11:00
Sam
932c2675a7 work in progress, admin page for upgrades (provides source lives in git) 2013-11-12 16:42:35 +11:00
Robin Ward
bfe3d1ec87 Merge pull request #1629 from dmchk/ru 
Actualize ru.js.categories
 2013-11-08 09:56:52 -08:00
Robin Ward
cabde46fe4 Merge pull request #1631 from velesin/fixture_jshint_fix 
FIX: adds fixture test helper to JSHint config
 2013-11-08 09:53:36 -08:00
Robin Ward
921ea603fa Shorten some text 2013-11-08 12:29:35 -05:00
Wojciech Zawistowski
e3e2d66ae4 FIX: adds fixture test helper to JSHint config 2013-11-08 17:28:57 +01:00
Dmitry Ustalov
548806d050 Actualize ru.js.categories 2013-11-08 21:20:12 +05:00
Régis Hanol
98a91b80aa Merge pull request #1628 from vipulnsward/server_typos-1 
Fix more typos in server locale
 2013-11-08 06:25:55 -08:00
Vipul A M
355459b8c7 Fix more typos in server locale 2013-11-08 18:45:11 +05:30
Neil Lalonde
dbd2332b74 Public user profile page shows if the user is suspended and why. 2013-11-07 16:34:31 -05:00
Neil Lalonde
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Régis Hanol
005163b17b Merge pull request #1621 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-11-07 00:20:15 -08:00
ofGEEK
af0d712253 Update client.zh_CN.yml 2013-11-07 09:08:21 +08:00
Robin Ward
de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Sam
e5202b19c0 fix for emoji precompile 2013-11-06 22:39:28 +11:00
ofGEEK
58f3949f7f Update client.zh_CN.yml 2013-11-06 10:21:15 +08:00
Robin Ward
25ef66c60b User invites page now has search, displays first invites_shown records 2013-11-05 17:53:26 -05:00
Neil Lalonde
adba0c2996 Avoid deprecation warning about whitelist_attributes in rails 4 2013-11-05 15:47:43 -05:00
Neil Lalonde
18bc6ecd08 Sidetiq::Clock#start is deprecated. Remove it. 2013-11-05 15:43:48 -05:00
Vipul A M
44bea4de38 Fix some locale typos 2013-11-05 16:13:49 +05:30
Régis Hanol
9f1b7f799f Merge pull request #1612 from jjangg96/Korean 
Edited Korean Client yml
 2013-11-05 02:27:01 -08:00
Régis Hanol
eb9c1f28ed add debug mode to autospec 2013-11-05 11:01:17 +01:00
jjangg96
cc99fe22e6 Edited Korean Client yml 2013-11-05 18:50:48 +09:00
Sam
a2efe27a58 allow compile in profile. 2013-11-05 14:12:26 +11:00
Neil Lalonde
bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Neil Lalonde
ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Robin Ward
e17a5092fe Merge pull request #1607 from sanderdatema/patch-1 
Update server.nl.yml
 2013-11-04 07:14:10 -08:00
Sander Datema
57c0f5ee4c Update client.nl.yml 2013-11-03 22:24:26 +01:00
Sander Datema
866a7057ad Update server.nl.yml 2013-11-03 22:22:40 +01:00
ofGEEK
a7f53847c1 Update client.zh_CN.yml 2013-11-02 22:53:46 +08:00
Sam
8ff35d4b10 automatically make developers admins on account creation, this solves the user #1 problem 
you can simply set the DEVELOPER_EMAILS to a comma delimited list and the users will be auto admined
 2013-11-02 10:26:02 +11:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Neil Lalonde
92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
ofGEEK
ddf47e54af Update client.zh_CN.yml 2013-11-01 14:48:34 +08:00
Robin Ward
b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward
5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Sam
ab6efe8323 I tire of sample files, make number of workers configurable 2013-10-30 16:34:25 +11:00
Sam
ef2b8cbe5d configurable worker process count for unicorn 2013-10-30 16:33:08 +11:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Régis Hanol
caeb91a55f Merge pull request #1588 from GManzato/fix_fr_translation 
Update french locale
 2013-10-29 13:55:25 -07:00
Gilles Manzato
b3e65c937b Update french locale 2013-10-29 21:14:48 +01:00
Robin Ward
6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Raul Murciano
bd5fe86c87 require X-Frame-Options: SAMEORIGIN for clickjack prevention 2013-10-28 15:14:08 -07:00
Robin Ward
8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Robin Ward
9dfdc31527 Merge pull request #1576 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-28 07:27:31 -07:00
Robin Ward
5134f54c40 Merge pull request #1579 from abbat/master 
Russian translation (actual version)
 2013-10-28 07:27:16 -07:00
lionel
3a1fe9701a fix fr localization 2013-10-28 13:29:26 +01:00
Anton Batenev
de3afe514a Russian translation (actual version) 2013-10-28 14:09:34 +04:00
Sam
bdbc2f590f Merge pull request #1574 from pkallberg/master 
Cloud 66 EasyDeploy
 2013-10-27 22:35:24 -07:00
Sam
da62a10b77 work around regression in ruby head 2013-10-28 15:13:10 +11:00
Sam
2fa911f133 use DISCOURSE_HOSTNAME instead 2013-10-28 10:35:53 +11:00
Sam
273643adfc allow passing in of hostname in sample file 2013-10-28 10:31:23 +11:00
ofGEEK
4974567365 Update client.zh_CN.yml 2013-10-26 19:39:34 +08:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Gilles Manzato
524bd5ec70 Add missing translation in FR 2013-10-25 14:03:06 +02:00
Neil Lalonde
d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde
017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Philip Kallberg
dfd2d36089 cloud66 easydeploy 2013-10-24 16:30:44 +01:00
Sam
b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam
666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate 
this cleans up a bunch of internals and removes some settings
 2013-10-24 12:08:02 +11:00
Robin Ward
541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Sam
08c08a3bc6 Merge pull request #1568 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-22 23:12:03 -07:00
ofGEEK
d078f0f775 Update client.zh_CN.yml 2013-10-23 08:47:24 +08:00
Robin Ward
348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Neil Lalonde
7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde
648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Sam
e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam
f0862a5c2e Merge pull request #1551 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-20 22:21:44 -07:00
Sam
1d71a2c722 Merge pull request #1553 from lucasts/master 
Up-to-date pt_BR translations
 2013-10-20 22:21:22 -07:00
Sam
6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Lucas
6729b46cff Up-to-date pt_BR translations 
- some fixes to more approprieted language
- mimic source(en) files to easy future translations
- added missing texts
 2013-10-20 23:58:13 -02:00
ofGEEK
a6a7677fa9 Update client.zh_CN.yml 2013-10-21 08:43:53 +08:00
Sam
9f1edd4c7a Merge pull request #1537 from fny/master 
Remove best standards support for Rails 4 (Removed from ActionDispatch)
 2013-10-20 15:22:39 -07:00
Régis Hanol
a2b27d0700 Merge pull request #1546 from lucasts/patch-1 
Update client.pt_BR.yml
 2013-10-20 07:00:02 -07:00
Cassius Chen
84ca31506f Update server.zh_CN.yml 
Chinese Translation for `this_year`
 2013-10-20 13:16:52 +08:00
Lucas Stephanou
98d9348e45 Update client.pt_BR.yml 
add pt_BR translation for 'this_year'
 2013-10-19 13:29:16 -03:00
Sam
e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam
1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam
8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Jeff Atwood
e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Faraz Yashar
69460b8f9b Remove best standards support for Rails 4 since it's been removed from ActionDispatch 2013-10-17 15:36:18 -04:00
Neil Lalonde
0eaf32db45 Add a message to flags created because of the newuser_spam_host_threshold site setting 2013-10-17 15:08:11 -04:00
Robin Ward
ae5b95514b Merge pull request #1535 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-17 06:56:52 -07:00
ofGEEK
010bfd3c94 Update client.zh_CN.yml 2013-10-17 20:51:52 +08:00
Jeff Atwood
85387b8f72 preformatted text help 2013-10-16 15:07:09 -07:00
Jeff Atwood
052aa65a2d code sample is actually preformatted text 2013-10-16 15:06:35 -07:00
Régis Hanol
a0316f2392 Merge pull request #1534 from voisintotoro/master 
New update of the french translation
 2013-10-16 13:38:23 -07:00
voisintotoro
b997cc2486 New update of the french translation 
I hope i didn't missed some of the previous remarks.
 2013-10-16 22:10:29 +02:00
Robin Ward
c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Neil Lalonde
c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Régis Hanol
debd9bfb25 add a sitesetting to enable the CleanUpUploads job 2013-10-16 17:09:36 +02:00
Sam
3d647a4b41 remove rack cache, it has been causing trouble 
instead implement an aggressive anonymous cache that is stored in redis
this cache is sitting in the front of the middleware stack enabled only in production
TODO: expire it more intelligently when stuff is created
 2013-10-16 16:39:18 +11:00
Sam Saffron
20039860eb Moved cloud66 config out of .cloud66 into config/cloud/cloud66 it is way too prominent as the first folder in github 
Amended documentation to point to it from the install guide in the alternative section
Removed callout from the ubuntu guide, as it is unrelated
 2013-10-15 22:31:57 +11:00
Régis Hanol
4536b5fe04 added a job to clean up orphan uploads 2013-10-15 11:15:48 +02:00
Sam
c954807a63 added upstart script for Discourse 2013-10-13 10:16:53 +11:00
Neil Lalonde
3c2c6ab24b Add sockpuppet spammer detection. Automatically flag posts if they are from new users (registered less than 24 hours ago) at the same IP address and one of them started the topic. 2013-10-11 13:34:05 -04:00
Régis Hanol
c1ba41195e Merge pull request #1520 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-11 09:53:34 -07:00
Régis Hanol
c38ba8acdd add rss links to anonymous homepages 2013-10-11 18:43:29 +02:00
ofGEEK
5b4b794aa2 Update client.zh_CN.yml 2013-10-11 22:38:02 +08:00
Jeff Atwood
6ab740aa1c clarify spam domain blocks 2013-10-10 13:48:16 -07:00
Régis Hanol
ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
David Guijarro
2e97677136 Changed the client Spanish translation 
As per my previous pull request.
 2013-10-10 07:36:25 +02:00
Sam
90bc3323e1 Merge pull request #1505 from crohr/debian-packaging-with-pkgr 
Debian packaging with pkgr
 2013-10-09 21:14:58 -07:00
Sam
97dfe97d5b work around startup issue 2013-10-10 14:23:24 +11:00