Commit Graph

1890 Commits

Author SHA1 Message Date
Sam 11f031c8f9 Merge branch 'fix_commit' 2014-02-24 13:16:01 +11:00
Omega Coleman bc56d821bb Translate client into Chinese. 2014-02-24 13:15:27 +11:00
Sam 0a26a12461 Merge pull request #1989 from Dreami/patch-1
Update client.de.yml
2014-02-24 09:33:31 +11:00
voisintotoro 5723124be9 Updated French tranlations 2014-02-23 20:46:18 +01:00
Jeff Atwood fbf9006a63 email deliverability test copy update 2014-02-23 02:42:06 -08:00
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