codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-30 09:22:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12309 commits 7 branches 179 tags 89 MiB
Commit graph

2997 commits

Author SHA1 Message Date
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
Sam
28a0cb494a rails 4 upgrade 
rack lock is trouble, nuke it out of orbit
more aggressive suicide for forked sidekiq
 2013-10-10 14:23:24 +11:00
Sam
c4bab8915c fix initialization issues with unicorn 
amend unicorn script to demonize sidekiq
create a sidekiq demon that unicorn consumes
correct bug in exec_sql with empty params
 2013-10-10 14:23:24 +11:00
Sam
ad2ed5fe51 rate limits for topics and posts on first day 
max_topics_in_first_day and max_replies_in_first_day
 2013-10-10 10:32:03 +11:00
Neil Lalonde
ecc7ba4be6 Improve the wording of the spam_post_blocked notification 2013-10-09 16:17:26 -04:00
Anton Batenev
75df60c600 Russian translation (actual version) 
Fix YML numeric keys
 2013-10-09 20:07:50 +04:00
Anton Batenev
7d6b93b660 Russian translation (actual version) 
* Migrating from crowdin to transifex translation service (free & less bugs)
 * Reformats YML as transifex service do
 2013-10-09 18:30:38 +04:00
Robin Ward
8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde
bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Cyril Rohr
a7b8481c8f Allow to set SMTP settings via environment variable. 2013-10-08 15:48:57 +01:00
Robin Ward
f9517f7240 Merge pull request #1503 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-10-08 07:31:05 -07:00
ofGEEK
b6545de423 Update client.zh_CN.yml 2013-10-08 11:26:26 +08:00
Jeff Atwood
4613006ae3 minor copyedit to reduce repetition on dialog 2013-10-04 15:36:35 -07:00
Robin Ward
7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Jeff Atwood
2b69f70775 suggested BBS copy change for inappropriate flag 2013-10-04 03:26:25 -07:00
Robin Ward
fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Robin Ward
578ef2098b Merge pull request #1488 from cfstras/removeAllowedUser 
Allow removing users from private conversations
 2013-10-03 08:02:41 -07:00
Claus Strasburger
15a973fd45 Improved private message user removal, locale edit 
replaced array iteration with findProperty (will be renamed and aliased to findBy with Ember 1.1)
added modal dialog to verify
catched nil-error on topic.rb
 2013-10-02 19:16:43 +02:00
Régis Hanol
125c848ee3 Update nginx.config.sample to allow custom CSS 
cf. http://meta.discourse.org/t/changing-css-in-customize-section-has-no-effect/10036
 2013-10-01 17:52:04 +02:00
Robin Ward
be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Sam
f0a122a66c move job files so they live underneath app/ and not in lib/ 
introduce new setting email_always, that will force emails to send to users regardless of presence on site
 2013-10-01 17:04:02 +10:00
Kevin P. Fleming
3777d9f653 Address @Supermathie's concerns in PR1430 2013-09-30 16:28:22 -04:00
Michael Brown
6f25549668 Add process checks to kill/restart too large thins 2013-09-30 15:17:59 -04:00
Anton Batenev
9241d3b789 Russian translation (actual version) 2013-09-30 14:12:49 +04:00
Régis Hanol
3f3551f1e2 Merge pull request #1475 from elegos/master 
Italian localization (pt. 1)
 2013-09-27 09:20:29 -07:00
elegos
ca15527d3e Italian localization (pt. 1) 
First ~600 lines of italian translation revisited including missing
strings.

TODO: lines 581+
 2013-09-27 17:16:34 +02:00
Jakob Hilden
53731e23a2 German typo fix 2013-09-27 11:55:30 +02:00
Jeff Atwood
bbfcec8d18 add edit and quote admonitions to seq reply warn 2013-09-26 00:45:14 -07:00
ofGEEK
b7c0b3a3ca 增加移动版Header和样式表 2013-09-26 10:59:51 +08:00
Aleksandr Kruglov
d8027d1196 Fixed russsian localization 2013-09-21 10:43:57 +04:00
Robin Ward
99b6a62fcb New composer message for people dominating a topic 2013-09-17 14:38:39 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Sam
6af1e12cc1 after_initialize callback for plugins 2013-09-17 10:24:15 +10:00
Neil Lalonde
ba2c4139fe Use absolute urls in notifications for automatic spammer handling. 2013-09-16 15:07:58 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Sam
6ca6853392 disable XML params, they are just used by malicious bots to determine if we have XML vuls. 2013-09-16 12:58:26 +10:00
Sam
1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email 
Enable/disable the possibility of editing user's nickname or email
 2013-09-15 19:24:35 -07:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Anton Batenev
567121c436 Russian translation (actual version) 
Plus crowdin service reformats some strings
 2013-09-14 15:19:43 +04:00
Robin Ward
cca09e1436 Merge pull request #1433 from mguillemot/bluepill_env 
Bluepill load content of .env file
 2013-09-13 11:11:52 -07:00
Robin Ward
c365bd0070 Notify users posting sequential replies that there's a better way to do it. 2013-09-13 13:49:34 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users 
who don't have avatars.
 2013-09-13 12:23:53 -04:00
Matthieu Guillemot
c8b20277cc Bluepill load content of .env file 2013-09-13 14:24:08 +09:00
Jeff Atwood
731fd6a4ff improve copy on auto-blocking new users 2013-09-12 15:24:50 -07:00
Neil Lalonde
827680766e Show which domains were used in the spam_post_blocked notification 2013-09-12 17:33:30 -04:00
Neil Lalonde
bded4b26fa Ask admins to fill in site_description on the dashboard, and send it to the hub 2013-09-11 16:32:49 -04:00
Neil Lalonde
4fa11f159f Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO 2013-09-11 15:33:27 -04:00
Robin Ward
06ea8140aa New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar. 2013-09-11 15:14:18 -04:00
Robin Ward
95bfebefa4 Merge pull request #1425 from cfstras/locale-de 
Updated German locale
 2013-09-11 07:42:43 -07:00
Sam
9c6c0f2a3d enable eager loading in profile mode 
correct bench script
 2013-09-10 16:22:58 +10:00
Sam
3d9496f5d3 disable compilation in profile mode, you must precompile 2013-09-10 16:02:16 +10:00
Claus Strasburger
286780249b Updated German locale: direct replies, mobile/desktop view and private message labels 2013-09-09 20:57:48 +02:00
Robin Ward
d00e0cb96a Merge pull request #1420 from ZogStriP/rake-task-to-regenerate-avatars 
rake task to regenerate avatars
 2013-09-09 08:49:47 -07:00
Robin Ward
0523e8cda1 Merge pull request #1421 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-09-09 08:48:39 -07:00
Sam
98267d439a fixed ruby 2.0 p0 bug in fast_stack so re-pushing 2013-09-09 21:19:23 +10:00
Jeff Atwood
c59c2a4bb3 fix minor copy error on ImageMagick warning 2013-09-09 00:45:03 -07:00
ofGEEK
379007de6c Update client.zh_CN.yml 2013-09-09 09:54:03 +08:00
Régis Hanol
3e80e885ae rake task to regenerate avatars 2013-09-08 12:22:50 +02:00
Jeff Atwood
78b1036db7 fix unsubscribe link in digest emails 2013-09-08 02:25:40 -07:00
Sam
3fb0f52574 disable flamegraph while I figure out why fast stack is not working for some people on x32 2013-09-07 08:50:16 +10:00
Neil Lalonde
2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04:00
Jeff Atwood
c996378fc0 improve approval copy 2013-09-06 13:38:23 -07:00
Régis Hanol
45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Sam
b0573c5f8f missed a few renames 2013-09-06 18:20:02 +10:00
Jeff Atwood
2b9838620d shorter user deletion text 2013-09-06 01:14:38 -07:00
Sam
2ce4468aa5 rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks 
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
 2013-09-06 17:28:37 +10:00
Neil Lalonde
eb0442159c Precompile the new css files 2013-09-05 17:31:19 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Sam
5b08f73561 give god rights of impersonation to developers, must be edited into the production.rb config file 2013-09-05 10:27:34 +10:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Sam
22f2a0c1f4 update rails 4, use log level info in profile for better accuracy 2013-09-04 09:39:16 +10:00
Neil Lalonde
b47eedba00 Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics 2013-09-03 19:12:22 -04:00
Robin Ward
0aee25616c Merge pull request #1409 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-09-03 07:21:52 -07:00
Robin Ward
0a1a5e2e4a Merge pull request #1410 from abbat/master 
Russian translation (actual version)
 2013-09-03 07:21:41 -07:00
Sam
51eb764345 mini profiler update to use latest flame graph engine 2013-09-03 17:58:56 +10:00
Jeff Atwood
f13a408c2a Omit Needless Words on new user JIT popups 2013-09-02 22:41:54 -07:00
Anton Batenev
529fe32453 Russian translation (actual version) 2013-09-02 18:48:47 +04:00
Sam
6e72eb5042 Merge branch 'master' of github.com:discourse/discourse 2013-09-02 17:19:17 +10:00
Sam
d3c5afbb80 reduce sidetiq frequency 
remove minutely() schedule that was very inefficient
 2013-09-02 17:14:41 +10:00
ofGEEK
ee79a28569 Update client.zh_CN.yml 2013-09-02 10:09:11 +08:00
Jeff Atwood
0089b10e25 remove footer newline from digest emails, is ugly 2013-08-30 23:08:29 -07:00
Jeff Atwood
96313ce742 better copy for repeated URL blocking 2013-08-30 21:09:35 -07:00
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Sam
cd3f2a5973 Merge pull request #1401 from netzpirat/update-german-translations 
Update german translations
 2013-08-30 00:09:16 -07:00
Sam
b730b27c4f some soample counter methods 2013-08-30 16:44:34 +10:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Michael Kessler
53cc1a4730 Update German server-side translations. 2013-08-29 18:10:20 +02:00
Michael Kessler
f74e68eece Update German client-side translations. 2013-08-29 16:24:27 +02:00
Sam
b41fa4988a update rails 4 
ensure you clear the tmp/cache folder on each bench (so results are correct, there is an incompat upgrade)
add facter gem which will be used to collect hardware data from the bencher
 2013-08-29 21:23:00 +10:00
Sam
aaf41d227f fix secret_token init to always allow an override even if its too short 2013-08-29 15:27:59 +10:00
Jeff Atwood
eec77e7bea "moved" makes more sense in the notify 2013-08-28 16:31:57 -07:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Robin Ward
0f6c2060b8 Merge pull request #1388 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-27 06:56:20 -07:00
ofGEEK
79ddb162b6 Update client.zh_CN.yml 2013-08-27 15:33:26 +08:00
ofGEEK
85a948d5b4 Update client.zh_CN.yml 2013-08-27 15:21:20 +08:00
Sam
89ce39c902 Merge pull request #1386 from Andersos/patch-1 
added quotes
 2013-08-26 18:45:06 -07:00
Neil Lalonde
3708d47c87 Check daily if there are new users who need to be approved and send a pm to moderators 2013-08-26 16:16:27 -04:00
Anders Sandvik
7dc71a616b added quotes 2013-08-26 22:00:55 +02:00
Sam
818bf1355d PluginStore for plugin specific bits of storage 
Amended plugin interfaces so they work with the vk sample
 2013-08-26 12:59:17 +10:00
Sam
213ce33af2 Fixed all broken specs 
Moved middleware config into authenticators
 2013-08-26 12:59:17 +10:00
Sam
912d4b853b slowly going about ordering our middleware 2013-08-26 12:59:17 +10:00
Sam
075002a6d5 refactoring the plugin interfaces to allow for better extensible 2013-08-26 12:59:17 +10:00
Régis Hanol
32f717420d add max_image_height site setting 2013-08-26 00:24:24 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work 
Improved specs for avatar + added a warning whenever the uploaded image is not a square
 2013-08-25 07:30:34 -07:00
Robin Ward
89421088e5 Merge pull request #1379 from abbat/master 
Russian translation (actual version)
 2013-08-25 07:28:38 -07:00
Robin Ward
9e32baa357 Merge pull request #1375 from versvs/master 
Added strings
 2013-08-25 07:28:10 -07:00
Anton Batenev
bad2f7bb24 Russian translation (actual version) 2013-08-25 17:19:03 +04:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9 improved specs for avatar 2013-08-24 22:45:05 +02:00
versvs
50a49138a5 Added strings 
Added some strings not yet existing in the "es" locale but already in use in the application.
 2013-08-24 18:10:54 +02:00
Robin Ward
acf1124c0a Merge pull request #1370 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-24 08:31:19 -07:00
Jeff Atwood
fb037290ac clarify on invite friends 2013-08-23 23:12:24 -07:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Jeff Atwood
c409d91203 add "temporarily" to flagged content hidden 2013-08-23 00:07:08 -07:00
ofGEEK
1a58bfbdc9 Update client.zh_CN.yml 2013-08-23 09:52:10 +08:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Jeff Atwood
32655e9dad digest email footer should say "unsubscribe" 2013-08-22 12:53:28 -07:00
Neil Lalonde
10bc24b514 Add a note to allow_uncategorized_topics description 2013-08-22 12:14:41 -04:00
John Paul Ashenfelter
cc2b0f1a5f took a stab at other translations with help from google 2013-08-21 16:29:05 -04:00
John Paul Ashenfelter
bd2006b270 updated english translation 2013-08-21 16:28:51 -04:00
Neil Lalonde
47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -04:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Sam
b5b22f0f36 move secret token into redis to ease install 2013-08-20 17:17:19 +10:00
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Neil Lalonde
7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Robin Ward
103f204e36 Merge pull request #1354 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-19 07:35:36 -07:00
Anton Batenev
35442a0c79 Russian translation (actual version) 2013-08-19 12:26:02 +04:00
ofGEEK
59a252f535 Update client.zh_CN.yml 2013-08-19 10:53:05 +08:00
Sam
1d74cc60a1 don't try sending emails out in profile mode 2013-08-19 11:33:38 +10:00
Sam
b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Michael Kirk
4af8a9102e Authenticate with Discourse via OAuth2 
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
 2013-08-17 21:45:20 -07:00
Régis Hanol
ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde
baff59d752 Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting. 2013-08-16 17:28:36 -04:00
Michael Brown
95c246e257 Add section for additional MIME in nginx 2013-08-16 11:49:50 -04:00
Neil Lalonde
b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Jeff Atwood
946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Sam
b52761c522 Merge pull request #1338 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-15 21:52:02 -07:00
ofGEEK
b2acf33a74 Update client.zh_CN.yml 2013-08-16 11:16:17 +08:00
ofGEEK
3a8fbdb9a8 Update client.zh_CN.yml 2013-08-16 11:13:50 +08:00
ofGEEK
490b057922 Update client.zh_CN.yml 2013-08-16 11:07:25 +08:00
Robin Ward
27fbd232d4 Merge pull request #1334 from ofgeek/patch-2 
Completely update the zh_CN locale.
 2013-08-15 08:33:38 -07:00
Robin Ward
9740d70c67 Merge pull request #1335 from meglio/links 
Fix site settings link in Twitter config warning
 2013-08-15 08:32:19 -07:00
Neil Lalonde
293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Anton Andriyevskyy
f74587bb84 Fix site settings link in Twitter config warning 2013-08-15 11:51:18 +03:00
ofGEEK
a6085125c5 Totally update zh_CN locale. 
投诉 → 报告
登陆 → 登录
 2013-08-15 11:53:00 +08:00
ofGEEK
fe85e9f739 Update client.zh_CN.yml 2013-08-15 11:42:20 +08:00
ofGEEK
22d26b471b Keep up with the en locale. 2013-08-15 11:38:54 +08:00
Sam
c2653b2915 Merge pull request #1309 from stephankaag/sidetiq 
Replace Clockwork with Sidetiq
 2013-08-14 16:51:04 -07:00
Neil Lalonde
9170166e93 Finish renaming blocked emails to screen emails 2013-08-14 16:45:30 -04:00
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Neil Lalonde
bc0d4f1bfc Add a confirm modal to Delete All Posts button 2013-08-14 11:48:18 -04:00
Robin Ward
b71ffe9160 Merge pull request #1326 from sanderdatema/dutch_translation 
Updated Dutch translation
 2013-08-14 06:56:52 -07:00
Sander Datema
e0636fa914 Updated Dutch translation 2013-08-14 15:47:48 +02:00
Régis Hanol
3524b90d6a FIX: avatars in quotes/oneboxes 
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
 2013-08-14 12:20:05 +02:00
Sam
019d52f4ac Merge pull request #1319 from adrianlang/patch-1 
Fix typo in german translation
 2013-08-14 01:11:10 -07:00
Adrian Lang
701090bf3e Fix typo in german translation 2013-08-13 21:36:57 +02:00
Robin Ward
9782d3777e Merge pull request #1314 from quickwango/patch-1 
missing german translations
 2013-08-13 07:39:33 -07:00
Phillip Schichtel
8a0e253b6f oops, that should not be there 2013-08-13 16:29:49 +02:00
Jeff Atwood
ce92d21d22 copyedit pass on admin descriptions 2013-08-13 02:00:01 -07:00
Jeff Atwood
6722a1fe22 some minor user deletion tweaks 2013-08-13 00:41:23 -07:00
Phillip Schichtel
18c304bda6 more translations 2013-08-12 21:32:04 +02:00
Phillip Schichtel
306a6eeb3c fixed indention 2013-08-12 21:23:35 +02:00
Neil Lalonde
b36c6d7b78 Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days. 2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055 Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits. 2013-08-12 11:12:20 -04:00
Anton Batenev
8e8167b41e Russian translation (actual version) 2013-08-12 09:58:45 +04:00
Phillip Schichtel
7029261318 added the missing de.user.change translation 2013-08-12 00:20:29 +02:00
charlieshum
199d6a3fcc Update client.zh_TW.yml 
update the translation by comparing with client.en.yml
 2013-08-10 19:43:47 +08:00
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
ce05b43c1d Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful 2013-08-08 12:54:38 -04:00
Adrian Lang
b6a133c6b1 Fix various errors in german translation 2013-08-08 11:26:01 +02:00
Neil Lalonde
b097d780d0 Tweaks to staff action logs page 2013-08-07 18:29:13 -04:00
Neil Lalonde
b0848db6de Oops, forgot to use i18n in some places 2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Robin Ward
fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Michael Brown
08e41a707d Update documentation 
* Change recommendation for install path to /var/www/discourse
* Fix instructions for redis-server installation
* Set yourself as system user during install
* Clarify some instructions
 2013-08-07 00:06:40 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00
Anton Batenev
5f4bcfaafa Russian translation (actual version) 2013-08-05 10:17:18 +04:00
Sam
5f46dfedf1 Merge pull request #1320 from ZogStriP/local-avatars 
Local avatars
 2013-08-14 00:36:42 -07:00
Régis Hanol
71c33086b4 updated NGINX sample configuration 2013-08-13 22:09:44 +02:00
Régis Hanol
e397c14702 updated locales 2013-08-13 22:09:36 +02:00
Régis Hanol
92b0cfe3d3 cleaned up non-used code 2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1 added the "allow uploaded avatars" site setting 2013-08-13 22:06:22 +02:00
Sam
10b02b1288 Create profile db generator for use when benchmarking a local install http://meta.discourse.org/t/benchmarking-discourse-locally/9070 2013-08-05 07:22:13 +10:00
Jeff Atwood
fadb6afde8 missed an image upload extension removal 2013-08-04 01:20:52 -07:00
Jeff Atwood
2fe70819d5 don't show image extensions 
BECAUSE SERIOUSLY IMAGES JESUS DUH
 2013-08-04 01:19:15 -07:00
Jeff Atwood
c2acdaad9d add better copy for username changes 2013-08-04 01:11:35 -07:00
Neil Lalonde
98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Jeff Atwood
f996a8757a add "post last edited at" to edit tooltip 2013-08-02 13:15:50 -07:00
Robin Ward
d5dd70c503 Merge pull request #1287 from charlieshum/master 
Update client.zh_TW.yml
 2013-08-02 13:14:34 -07:00
Neil Lalonde
9db0ac16a9 Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted 2013-08-02 13:35:52 -04:00
charlieshum
7b4a236c3f Update client.zh_TW.yml 2013-08-02 19:41:33 +08:00
Sam
d25dfb85ce Merge pull request #1280 from kubabrecka/cs_update50 
cs translation update
 2013-08-01 18:13:32 -07:00
Sam
857e2e6a19 correct scope, it should user:email to get read access to email 2013-08-02 10:03:29 +10:00
Sam
2162e3bbb5 we need email scope (also as I edit files I like to keep quoting consistent) 2013-08-02 09:59:25 +10:00
Régis Hanol
faeb4a9ebd enhance upload selector 
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
 2013-08-02 01:30:18 +02:00
Jeff Atwood
c063580275 slightly shorter copy for first post JIT education 2013-08-01 15:58:46 -07:00
Jeff Atwood
0f067a2ad3 we need that <hr> in notification emails, I think 2013-08-01 15:15:32 -07:00
Régis Hanol
1e2f151860 warns sysadmin to rebake all the posts 
when changing the hostname
 2013-08-01 22:24:55 +02:00
Kuba Brecka
74979b17d4 cs translation update 2013-08-01 18:27:15 +02:00
Robin Ward
4a0ea7f776 Upgrade jQuery to 2.0.3 2013-08-01 11:58:22 -04:00
Sam
160107a712 working plugin interface for custom openid auth, custom css and custom js 2013-08-01 16:02:43 +10:00
Jeff Atwood
0480c55d9f minor activation copy improvement 2013-07-31 11:44:42 -07:00
Robin Ward
491c93c3d1 Merge branch 'makeheadspace-fix_spelling_on_settings' 
Conflicts:
	config/locales/server.en.yml
 2013-07-31 10:24:37 -04:00
Robin Ward
6f81b9b9af Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings 2013-07-31 10:23:04 -04:00
Uģis Ozols
0fc5d53e5a Remove redundant 'are'. 2013-07-31 13:05:14 +03:00
Jeff Atwood
4e59f2d122 update copy for self-deleted posts 
still needs variable replacement for the 24 hours part
 2013-07-30 13:16:13 -07:00
Zee Spencer
1caa301712 Fix spelling of noscript in the settings page. 2013-07-30 10:22:31 -04:00
Neil Lalonde
4fd5087f91 Add button to delete a spammer in the flag modal 
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
 2013-07-29 15:29:44 -04:00
Neil Lalonde
5f3e9131ed Deleting a user from admin user page has the option to also block signups from the same email address 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f8a130277 Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field. 2013-07-29 15:29:43 -04:00
Sam
77494e201a Merge pull request #1258 from elo7/pt_BR 
Added pt_BR user.change key value
 2013-07-28 22:18:37 -07:00
Sam
aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Daniel Cukier
c73f22b515 added pt_BR key 2013-07-26 11:17:20 -03:00
Anton Batenev
ce8d69ccf1 Russian translation (actual version) 2013-07-26 14:35:59 +04:00
Robin Ward
e94cab090a Merge pull request #1251 from johand/updating_es_locale 
updating the spanish translation in client.es.yml
 2013-07-25 13:05:08 -07:00
Robin Ward
0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Johan
cca9473c55 updating the spanish translation in client.es.yml 2013-07-24 04:43:53 -04:30
Sam
366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments 
uploads selector texts is now different when attachments are enabled
 2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion 
Add confirmation modal to admin group deletion
 2013-07-23 00:43:06 -07:00
Doug Alcorn
35a2bb7919 Parameterize the PBKDF2 algorithm in application config 
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
 2013-07-22 21:36:01 -04:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward
43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Neil Lalonde
b0ca3a34ca Neil have fixed his grammar 2013-07-22 15:45:46 -04:00
Robin Ward
3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
Robin Ward
ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues 
Fix s3 related issues
 2013-07-22 07:30:41 -07:00
Robin Ward
c879c58481 Merge pull request #1227 from abbat/master 
Russian translation (actual version)
 2013-07-22 07:23:18 -07:00
Robin Ward
8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting 
add newuser-max-attachments setting
 2013-07-22 07:22:23 -07:00
Sam
1f3c5cb656 allow end user to recover a post they delete 
automatically delete stubs after 1 day
 2013-07-22 17:48:47 +10:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Anton Batenev
ad31eefb27 Russian translation (actual version) 2013-07-22 01:49:46 +04:00
Michael Brown
ddabc476bf Awesome documentation updates 2013-07-21 03:43:54 -04:00
Régis Hanol
613e31d3ef added a warning regarding the case of the s3_upload_bucket setting 
until we get proper setting validation.
 2013-07-20 11:54:21 +02:00
Sam
58eec31351 sample ubuntu upstart config file 2013-07-19 15:23:55 +10:00
Prem Prakash
713735f4c8 updating pt_BR translations 2013-07-18 00:09:54 -03:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master 
Adding Portuguese Brazilian translations
 2013-07-17 06:59:31 -07:00
Robin Ward
6839869170 Merge pull request #1211 from zsj950618/master 
Add some  translation of Simplified Chinese
 2013-07-17 06:53:07 -07:00
Robin Ward
75e636f5a5 FIX: Invalid YAML 2013-07-17 09:51:03 -04:00
Junki Cho
b4cae0f5d3 Korean language pack 2013-07-17 09:36:50 -04:00
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads 
adds the `max_attachment_size_kb` setting
 2013-07-16 23:03:42 -07:00
Sam
2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Sam
625204c8bd work in progress category UI 
refactor hack from earlier
 2013-07-17 14:54:21 +10:00
SJ Zhu
0956c60c99 add some missing Simplified Chinese translation 2013-07-17 09:47:07 +08:00
Régis Hanol
46ff98f2d3 fix composer toolbar upload title 2013-07-17 01:21:27 +02:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Robin Ward
86d0255d5a Merge pull request #1197 from kubabrecka/cs_update49 
cs translation update
 2013-07-16 07:33:33 -07:00
Sam
06bd9e3234 allow login required screen to be customized 2013-07-16 20:49:04 +10:00
Sam
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Jeff Atwood
957d7a31dd clarify queue_jobs is developer only 2013-07-15 23:12:27 -07:00
Sam
ecf17cfebb work in progress, add fidelity to category group permissions (full, create posts, readonly) 2013-07-16 15:46:11 +10:00
Régis Hanol
5ce05ff5cb adds the max_attachment_size_kb setting 
so that we can specify a different max upload size for attachments and images.
 2013-07-16 02:01:36 +02:00
premprakash
8c5e0e7550 Adding Portuguese-Brazil language 2013-07-15 14:45:16 -03:00
Kuba Brecka
e2a2bddd60 cs translation update 2013-07-15 16:40:39 +02:00
Robin Ward
ed60f24502 Merge pull request #1194 from ZogStriP/uploads 
[Upload] Great deal of renaming
 2013-07-15 07:06:18 -07:00
Robin Ward
2bba939d9f Merge pull request #1196 from abbat/master 
Russian translation (actual version)
 2013-07-15 07:04:27 -07:00
Anton Batenev
fb00418f7a Russian translation (actual version) 2013-07-15 15:45:51 +04:00
Sam
25bcd6007c Update client.nb_NO.yml 
broken yaml
 2013-07-15 21:26:28 +10:00
Sam
bf06be3260 Merge pull request #1189 from erlend-sh/patch-4 
Update client.nb_NO.yml
 2013-07-15 03:14:22 -07:00
Sam
16976a2092 Merge pull request #1192 from cfstras/locale 
Locales: updated German locale, mainly the admin section
 2013-07-15 03:08:33 -07:00
Sam
86e5c9afc2 Merge pull request #1193 from jbruni/master 
Tiny typo fix (comment at nginx.sample.conf)
 2013-07-15 00:58:09 -07:00
Jeff Atwood
906d1bc7c8 improve copy on daily action limit 2013-07-14 23:11:10 -07:00
Jeff Atwood
f46b619547 simplify copy around merge and split 2013-07-14 22:24:59 -07:00
Régis Hanol
36e6345eee change the icon in the composer toolbar with a more generic upload icon 
also changed all references to "images uploads" to a "uploads"
 2013-07-14 23:44:50 +02:00
Claus Strasburger
f92075f360 Locale german: got another one 2013-07-14 20:37:40 +02:00
Claus Strasburger
1d4abbe1fd Locales: updated German locale, admin content like the admin section and flagging 2013-07-14 20:11:07 +02:00
Erlend Sogge Heggen
542408550c v1 Complete translation for client.nb_NO.yml 
All strings now have a first-take translation. Might have missed some due to the inconsistent use of double quotes, single quotes and no quotes (we're still good!).

I'm not entirely sure what happens when I apply edits to a still pending-for-pull patch; sorry if I goofed.
 2013-07-14 14:16:17 +02:00
Régis Hanol
3397c2235f display the size of the attachment in the preview 
instead of adding it during post processing
 2013-07-14 12:28:24 +02:00
J Bruni
a42ed5d831 Fixed typo at nginx.sample.conf 2013-07-14 01:06:59 -03:00
Erlend Sogge Heggen
ac9cfe32f9 Update client.nb_NO.yml 
Moar translations. Also jumped back and fixed what I could find of the ones with missing double quotes.
 2013-07-13 20:47:11 +02:00
Robin Ward
6ca5df0a09 Can recover deleted topics. Deleted topics show the first post as deleted in the UI. 2013-07-12 12:09:17 -04:00
Sam
f05bc44fbe Merge pull request #1182 from sanderdatema/dutch_translation 
Dutch translation updated
 2013-07-11 19:59:08 -07:00
Sam
00c6bffc61 Merge pull request #1183 from erlend-sh/patch-3 
Update client.nb_NO.yml
 2013-07-11 19:58:29 -07:00
Robin Ward
19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Erlend Sogge Heggen
1976c622dc Update client.nb_NO.yml 2013-07-11 16:54:51 +02:00
Sander Datema
d4bc6f977b Dutch translation updated 2013-07-11 16:54:46 +02:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments 
Attachments
 2013-07-11 06:49:20 -07:00
Roy Guo
994f3d4ad5 Update client.zh_CN.yml 
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆"   # can't login
 2013-07-11 11:47:17 +08:00
Régis Hanol
6beb12e778 update nginx.sample.conf to take attachmetns into account 2013-07-10 22:59:54 +02:00
Robin Ward
8ffe9e28d6 Shows who deleted a post 2013-07-10 16:22:49 -04:00
Neil Lalonde
0e3e5bf533 Add relative_date_duration site setting 2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb Merge pull request #1157 from abbat/email-custom-headers 
Add custom headers for email messages
 2013-07-10 07:12:51 -07:00
Robin Ward
68c86931e4 Merge pull request #1169 from phanimahesh/patch-1 
Prevent errors in case #{rails_root}/tmp does not exist
 2013-07-10 07:11:59 -07:00
Robin Ward
4eb5f99103 Merge pull request #1173 from nterray/translate_reply_subject 
French translation of user_replied/posted subject
 2013-07-10 07:11:16 -07:00
Sam
7ccfc40389 TODO comment 2013-07-10 16:35:18 +10:00
Sam
8367326e76 glyphs on the user stream, rename responses to replies 2013-07-10 16:35:06 +10:00
Nicolas Terray
19c5894874 French translation of user_replied/posted subject 
This is a follow-up of the commit 013ad0fdd
 2013-07-10 00:30:53 +02:00
Neil Lalonde
4c0fe3bc12 Add a BIG WARNING to queue_jobs site setting 2013-07-09 15:34:51 -04:00
Neil Lalonde
3c38062802 Check for updates: edge cases when the message on the dashboard doesn't make sense. 2013-07-09 14:01:08 -04:00
J Phani Mahesh
b1fcd523c6 Use FuleUtils.mkdir_p for cleaner code 2013-07-09 22:26:27 +05:30
Anton Batenev
ed1fb847ed Russian translation (actual version) 2013-07-09 18:26:59 +04:00
Robin Ward
5cda0e556c Merge pull request #1111 from jamesaanderson/flash-video-onebox 
Add flash video onebox support
 2013-07-09 06:55:56 -07:00
J Phani Mahesh
4fe6bee83c Prevent errors in case #{rails_root}/tmp does not exist 
Dir.mkdir is not recursive. i.e - It doesn't do the equivalent of `mkdir -p` but just plain `mkdir`.
And that is a problem if #{rails_root}/tmp is missing. More here.
http://meta.discourse.org/t/keep-getting-the-same-error-every-start/8214
 2013-07-09 17:46:54 +05:30
Jeff Atwood
2c314e275e improve new category copy a bit 2013-07-09 00:49:38 -07:00
Jeff Atwood
853fcb9b88 improve best of copy slightly 2013-07-08 23:39:22 -07:00
Sam
21bfb64a28 added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process 2013-07-09 11:01:51 +10:00
Neil Lalonde
ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Neil Lalonde
9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Robin Ward
013ad0fdda Added In-Reply-To and References email headers. Additionally removed username from 
email replies and new posts to keep the subjects collapsable.
 2013-07-08 11:48:40 -04:00
James A. Anderson & Jalil Mohammed
d51a3cf50f Add flash video onebox as disabled setting by default 2013-07-08 06:37:44 -07:00
Jeff Atwood
4ddd50fe17 add "new" to PM title there for clarity 2013-07-08 00:01:24 -07:00
Jeff Atwood
7bf798891b better new user block PM copy 2013-07-07 23:58:07 -07:00
Sam
f42fc3be37 Merge pull request #1150 from mcwumbly/topic-likes 
little tweaks to like counts in topic list view
 2013-07-07 23:39:38 -07:00
Sam
3dbb4ff9bc Reorder filters on user page and name them better (All, Topics, Posts, Responses) 2013-07-08 12:12:06 +10:00
Sam
5086f48784 reloading classes is just trouble in test, lets not do that so spork is squeaky clean and happy. 2013-07-08 12:10:47 +10:00
Sam
d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above 
added a bunch of debugging information to help diagnose weird positioning issues
 2013-07-08 11:13:45 +10:00
Sam
c6c8246399 added sample unicorn config 
added utility to measure real memory usage
don't require thin by default
 2013-07-07 14:31:07 +10:00
Anton Batenev
4e04c4dddd Add custom headers for email messages 
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
 2013-07-07 04:37:44 +04:00
Robin Ward
337f393af5 Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting 
removed auto_link_images_wider_than setting
 2013-07-06 17:12:11 -07:00
Robin Ward
63f4519268 Merge pull request #1152 from abbat/patch-1 
Fix Cyrillic transliteration map
 2013-07-06 17:10:09 -07:00
Régis Hanol
45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02:00
Régis Hanol
6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Anton Batenev
9999561b86 Fix Cyrillic transliteration map 
Fix Cyrillic transliteration map for letters which hasn't ASCII equivalent
 2013-07-06 18:38:01 +04:00
David McClure
a3eb175683 - like counts use number formatting (so 1100 is 1.1K like other counts) 
- made 'likes' column wide enough to hold 3 digit and > 999 likes
 2013-07-06 00:07:10 -07:00
Neil Lalonde
25d2cbc33f Merge branch 'master' of github.com:discourse/discourse 2013-07-05 16:52:27 -04:00
Neil Lalonde
1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -04:00
Robin Ward
6cd6484b5e New mode for Wordpress: Filter ONLY posts liked by moderators 2013-07-05 16:07:24 -04:00
Robin Ward
7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround 
Workaround solution to help Yandex crawler index discourse.
 2013-07-05 10:04:40 -07:00
Neil Lalonde
84ce04dfa5 Use POST for send_activation_email action 2013-07-05 12:26:46 -04:00
Neil Lalonde
a0f07f8914 Show the error message when send activation email fails from admin 2013-07-05 11:50:43 -04:00
Neil Lalonde
ceee8ed63b Put back mailcatcher config in development.rb 2013-07-05 11:32:54 -04:00
Anton Batenev
694a6f4970 Fix recommendations from #1145 2013-07-05 15:59:39 +04:00
Régis Hanol
7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Régis Hanol
c42cb6ef48 add a comment in database.yml template files indicating that Sidekiq must be restarted after changes 2013-07-04 23:31:36 +02:00
Anton Batenev
af36d32f7f Workaround solution to help Yandex crawler index discource. 
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
 2013-07-04 22:08:23 +04:00
Robin Ward
ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels 
Feature: Admin can modify user trust levels
 2013-07-04 06:57:59 -07:00
Sam
b83e3a3ffd Merge pull request #1137 from kubabrecka/cs_update47 
cs translation update
 2013-07-03 23:29:05 -07:00
Sam
33a49607d6 Merge pull request #1138 from kubabrecka/en_yml_action_type_fix 
remove localization duplicate - seems like a typo
 2013-07-03 23:15:26 -07:00
Anton Batenev
89dcded3a7 i18n transliteration map from Russian Cyrillic to ASCII 
i18n transliteration map from Russian Cyrillic to ASCII
(ISO-9:1995 / GOST 7.79-2000, table B) for pretty URLs (slug)
 2013-07-04 01:17:01 +04:00
Kuba Brecka
f7e2b3be7f remove localization duplicate - seems like a typo 2013-07-03 21:27:46 +02:00
Kuba Brecka
e58f9ef843 cs translation update 2013-07-03 21:22:41 +02:00
Robin Ward
f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions 
Conflicts:
	app/models/site_setting.rb
 2013-07-03 11:18:42 -04:00
Robin Ward
6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls 
Conflicts:
	app/services/spam_rules_enforcer.rb
 2013-07-03 11:13:56 -04:00
Robin Ward
c12e87650d Merge pull request #1130 from adrianlang/patch-1 
Fix German translation of user_automatically blocked template
 2013-07-03 08:06:15 -07:00
ThomasHarper
7ef5f0ac9b Update server.fr.yml 2013-07-03 14:47:38 +02:00
ThomasHarper
4f10ea9880 Update server.fr.yml 
Added few POPS3 translations and few things
 2013-07-03 14:22:31 +02:00
ThomasHarper
67502d0c8e Update server.fr.yml 
added cas_domainname
 2013-07-03 14:07:26 +02:00
ThomasHarper
64a00e284e Update client.fr.yml 
Missing capital on homepage
 2013-07-03 11:43:52 +02:00
Navin
3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Adrian Lang
5ea2bce646 Fix German translation of user_automatically blocked template 
Right now this bug prevents blocking with German locale.
 2013-07-03 09:38:21 +02:00
Robin Ward
22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Neil Lalonde
075ed1ab53 Refactor user blocking code; hide the Block button in admin 2013-07-02 14:42:53 -04:00
Robin Ward
5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
merugear
f47effa154 Changed grammar on powered_by_html 2013-07-02 12:11:28 +02:00
Jeff Atwood
8057851cf5 "there are no more" is sufficient, drop "to read" 2013-07-01 23:29:49 -07:00
Sam
12f866a727 Merge pull request #1120 from abbat/master 
Russian translation (actual version)
 2013-07-01 22:44:30 -07:00
Sam
c3f64f99b3 fix up messed up routes 2013-07-02 15:21:26 +10:00
Sam
46c6949b6e Merge pull request #1123 from stephankaag/rails4-new 
Refactor routes in order to be compatible with Rails 4
 2013-07-01 16:07:22 -07:00
Stephan Kaag
e39cc464b1 Refactor routes in order to be compatible with Rails 4 2013-07-01 20:00:06 +02:00
Anton Batenev
5281ba5af3 Russian translation (actual version) 2013-07-01 11:14:19 +04:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde
c1a39b5a30 Show date with year in message to banned users who try to log in 2013-06-30 12:49:34 -04:00
Neil Lalonde
dca216ed54 Be a bit more clear in the forgot password message 2013-06-28 18:14:16 -04:00
Robin Ward
2deaf8ef98 Custom Wordpress Serializer and Path, with Specs 2013-06-28 13:56:13 -04:00
Neil Lalonde
2d6118297d Changes to tiny date format to remove mon and show short format dates instead 2013-06-28 13:10:04 -04:00
Neil Lalonde
3c9cdead49 Update title on bookmark button of the last post you read 2013-06-28 13:10:04 -04:00
ThomasHarper
0382ec319e Update client.fr.yml 2013-06-28 16:38:10 +02:00
Robin Ward
4711c75e53 Merge pull request #1103 from royguo/patch-1 
Update server.zh_CN.yml
 2013-06-28 07:21:50 -07:00
Robin Ward
251d169c0d Merge pull request #1104 from ThomasHarper/patch-5 
Update client.fr.yml
 2013-06-28 07:21:10 -07:00
ThomasHarper
71464c0c31 Update client.fr.yml 
dynamic_favion added
 2013-06-28 16:04:20 +02:00
ThomasHarper
80e886bfde Update client.fr.yml 
Adding few translations again
 2013-06-28 15:58:19 +02:00
ThomasHarper
a94947f5b0 Update client.fr.yml 
Adding missing fr translation
 2013-06-28 15:25:05 +02:00
Roy Guo
4034cde6aa Update server.zh_CN.yml 
num_clicks : "点击数"
 2013-06-28 09:54:37 +08:00
Jeff Atwood
40c9014634 make flag reply reply-ier 2013-06-27 16:01:48 -07:00
Neil Lalonde
5d6ad8f39c Show a useful message when a banned user tries to log in 2013-06-27 15:14:42 -04:00
Robin Ward
bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Robin Ward
d13166fa17 Merge pull request #1095 from Mikulas/typo-translation-czech 
Minor typo fix in czech translation
 2013-06-27 07:08:57 -07:00
Sam
9fd00cac65 work in progress, add custom faq link, ember router needs to know about this or the redirect trick will not work 2013-06-27 17:15:59 +10:00
Jeff Atwood
5d1f5505af "private topics" doesn't need to say "count" 2013-06-26 21:26:51 -07:00
Régis Hanol
72745d257d provide a way to give a default filename to pasted images in the lightbox overlay 2013-06-26 21:54:08 +02:00
Mikulas
6819cd2886 minor typo fix in czech translation 
grammar source: http://www.proofreading.cz/\?p\=377
 2013-06-26 20:10:50 +02:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde
196a8f4ba5 Add dashboard warnings for system_username and notification_email site settings 2013-06-26 10:57:04 -04:00
Jeff Atwood
e4f1255cde copy improvement on account approval 2013-06-26 01:17:27 -07:00
Jeff Atwood
1ec411c811 we're so excited, and we just can't hide it 
we're about to lose control and we think we like it
 2013-06-25 23:57:28 -07:00
Neil Lalonde
b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Jeff Atwood
87db582297 minor copyedit on "20 to go.." 2013-06-25 10:36:46 -07:00
Jeff Atwood
a9f4fa4927 copyedits on reply via email 2013-06-25 10:07:27 -07:00
Robin Ward
3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers 
before sending the message as they are no longer needed.
 2013-06-25 11:35:26 -04:00
Robin Ward
3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Neil Lalonde
c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
ThomasHarper
7e9d942060 Update server.fr.yml 
Adding quotes and few things missing
 2013-06-24 15:41:24 +02:00
Robin Ward
bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2 
Update client.fr.yml
 2013-06-24 06:28:51 -07:00
Robin Ward
4b638a0fea Merge pull request #1083 from ThomasHarper/patch-3 
Update client.fr.yml
 2013-06-24 06:27:59 -07:00
Anton Batenev
fe51fd87cc Russian translation (actual version) 2013-06-24 15:55:44 +04:00
ThomasHarper
b8960f26c9 Update client.fr.yml 
Dates were missing and few stuff on back end
 2013-06-24 12:43:02 +03:00
ThomasHarper
fadab25609 Update client.fr.yml 
Missing quote
 2013-06-24 12:01:42 +03:00
Erlend Sogge Heggen
6db64124fd Updated NO translation - Some questions in dscr. 
Did X more lines.

I'm afraid to change stuff that's not in quotes, so I'm unsure whether or not I should be changing line like these:

      browse_all_categories: Browse all categories

      view_latest_topics: view latest topics
      suggest_create_topic: Why not create a topic?
      jump_reply_up: jump to earlier reply
      jump_reply_down: jump to later reply

or these:

      progress:
        title: topic progress
        jump_top: jump to first post
        jump_bottom: jump to last post
        total: total posts
        current: current post
 2013-06-21 21:37:35 +03:00
Robin Ward
601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress 
Correct spelling of suppress
 2013-06-21 07:08:12 -07:00
Jeff Atwood
a9c251e71a restructure /admin/flags rows a bit 2013-06-21 00:29:54 -07:00
Amos L King
777e8c2012 Correct spelling of suppress 
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
 2013-06-20 23:44:27 -05:00
Michael Brown
836ebbaa8e Comment out example anti-hotlinking rules 2013-06-20 22:49:04 -04:00
Jeff Atwood
3775a9c11d shorter copy to fit on /admin better 2013-06-20 11:51:24 -07:00
Robin Ward
4cd71972be Cleaned up QUnit test structure 2013-06-20 13:58:54 -04:00
Robin Ward
2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts 
Admin alerts
 2013-06-20 07:51:40 -07:00
Sam
14db3869ba Merge pull request #1050 from abbat/master 
Russian translation (actual version)
 2013-06-20 01:17:53 -07:00
Sam
08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam
4a8a663a67 flagging workflow changes per http://meta.discourse.org/t/we-need-an-archive-flag-notification-button/7450 2013-06-20 17:42:15 +10:00
Anton Batenev
f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Jeff Atwood
f1fd29003d switch medium time format to "mins" vs "minutes" 2013-06-19 16:09:57 -07:00
Robin Ward
8c4aac7f94 Migrate all jasmine specs to Qunit. Removed Jasmine. 2013-06-19 18:18:35 -04:00
Régis Hanol
8a26b86739 added image magick alert 2013-06-19 22:36:56 +02:00
Régis Hanol
9036738ba2 added s3 file uploads alert 2013-06-19 22:11:11 +02:00
Robin Ward
5ef6714d48 New site setting: minimum_topics_similar, allows you to specify a minimum amount 
of topics that need to be in the database before it will suggest similar topics as
a user creates a post.
 2013-06-19 13:14:24 -04:00
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward
04998a6687 FIX: Referenced job incorrectly in clockwork 2013-06-18 10:05:15 -04:00
Jeff Atwood
34daa34bc1 Merge pull request #1042 from Supermathie/sysadmin-docs 
Sysadmin docs
 2013-06-18 00:49:12 -07:00
Sam
80c42753e1 fix up find as you type for the invite into PM function 
allow mods to remove users from a PM
 2013-06-18 17:17:01 +10:00
Michael Brown
b0d676f2f2 fixes in logrotate.conf 2013-06-18 03:04:01 -04:00
Michael Brown
70be638f47 Update sample bluepill config and install docs 2013-06-18 02:28:30 -04:00
Sam
2eb1cc220c posts should be post 2013-06-18 11:24:36 +10:00
Sam
7abb20928b Merge pull request #1033 from chrishunt/move-dynamic-favicon-to-user 
Move 'dynamic favicon' setting to User preference
 2013-06-17 17:31:02 -07:00
Robin Ward
4a9499c9f4 FIX: Trailing paren missing. Thanks Régis! 2013-06-17 17:15:11 -04:00
Robin Ward
8acdc18bc8 First stab at polling support for POP3S / reply by email 2013-06-17 16:49:02 -04:00
Sam
a15ab2a0a6 flag type summary 2013-06-17 17:15:56 +10:00
Sam
8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00
Sam
dd5cd1df4f Merge pull request #1037 from ZogStriP/imagineering 
Imagineering
 2013-06-16 22:01:10 -07:00
Sam
0052e78bfe render error when people attempt to save an invalid group name 
hide controls when we showing an automatic group
 2013-06-17 13:43:06 +10:00
Sam
b97d186cb5 automatic groups should not allow you to muck with the listed users in the group 2013-06-17 12:54:25 +10:00
Régis Hanol
d4c3fe4e6a added create_thumbnails? site setting 
defaults to `false`
 2013-06-17 02:49:34 +02:00
Robin Ward
5703e3923c FIX: Wrong key for translation file. 2013-06-16 16:08:36 -04:00
Robin Ward
08b64faa7f Merge pull request #1031 from kubabrecka/cs_update46 
cs translation update
 2013-06-16 12:46:20 -07:00
Robin Ward
ee9af728e3 Merge pull request #1035 from erlend-sh/master 
WIP: Added Norwegian Bokmål translation, 50%
 2013-06-16 12:45:42 -07:00
Erlend Sogge Heggen
286e6f49bf Update client.nb_NO.yml 
down to line 509. Gotta read up on /js_local_helper_spec.rb before continuing.
 2013-06-16 18:42:08 +03:00
Chris Hunt
09d3800701 Move 'dynamic favicon' from Server to User pref 2013-06-14 23:58:24 -07:00
Michael Brown
a908f00771 Documentation update: work in progress 2013-06-15 01:25:41 -04:00
Kuba Brecka
c002acc387 cs translation update 2013-06-14 21:21:33 +02:00
Neil Lalonde
f198c814a8 Add explanations for deactivate user and block user buttons in admin 2013-06-14 11:34:03 -04:00
Robin Ward
5193ddc72f Super basic test support for listing topics 2013-06-13 15:08:42 -04:00
Robin Ward
e29f4a3496 Work in Progress: Reply By Email: 
- Add support classes and settings to enable reply by email
- Split out Email builder to be more OO, add many specs
 2013-06-13 12:39:56 -04:00
Jeff Atwood
e338e97fa3 remove line from JIT new user topic/reply help 2013-06-13 09:37:16 -07:00
Robin Ward
66f5a3f6f6 FIX: Emoji sizes in emails should be done by the EmailStyler 2013-06-13 12:15:05 -04:00
Sam
f7de9f17d5 refactor validators 
add a new setting for min pm body length
use that setting for flags
scale entropy check down for pms
 2013-06-13 18:18:43 +10:00
Sam
e6e81efe85 correct information leak in page not found 2013-06-13 10:27:17 +10:00
Anton Batenev
f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Sam
eb91a0c9df Merge pull request #1012 from ZogStriP/extract-imgur-support-to-a-gem 
Extract imgur support to a gem
 2013-06-11 16:59:53 -07:00
Jeff Atwood
acb2126220 Omit Needless Words 2013-06-11 14:31:04 -07:00
Jeff Atwood
85fcfe5ede copyedits on digest email titles 2013-06-11 14:29:21 -07:00
Jeff Atwood
e78c04b88b extra space in email was causing sub-list :( 2013-06-11 13:52:54 -07:00
Régis Hanol
8a2d635e62 removed imgur support 2013-06-11 21:51:41 +02:00
Neil Lalonde
811a0df68b Make s3 region site setting a drop down 2013-06-11 14:24:04 -04:00
Robin Ward
8b4e3402c2 Small improvements to digest emails and preview mechanism. 2013-06-11 12:27:11 -04:00
Robin Ward
daeaf090c8 Merge pull request #1008 from Naiqus/patch-5 
Update server.zh_CN.yml
 2013-06-11 08:59:18 -07:00
Robin Ward
59ede7c51f Merge pull request #1007 from Naiqus/patch-4 
Update client.zh_CN.yml
 2013-06-11 08:58:59 -07:00
Sam
c2cfbce9ce automatically updating times for posts on topic 
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
 2013-06-11 17:25:50 +10:00
Sam
fa8a84f20c removed sugar.js, port functionality to moment and underscore.js 
bring in latest ace from local so we don't mess up with https
 2013-06-11 15:27:26 +10:00
Naiqus
34eb36c88e Update server.zh_CN.yml 2013-06-11 02:18:12 +03:00
Naiqus
46b6a0a533 Update client.zh_CN.yml 2013-06-11 02:17:04 +03:00
Neil Lalonde
9b1d0baf45 Send a message to moderators when a newuser_spam_host_threshold is exceeded. Send it no more than once per day per user. 2013-06-10 13:17:32 -04:00
Robin Ward
ad6705cca7 Update Ember to latest master (RC5) 2013-06-10 10:14:42 -04:00
Robin Ward
7907f5066e Merge pull request #999 from netzpirat/update-german-translations 
Update German translations
 2013-06-10 07:00:55 -07:00
Naiqus
82168d2067 A few zh_CN translation updates for version 0.9.2.5 
It is valid now.
 2013-06-10 16:37:13 +03:00
Michael Kessler
561418304d Update German client-side translations. 2013-06-10 10:58:42 +02:00
Michael Kessler
080938660c Update German server-side translations. 2013-06-10 10:24:26 +02:00
Jeff Atwood
64fb6dbf79 add Mandrill note to email deliverability test 2013-06-10 00:14:47 -07:00
Jeff Atwood
b4a4774165 extend consumer email warning to yahoo & outlook 2013-06-10 00:08:06 -07:00
Sam
2d14b54096 Merge pull request #988 from chrishunt/add-dynamic-favicon 
Add 'dynamic favicon' setting
 2013-06-09 16:13:54 -07:00
Sander Datema
27d0b120fd Updated Dutch translation 2013-06-08 18:12:20 +02:00
Chris Hunt
af1c14939e Add 'dynamic favicon' setting 2013-06-07 17:15:49 -07:00
Robin Ward
b2a6755a48 Merge pull request #984 from Supermathie/moreentropy 
More entropy for foreign titles
 2013-06-07 14:23:26 -07:00
Neil Lalonde
34e1f376f6 Add [PM] to subject of email notifications for private messages 2013-06-07 15:50:11 -04:00
Michael Brown
f3fb10de03 settings: Update english description of entropy 2013-06-07 15:07:43 -04:00
Sam
5fa20ce357 more progress towards full migration to moment.js 2013-06-07 18:27:42 +10:00
Chris Hunt
d50a598e62 Notify admin of successful user approval 2013-06-06 18:37:25 -07:00
Chris Hunt
f6ce985121 Send activation email after user approved 2013-06-06 18:37:25 -07:00
Sam
1eed1e240b Merge pull request #977 from chrishunt/add-apple-touch-icon 
Add 'apple touch icon url' site setting
 2013-06-06 17:40:12 -07:00
Neil Lalonde
564d242832 Notify moderators when someone is automatically blocked because of spam flags 2013-06-06 18:49:19 -04:00
Sam
11afa0c11b work in progress migrate to moment 2013-06-07 08:49:22 +10:00
Chris Hunt
268a5debbf Add 'apple touch icon url' site setting 2013-06-06 14:43:05 -07:00
Robin Ward
207ad9049a Merge pull request #973 from jd-erreape/spanish_server_translation 
Spanish server and client translation
 2013-06-06 08:13:08 -07:00
Juan de Dios Herrero
90c46ab62a Little review on client.es.yml and added a lot of translation that were missing and made the page looks ugly 2013-06-06 11:35:10 +02:00
Juan de Dios Herrero
a2ee43b511 Finished server.es translation, ready for review (still a few sentences left because no good translation has been found) 2013-06-06 10:53:29 +02:00
Ian Christian Myers
0d01c33482 Enabled strong_parameters across all models/controllers. 
All models are now using ActiveModel::ForbiddenAttributesProtection, which shifts the responsibility for parameter whitelisting for mass-assignments from the model to the controller. attr_accessible has been disabled and removed as this functionality replaces that.

The require_parameters method in the ApplicationController has been removed in favor of strong_parameters' #require method.

It is important to note that there is still some refactoring required to get all parameters to pass through #require and #permit so that we can guarantee that parameter values are scalar. Currently strong_parameters, in most cases, is only being utilized to require parameters and to whitelist the few places that do mass-assignments.
 2013-06-06 00:30:59 -07:00
Robin Ward
a3d62fdf69 Temporarily roll back ember rc5. We identified some things we need to fix. 2013-06-06 01:25:43 -04:00
Sam
2ca734c118 Merge pull request #964 from chrishunt/exclusive-club 
Add 'invite only' site setting
 2013-06-05 16:38:47 -07:00
Jeff Atwood
6f57564c54 add edit hint to "no topic definition" 2013-06-05 15:36:26 -07:00
Robin Ward
0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Robin Ward
93cdb97b46 OOPS: Left a testing setting of precompile in development on. Turned it back off. 2013-06-05 15:33:50 -04:00
Robin Ward
a3d52a41c6 Merge pull request #962 from sanderdatema/dutch_translation 
Updated Dutch translation
 2013-06-05 11:58:46 -07:00
Chris Hunt
24da1ab07e Add 'invite only' site setting 2013-06-05 11:06:05 -07:00
Robin Ward
7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Robin Ward
a0bd51862e Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error. 2013-06-05 12:07:18 -04:00
Neil Lalonde
f0d4a38433 Admin flags UI shows when it's loading and when there are no results 2013-06-05 10:24:50 -04:00
Sander Datema
a9dcbe498d Updated Dutch translation 2013-06-05 14:24:32 +02:00
Sam
2509d0f4fa Merge pull request #959 from chrishunt/chrishunt/login-required-fixes 
'login required' site setting improvements
 2013-06-04 19:09:40 -07:00
Sam
93be638d93 message format is awesome, remove 0 unread and 0 new links. 2013-06-05 12:04:54 +10:00
Chris Hunt
3074300f76 Allow customization of 'login required' message 2013-06-04 18:53:36 -07:00
Sam
1dd59ca0a7 es translation is bust, rename for now 2013-06-05 10:25:32 +10:00
Sam
21b3359ea4 Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base 
Add 'login required' site setting
 2013-06-04 17:22:08 -07:00
Sam
542c3cc546 allow onecase switch 2013-06-05 10:16:05 +10:00
Juan de Dios Herrero
fb4cb143e9 Started spanish translation 2013-06-05 09:46:00 +10:00
Sam
5f85aaee1d correct message bus regression 
implement automatically updating dates in list
 2013-06-05 09:32:44 +10:00
Chris Hunt
122f9188c9 Redirect Ember routes to login if login required 2013-06-04 16:10:10 -07:00
Chris Hunt
85ceb5efa7 Add 'login required' site setting 2013-06-04 16:10:10 -07:00
Jeff Atwood
93aa0a9f39 some copyedits on account blocking 2013-06-04 16:02:03 -07:00
Neil Lalonde
2465c9c724 Add min_private_message_title_length site setting so private messages can have short titles 2013-06-04 17:59:23 -04:00
Erlend Sogge Heggen
5879d3dffd Update client.nb_NO.yml 
First post, Mute, Unmute, Last post, are they meant to be translated?

finished down to composer
 2013-06-04 19:21:57 +03:00
Neil Lalonde
2259e97d42 Add a count of blocked users on the dashboard 2013-06-04 11:53:19 -04:00
Neil Lalonde
e3861893a2 Remove talk of spam in the private messages when an account has been blocked and unblocked 2013-06-04 11:28:40 -04:00
Neil Lalonde
c4904aacc0 Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin. 2013-06-03 16:37:40 -04:00
Erlend Sogge Heggen
fbeff410f5 Update client.nb_NO.yml 
Started work on "invited" translations.
 2013-06-03 20:39:33 +03:00
Erlend Sogge Heggen
21e45d9fa1 Create client.nb_NO.yml 
Norwegian translation first take.
 2013-06-03 19:36:23 +02:00
Sam
8b69ee26ff forking in passenger was bust, message bus subscriptions would stop working after fork 2013-06-03 16:50:30 +10:00
Robin Ward
545dbfc07e New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding 
thresholds.
 2013-05-31 17:39:32 -04:00
Neil Lalonde
cceac14baf I broke infinite scrolling in a topic 2013-05-31 11:55:51 -04:00
Robin Ward
f7c0fa0434 Merge pull request #932 from sanderdatema/dutch_translation 
Updated Dutch translation
 2013-05-31 08:30:13 -07:00
Sander Datema
00f16b15c5 Updated Dutch translation 2013-05-31 10:03:07 +02:00
Sam
41187a5de1 Merge pull request #931 from ZogStriP/more-file-upload-test-coverage 
added more file uploads test for better coverage
 2013-05-30 21:36:33 -07:00
Sam
9ecf61d77d Merge pull request #922 from ZogStriP/keep-french-l10n-up-to-date-2013-05-29 
[ci-skip] keep French localization up to date
 2013-05-30 21:35:19 -07:00
Régis Hanol
6cc0f8f2d4 added more file uploads test for better coverage 2013-05-31 03:13:37 +02:00
Neil Lalonde
5d444be72b Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number 2013-05-30 10:39:15 -04:00
Michael Kessler
571e62a27a Keep German translations in sync. 2013-05-30 13:13:53 +02:00
Sam
8874c9ea75 Add message format support that can be used on complex localization strings 
Add message about new and unread topics at the bottom of topics
move localization helper into lib
 2013-05-30 16:49:57 +10:00
Sam
73834370a5 work in progress, live unread and new counts 2013-05-30 16:49:57 +10:00
Jeff Atwood
52eeecd460 add strong warnings on force_hostname and port 2013-05-29 16:27:46 -07:00
Régis Hanol
2daf3ba8ca keep French localization up to date 
🇫🇷
 2013-05-30 00:18:29 +02:00
Robin Ward
8182a9d10c Merge pull request #918 from chrishunt/chrishunt/quiet-tests-please 
Clean up test output
 2013-05-29 12:17:04 -07:00
Neil Lalonde
6abd9ddd2d Add warning on admin dashboard if production env is configured to send email through gmail 2013-05-29 14:00:35 -04:00
Chris Hunt
dbf4d9b0dc Set Sidekiq log level to WARN 2013-05-29 09:36:15 -07:00
Robin Ward
4cf1d9c266 Display details about the search context in the placeholder 2013-05-29 12:19:31 -04:00
Michael Kessler
10f8a9a97d Improve German translations. 
This tries to improve the German translations in its context, making
them fit better in the layout, unifying different terms, fixing typos,
try to improve the readability and add some missing translations.
 2013-05-29 11:45:27 +02:00
Michael Kessler
d44fa5c1f7 Add email to German share link description help. 2013-05-29 09:59:46 +02:00
Michael Brown
73d6014d10 documentation: merge & adapt suggestions from baus 2013-05-29 00:07:26 -04:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support 
Cas support
 2013-05-28 16:13:29 -07:00
Jeff Atwood
5107f485aa add email to share link description help 2013-05-28 15:05:02 -07:00
Robin Ward
e7c739f337 Merge pull request #911 from netzpirat/update-german-translations 
Update german translations
 2013-05-28 13:27:57 -07:00
Michael Kessler
5f591ae0ab Remove last occurrence of liken, which isn't a German word at all. 2013-05-28 21:52:37 +02:00
Michael Kessler
fcc1716e07 More German translations for the admin dashboard. 2013-05-28 21:41:00 +02:00
Michael Kessler
5fd5cb5fe4 Fix typo in the German missing logo warning. 2013-05-28 20:42:59 +02:00
Chris Hunt
ec223e5312 Fix unix socket paths in nginx upstream module 
Unix socket paths only require a single forward slash according to the
HttpUpstreamModule documentation: http://wiki.nginx.org/HttpUpstreamModule
 2013-05-28 11:37:03 -07:00
Michael Kessler
a2f21f4d33 Add missing German server translation for autoclosed_disabled. 2013-05-28 20:17:56 +02:00
Michael Kessler
9812acc5d2 Rename move_selected to split_topic in German client translations. 2013-05-28 20:17:21 +02:00
Erik Ordway
9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Michael Kessler
95c4d4edbc Add missing API translations. 2013-05-28 13:15:05 +02:00
Michael Kessler
2ddb2f76c8 Update German translations. 2013-05-28 13:00:33 +02:00
Régis Hanol
402af452c2 keep French localization up to date 
🇫🇷
 2013-05-27 21:29:26 +02:00
Robin Ward
197909246c Weigh staff likes higher when calculating scores. New site setting: staff_like_weight 
can set the factor (default is 3)
 2013-05-27 12:46:08 -04:00
Sam
ea294f71c2 Merge pull request #845 from Supermathie/rebakedocs 
Add hint on how to rebake posts
 2013-05-26 17:48:07 -07:00
Michael Brown
17a09b5b70 Add hint on how to rebake posts 2013-05-25 00:16:43 -04:00
Michael Brown
6257c48613 Updated documentation 
* added RVM option for single-user install
* clarified Web Server options
* bluepill sample config: create socket directory if it doesn't exist
* add multisite.yml.production-sample
* rename production.sample.rb (OCD)
* make two database.yml samples (one for dev, one for prod)
* fixed travis build (database.yml.sample renamed)
* fix other references to database.yml.sample
* clean up 'rvm requirements' instructions as per @mpapis
 2013-05-25 00:07:45 -04:00
Neil Lalonde
ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Neil Lalonde
d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00
Neil Lalonde
e600b45155 Composer uses bouncing popup messages beside fields with invalid values when you click the submit button 2013-05-24 12:26:17 -04:00
Kuba Brecka
0b09a52b31 cs translation update 2013-05-24 10:04:27 +02:00
Erik Ordway
0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway
1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Robin Ward
a08d4e4512 Merge pull request #883 from tangramor/master 
update the zh_CN & zh_TW locales
 2013-05-23 07:28:59 -07:00
Robin Ward
0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic 
Refactor topic
 2013-05-23 07:26:22 -07:00
Matt Van Horn
c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Matt Van Horn
806255b3c4 refactor Topic validation 
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
 2013-05-22 22:31:52 -07:00
tangramor
9df4ad794e update the locale of zh_CN & zh_TW 2013-05-23 10:56:49 +08:00
Jeff Atwood
cdbe6f64c7 minor copy changes 2013-05-22 16:30:41 -07:00
Sam
cb2068e448 Merge pull request #872 from joebew42/client_it 
Updated Italian translation
 2013-05-21 23:03:50 -07:00
Sam
0a66c4db3c Merge pull request #878 from emberjs-cn/update-zh-locales 
Updated zh locales
 2013-05-21 23:02:45 -07:00
Sam
d2b3f3d124 some helper files for vim 2013-05-22 15:48:48 +10:00
Tower He
795de0c2d0 Updated zh locales 2013-05-22 13:45:32 +08:00
Joe Bew
088b5483f9 Updated Italian translation 2013-05-21 19:46:24 +02:00
Robin Ward
6f3629d65b Merge pull request #866 from ZogStriP/keep-french-l10n-up-to-date-2013-05-20 
keep French l10n up to date
 2013-05-21 06:30:53 -07:00
Robin Ward
c9dc23dfb0 Merge pull request #863 from joebew42/it 
Server side Italian translation updated
 2013-05-21 06:29:54 -07:00
John Joseph Bachir
7ece167159 redis configurable via ENV 
Change heroku docs and tweak redis.yml.sample var name
to accmodate setting redis provider url via configs.
 2013-05-20 20:41:33 -04:00
Jeff Atwood
0b4fc7ebed improve flag threshold reached message slightly 2013-05-20 17:16:35 -07:00
Régis Hanol
7594aef906 keep French l10n up to date 
🇫🇷
 2013-05-21 00:46:24 +02:00
Jeff Atwood
9f96a4fc58 get the select copy to fit on 1 line 2013-05-20 13:55:08 -07:00
Joe Bew
30fed99d0a Server side Italian translation updated 2013-05-20 19:15:29 +02:00
Sam
e91ed83586 the private message stream is different to normal streams, improving the ui a bit and collapsing conversations 2013-05-20 16:44:06 +10:00
Jeff Atwood
c5b2fd8067 simplify spam flag reason text 2013-05-18 00:47:58 -07:00
Jeff Atwood
7cf3f16d62 add YAML lint hint to the top of lang YAML files 2013-05-17 16:54:07 -07:00
Sam
6f2e74b31e Merge pull request #855 from sanderdatema/dutch_translation 
Dutch translation updated
 2013-05-17 15:58:20 -07:00
Neil Lalonde
f3282e33a3 Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default 2013-05-17 11:05:35 -04:00
Sander Datema
2f976365a5 Dutch translation updated 
Up til commit dd400bb
 2013-05-17 10:20:52 +02:00
Jeff Atwood
737e16f7e0 remove "Logs" from Email Logs title on admin 2013-05-16 17:20:12 -07:00
Sam
be391e18fd Merge pull request #853 from joebew42/joe 
Updated client side Italian translation
 2013-05-16 16:33:34 -07:00
Régis Hanol
64ba7c75f4 keep French l10n up to date 
🇫🇷
 2013-05-17 00:20:23 +02:00
Robin Ward
a80ec535a3 Support for "Select All / Deselect All" while selecting posts to merge / delete. 2013-05-16 16:50:38 -04:00
Robin Ward
7daca77443 Remove modal state to choose move type. Instead use two buttons on the multi select popup, one 
for split and one for merge.
 2013-05-16 14:22:41 -04:00
Giuseppe Leone
e7b7c89554 Updated client side Italian translation 2013-05-16 20:19:05 +02:00
Robin Ward
d554a59102 Support for a new site setting: newuser_spam_host_threshold. If a new user posts a link 
to the same host enough tiles, they will not be able to post the same link again.

Additionally, the site will flag all their previous posts with links as spam and they will
be instantly hidden via the auto hide workflow.
 2013-05-16 12:19:50 -04:00
Sam
19cc930cb1 Merge pull request #848 from ZogStriP/keep-french-l10n-up-to-date-2013-05-14 
keep French l10n up to date
 2013-05-15 22:16:24 -07:00
Sam
e9ebadb414 Nuke message_bus_observer move to service class and classes 
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
 2013-05-16 15:03:16 +10:00
Régis Hanol
fe18527989 keep French l10n up to date 
🇫🇷
 2013-05-15 02:01:31 +02:00
Robin Ward
f1b4ecfdc9 Change help text to indicate you can search by id or url 2013-05-14 16:12:48 -04:00
Jeff Atwood
077df288db drop 'site' from top title for settings/content 2013-05-14 13:09:05 -07:00
Jeff Atwood
c69eccab90 better multi-select help text 2013-05-14 13:04:38 -07:00
Neil Lalonde
674818a26a Add a link to sidekiq in the dashboard message warning about failed email jobs 2013-05-14 11:21:52 -04:00
Sam
a613347100 this warning is getting in the way of my presentation 2013-05-14 15:20:28 +10:00
Neil Lalonde
957d95c1cc Fix rerender of topic close message when you navigate away from a closing topic 2013-05-13 16:25:17 -04:00
Neil Lalonde
b7cdee4d5c Add title tag to the admin options button in the composer 2013-05-13 16:25:17 -04:00
Neil Lalonde
d3f19817aa Add 'automatically' to the auto-close notification 2013-05-13 13:32:37 -04:00
Neil Lalonde
9828c87525 Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days 2013-05-13 12:53:52 -04:00
Robin Ward
87469fa4b7 Fix broken YML 2013-05-13 10:29:52 -04:00
Sander Datema
0a20538f75 Updated Dutch translation 
Updated til commit e661871aea
 2013-05-13 12:57:06 +02:00
Zach Latta
23d208bb96 Changed failing_emails_warning to reflect the real location of production.rb. 2013-05-10 20:59:51 -06:00
Robin Ward
adb76ad49b Merge pull request #840 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-10 15:53:17 -07:00
Robin Ward
cf01c98d81 Experimental: Interface to Move Posts to an Existing Topic 2013-05-10 14:55:51 -04:00
Régis Hanol
af773ab4ea keep French l10n up to date 2013-05-10 15:48:47 +02:00
Kuba Brecka
b029417644 cs translation update 2013-05-10 09:02:51 +02:00
Sam
942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Régis Hanol
16c8836977 keep French l10n up to date 2013-05-10 00:22:02 +02:00
Sam
5280b3a01b more group progress, UI getting there, controller mostly done 
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
 2013-05-09 17:37:34 +10:00
Robin Ward
2ba08d23cb Merge pull request #831 from kubabrecka/cs_update43 
cs translation update
 2013-05-08 07:40:58 -07:00
Robin Ward
d458e00197 Merge pull request #832 from kubabrecka/kb_fix 
max_upload_size_kb is in "kB" not "kb"
 2013-05-08 07:39:51 -07:00
Robin Ward
4e16badeae Merge pull request #833 from kubabrecka/admin_api_l10n 
Localize admin API section
 2013-05-08 07:39:02 -07:00
Neil Lalonde
f35a44aeae Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account 2013-05-08 10:10:47 -04:00
Kuba Brecka
05bc63b102 Localize admin API section 2013-05-08 09:13:10 +02:00
Kuba Brecka
09221bb72e max_upload_size_kb is in "kB" not "kb" 2013-05-08 08:43:47 +02:00
Kuba Brecka
0f4b443317 cs translation update 2013-05-08 08:37:34 +02:00
Sam
6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam
b26057292e change md route to raw 2013-05-08 10:26:55 +10:00
Sam
68e6405aca redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version 2013-05-07 17:33:04 +10:00
Sander Datema
1b1cd0973d Dutch translation updated 
Updated til commit e70526d851
 2013-05-06 19:44:44 +02:00
Neil Lalonde
69be7d0ad1 Change the title Visits to Clicks in referral tables on admin dashboard 2013-05-06 11:56:35 -04:00
Sam
872866744f Merge pull request #812 from goodbrews/capistrano-samples 
Link to helpful article on Capistrano deployment
 2013-05-05 17:51:17 -07:00
Sam
bb7a2da224 update psuedo locale 2013-05-06 10:48:30 +10:00
Sam
63435d9bdd Merge pull request #819 from kubabrecka/cs_update42 
cs translation update
 2013-05-05 16:51:52 -07:00
David Celis
1ac0788cf8 Link to helpful article on Capistrano deployment 
@SamSaffron mentioned in #809 he wouldn't mind me linking to a helpful
article on Capistrano deployment in those sample files. My totally
unbiased opinion is that the one I've committed here is the best one.
😉

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-05 08:38:27 -07:00
Régis Hanol
82450ac67e keep French l10n up to date 2013-05-05 01:34:57 +02:00
Kuba Brecka
62ef89dfc9 cs translation update 2013-05-04 21:57:41 +02:00
Neil Lalonde
52942d2de6 Merge pull request #813 from slainer68/ga_domain_name 
Google Analytics Domain name site setting
 2013-05-03 14:57:01 -07:00
Neil Lalonde
c6370a3479 Add ability to edit the uncategorized category name, color, and text_color in a modal 2013-05-03 17:55:04 -04:00
slainer68
ac66f25043 Google Analytics Domain name site setting 2013-05-03 21:58:10 +02:00
Neil Lalonde
cc60343d31 Update discourse.pill.sample to match the nginx.sample.conf 2013-05-03 10:59:46 -04:00
Neil Lalonde
c790d653c9 Merge pull request #811 from emberjs-cn/update-zh-locales 
Updated the zh locales
 2013-05-03 07:43:47 -07:00
Tower He
fec26c1d29 Updated the zh locales 2013-05-03 20:21:50 +08:00
Sam
dcfa9db84b Merge pull request #805 from kubabrecka/cs_update41 
cs translation update
 2013-05-03 03:39:31 -07:00
Sam
92cf36b42d Merge pull request #808 from 9034725985/patch-1 
In client.en.yml, add a comma after a leading sorry
 2013-05-03 03:38:53 -07:00
Sam
0685d3f84a Merge pull request #807 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-03 03:38:03 -07:00
David Celis
5d014c633b Add sample Capistrano deployment files 
Add the following sample Capistrano configuration files to ease
deployment to a VPS using Capistrano:

 * `config/deploy.rb.sample`
 * `config/thin.yml.sample`
 * `Capfile.sample`

The sample Capfile will additionally load any recipes provided by
Discourse plugins.

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-02 19:53:37 -07:00
Kushal
2648039a99 In client.en.yml, add a comma after a leading sorry 
Add a comma after the leading sorry to keep things consistent.
 2013-05-02 20:10:00 -05:00
Sam
4d2c28e8b2 added setting to flush redis if you feel like doing so in dev 2013-05-03 09:56:10 +10:00
Régis Hanol
3a0e41ab90 keep French l10n up to date 
🇫🇷
 2013-05-03 00:04:04 +02:00
Kuba Brecka
9dceef3fa6 cs translation update 2013-05-02 12:27:43 +02:00
Sam
cb9a89940a display admin/mod status on user page 2013-05-02 17:40:44 +10:00
Sam
5ec52bd2e9 :s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff 2013-05-02 17:22:27 +10:00
Sam
65cd00cf25 moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5 
allow pms to be targetted at groups
 2013-05-02 15:15:53 +10:00
Sam
e59ab32210 Merge pull request #800 from goodbrews/imgur-api-v3 
Update to Imgur API v3
 2013-05-01 21:52:00 -07:00
David Celis
6be26f5316 Update to Imgur API v3 
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.

This PR updates Discourse to use the new version of Imgur's API.

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-01 21:39:10 -07:00
Sam
3bf3b130cc Merge pull request #798 from kubabrecka/cs_update40 
cs translation update
 2013-05-01 16:35:04 -07:00
Sam
7b0a02c273 Merge pull request #801 from goodbrews/clockworkd-fix 
Allow clockwork to be run using the daemons gem
 2013-05-01 16:27:51 -07:00
Sam
43c767fb0d Merge pull request #802 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-01 16:22:40 -07:00
Neil Lalonde
38ed86d0c5 Add reports for IncomingLinks on admin dashboard 2013-05-01 18:12:02 -04:00
Régis Hanol
2c1b75fc36 keep French l10n up to date 
🇫🇷
 2013-05-02 00:07:23 +02:00
David Celis
eb8cbaa91b Allow clockwork to be run using the daemons gem 
Clockwork ships with a helpful clockworkd executable, which uses the
daemons gem to daemonize clockwork. This provides an easy way to
start/stop/restart a deamonized clockwork process when deploying to
production servers manually. However, the daemons gem unfortunately does
funky things to the working directory that was preventing the
application from booting. Changing this `require` line to using
`require_relative` solves the issue and makes Discourse easier for Rails
devs to deploy to their own VPSes using, say, Capistrano.

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-01 14:10:51 -07:00
Neil Lalonde
5f4dbd6ddc Use tos_url site setting in flag modal if it's set 2013-05-01 11:49:18 -04:00
Kuba Brecka
ed68a1ec81 cs translation update 2013-05-01 15:41:31 +02:00
Jeff Atwood
67372a8a0d simplify pinning message a bit 2013-04-30 22:52:35 -07:00
Sam
08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Jeff Atwood
180c021940 normalize on "private message" vs "conversation" 2013-04-30 13:54:14 -07:00
Jeff Atwood
6d19db23bb too many pleases 2013-04-30 13:29:03 -07:00
Sam
cef9a74053 route for markdown /md/topic_id/post_number 2013-04-30 16:30:41 +10:00
Jeff Atwood
50349e84fe incorrect copy on Markdown linebreak setting 2013-04-29 15:12:12 -07:00
Neil Lalonde
442be64d5e Show an excerpt of a pinned topic's body in the topic list 2013-04-29 16:37:19 -04:00
Sam
56a6c96f38 same as previous commit, but with more force 2013-04-29 17:11:20 +10:00
Sam
f44fe3e689 dear smoke test, I love you, thanks ... the management 2013-04-29 16:52:56 +10:00
Sam
b5e01e5a87 Merge pull request #782 from sanderdatema/dutch_translation 
Updates to Dutch translation
 2013-04-28 19:05:41 -07:00
Régis Hanol
ede9d2a0a8 show diff in post history view 2013-04-29 03:20:51 +02:00
Sander Datema
76e447ff8d Updates to Dutch translation 
Updated til commit 9e3b70c20e
 2013-04-28 15:42:21 +02:00
Régis Hanol
dca2fbcefc add meaningful error message on upload [fixes #773] 2013-04-27 20:26:17 +02:00
Neil Lalonde
bbf982984d Add TOS and Privacy Policy site settings that can link to external sites. 2013-04-26 18:46:36 -04:00
Sam
f9e33ec6b8 store ip address and current user with incoming links 
make links long an readable in share dialog
 2013-04-26 16:18:55 +10:00
Sam
f0d3500ada Merge pull request #735 from kubabrecka/i18n_user_actions4 
move i18n of UserActions to JS-side and make sentences translatable (take 3)
 2013-04-25 15:53:17 -07:00
Sam
f8c6a47892 Merge pull request #770 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-04-25 15:52:41 -07:00
Jeff Atwood
4dbe25bfc2 very minor new user education copy tweaks 2013-04-25 15:42:03 -07:00
Neil Lalonde
159c9b10d5 Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse' 2013-04-25 17:53:31 -04:00
Régis Hanol
14a99eca12 keep French l10n up to date 2013-04-25 22:29:51 +02:00
Neil Lalonde
a62fbb1b95 Merge pull request #761 from kubabrecka/cs_update39 
cs translation update
 2013-04-24 12:03:55 -07:00
Neil Lalonde
db2de1eff0 Add contact_email to site settings 2013-04-24 11:15:47 -04:00
Kuba Brecka
9651bec37c cs translation update 2013-04-24 12:59:05 +02:00
Sam
155348ca4c Merge pull request #760 from ZogStriP/keep-french-l10n-up-to-date-2013-04-23 
keep French l10n up to date
 2013-04-24 03:19:19 -07:00
Sam
37867af1bb track incoming links, amend share link to include user 
fix pm styling
 2013-04-24 18:05:35 +10:00
Sam
a0665105ec spring config 2013-04-24 12:02:36 +10:00
Régis Hanol
4d6f6a8322 keep French l10n up to date 2013-04-24 02:09:36 +02:00
Neil Lalonde
72508d459b Use heat map on views column in topic lists 2013-04-23 15:06:13 -04:00
Neil Lalonde
06e5083950 Dashboard links to list of admins and moderators; Move a bunch of ember routes into one file: admin_users_list_routes.js 2013-04-23 12:07:58 -04:00
Neil Lalonde
fe1b979c65 Admin Dashboard: click numbers in Users per Trust Level table to see a list of the users 2013-04-23 10:41:40 -04:00
Sam
726c28d776 Merge pull request #754 from slainer68/rack-cors 
Implements support for rack-cors for API JavaScript access in the end-user browser
 2013-04-22 20:11:09 -07:00
Jeff Atwood
1c41d46fa3 improve new user welcome message a bit 2013-04-22 16:42:39 -07:00
Neil Lalonde
7257d65082 Add warning to dashboard if using default logo or favicon 2013-04-22 15:38:48 -04:00
Neil Lalonde
439877bdb9 Show a warning if there are email jobs in the retry queue 2013-04-22 13:37:16 -04:00
Neil Lalonde
ae487e740c Add a dashboard warning when sidekiq queue has more than 100 jobs 2013-04-22 13:02:24 -04:00
slainer68
467c76b2c0 Implements support for rack-cors for API JavaScript access in end-user browser 2013-04-22 11:16:58 +02:00
Sam
cfc62dadff speed up tests 
add the ability to find the first notify private message
 2013-04-22 17:45:03 +10:00
Sander Datema
c04013c89b Updates to Dutch translation 2013-04-21 10:59:38 +02:00
Jeff Atwood
e661871aea Merge pull request #744 from ypxu/localized-help 
update locales on client for zh_CN and zh_TW
 2013-04-20 22:18:53 -07:00
Jeff Atwood
14432e5a1a Merge pull request #745 from kubabrecka/cs_update38 
cs translation update
 2013-04-20 22:18:18 -07:00
Régis Hanol
3743287f12 keep French l10n up to date 2013-04-20 23:14:02 +02:00
Kuba Brecka
ff18d287ab cs translation update 2013-04-20 18:28:17 +02:00
Yingpeng Xu
b2b9320706 update locales on client for zh_CN and zh_TW 2013-04-20 08:39:55 -07:00
Jeff Atwood
1d341b8ca5 drop "Admin" from "Admin Dashboard" 2013-04-19 22:37:02 -07:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Jeff Atwood
d44b73c17a I said constructive criticism, YOU DOUBLE HITLERS 2013-04-19 12:24:22 -07:00
Jeff Atwood
0739e13cb0 copyedits on new user JIT education panel 2013-04-19 12:21:51 -07:00
Jeff Atwood
d3bde70677 better flag post action description 2013-04-19 11:15:56 -07:00
Sam
6ae212235c move persona a bit, still should be yanked out further 2013-04-19 10:34:39 +10:00
Sam
4cea92c4e9 work in progress add support for groups 2013-04-19 10:34:39 +10:00
Sam
a6170db443 change text to notify when you are notifying in the flag dialog 2013-04-19 10:34:06 +10:00
Kuba Brecka
002951fc31 cs translation update 2013-04-18 23:06:03 +02:00
Neil Lalonde
5cd6c85e8b Add bookmarks and favorites to dashboard stats 2013-04-18 14:27:22 -04:00
Neil Lalonde
5e643b5d49 Merge pull request #733 from sanderdatema/dutch_translation 
Updated Dutch translation
 2013-04-18 09:30:04 -07:00
Neil Lalonde
c07942763a Merge pull request #734 from kubabrecka/extract_title1 
extracting one more hardcoded title
 2013-04-18 09:29:30 -07:00
Neil Lalonde
4cec82f416 Merge pull request #731 from kubabrecka/extract_titles 
extracting some hardcoded title="..." strings
 2013-04-18 09:29:03 -07:00
Neil Lalonde
16efcbb4f0 Merge pull request #730 from kubabrecka/cs_update35 
cs translation update server side
 2013-04-18 09:25:10 -07:00
Neil Lalonde
fa6a2a110f Merge pull request #729 from kubabrecka/cs_update34 
cs translation update client side
 2013-04-18 09:24:55 -07:00
Neil Lalonde
12fe659b96 Merge pull request #728 from ypxu/localize-help 
localize composer toggler help text for zh_CN and zh_TW
 2013-04-18 09:24:29 -07:00
Kuba Brecka
d355e42d73 move i18n of UserActions to JS-side and make sentences translatable (take 3) 2013-04-18 12:08:13 +02:00
Kuba Brecka
38ea6cff62 extracting one more hardcoded title 2013-04-18 11:24:47 +02:00
Sander Datema
935c478484 Updated Dutch translation 
Both server and client side, except for TOS.
 2013-04-18 10:58:20 +02:00
Kuba Brecka
2901b5bbef extracting some hardcoded title="..." strings 2013-04-18 10:42:29 +02:00
Kuba Brecka
b8bbf7d3fa cs translation update 2013-04-18 10:13:00 +02:00
Kuba Brecka
bc4144c82b cs translation update 2013-04-18 10:03:10 +02:00
Yingpeng Xu
c48aa487e3 localize composer toggler help text for zh_CN and zh_TW 2013-04-18 02:44:59 -04:00
Sam
8367951000 sprockets upgrade 
stop bundling all js files in dev, replace with turbo boosted serving of assets
 2013-04-18 16:33:25 +10:00
Jeff Atwood
474080a414 localize composer toggler help text 2013-04-17 23:14:58 -07:00
Jeff Atwood
107e774de8 simplify composer body placeholder text 2013-04-17 23:10:34 -07:00
Jeff Atwood
b64a4100fa change "visitor" trust level to "new user" 
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
 2013-04-17 16:11:24 -07:00
Jeff Atwood
3325c476f8 improve flag description to reflect notifications 2013-04-17 15:50:21 -07:00
Sam
b81da5ee66 Merge pull request #722 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-04-17 01:10:28 -07:00
Régis Hanol
7c1eb16aec keep French l10n up to date 2013-04-17 02:29:37 +02:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
Neil Lalonde
9a7019e44f Add some icons to admin dashboard 2013-04-16 18:38:14 -04:00
Jeff Atwood
72be25c30a improve invite users action button 2013-04-16 14:53:06 -07:00
Jeff Atwood
77461cf1f7 improve category edit button copy 2013-04-16 14:25:36 -07:00
Neil Lalonde
3b6aeb14c7 Add subtype to topics to classify private messages 2013-04-16 16:56:18 -04:00
Neil Lalonde
2b5a2b5fce Add a refresh button to problems on dashboard, so you can check for problems again 2013-04-16 12:09:37 -04:00
Jeff Atwood
8e9b34d6cd remove "sent you a PM' text from the notify area 2013-04-15 17:38:39 -07:00
Jeff Atwood
bb586ec1a9 indicate use_ssl not implemented, experimental 2013-04-15 13:56:16 -07:00
Jeff Atwood
fb010727d1 user != person 2013-04-15 01:20:30 -07:00
Jeff Atwood
420bd37268 copyedits on notify flag options 2013-04-15 01:09:38 -07:00
Sam
e98ee42473 new ignore in jshint 2013-04-15 15:21:00 +10:00
Sander Datema
481a224ff9 Small edits to Dutch translation (client side) to make it sound more natural 2013-04-14 22:23:30 +02:00
Sander Datema
7965dadf7a Updated Dutch translation (client side) to latest Discourse version 2013-04-14 21:28:41 +02:00
Sander Datema
35971506fd Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:48:16 +02:00
Sander Datema
2af902f4d1 Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation 2013-04-14 20:46:00 +02:00
Sander Datema
f47f880f8b Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:44:59 +02:00
Jeff Atwood
a1d7f24240 improve "override default" text in customize 2013-04-14 11:22:25 -07:00
Jeff Atwood
c4a0cf6517 Merge pull request #707 from tangramor/master 
Update the zh_CN and zh_TW translations to the latest en.yml
 2013-04-13 09:35:02 -07:00
tangramor
344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Régis Hanol
efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Sam
13adbf6f72 Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11 
keep French l10n up to date
 2013-04-12 16:06:18 -07:00
Neil Lalonde
48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde
651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam
8014d7fd25 correct rack::cache so it always punches through users with auth cookies 2013-04-12 21:59:52 +10:00
Sam
e969eb14e8 added 2 new flag types: notify user and notify moderators 
fixed up messed up user navigation
refactored
 2013-04-12 17:55:45 +10:00
Régis Hanol
ed790384b0 keep French l10n up to date 2013-04-12 00:07:14 +02:00
Neil Lalonde
04ca4077a7 Merge pull request #697 from kubabrecka/quote_post_fix 
fix title of "quote post" button
 2013-04-11 10:59:42 -07:00
Neil Lalonde
7b76447e5e Change edit category modal submit button text to Save Category 2013-04-11 10:50:25 -04:00
Sam
92e15ff4ef comment re cdn 2013-04-11 20:49:47 +10:00
Sam
850b042cab introduce rack:cache as a default, so users don't need to configure apache or nginx 
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)

reorganised so mini profilers can be cleanly disabled from config file

added caching for categories index

move production.rb to production.sample.rb
 2013-04-11 16:24:21 +10:00
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles 
auto replace rules in titles
 2013-04-10 21:12:20 -07:00
Kuba Brecka
11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde
312c42ae98 Merge pull request #690 from kubabrecka/update_cs32 
cs translation update
 2013-04-10 11:02:26 -07:00
Neil Lalonde
fec86c624b Merge pull request #693 from ZogStriP/keep-french-l10n-up-to-date-2013-04-10 
keep French l10n up to date
 2013-04-10 09:47:02 -07:00
Neil Lalonde
5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol
a7bdbd863e keep French l10n up to date 2013-04-10 15:48:59 +02:00
Kuba Brecka
1ca1b03109 cs translation update 2013-04-10 15:02:32 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
e605e52181 localization 2013-04-10 15:55:33 +10:00
Jeff Atwood
249fa42fd2 better description for title_fancy_entities 2013-04-09 21:15:48 -07:00
Robin Ward
1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2" 
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
 2013-04-09 12:33:32 -04:00
Robin Ward
c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2 
move i18n of UserActions to JS-side and make sentences translatable
 2013-04-09 09:25:28 -07:00
Robin Ward
9f9072bd9d Merge pull request #673 from windyson2008/patch-2 
Update server.zh_CN.yml
 2013-04-09 09:22:59 -07:00
Robin Ward
bc75663e7b Merge pull request #680 from kubabrecka/cs_update31 
cs translation update
 2013-04-09 06:29:19 -07:00
Régis Hanol
a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00
Kuba Brecka
9e796e8acf cs translation update 2013-04-09 11:10:28 +02:00
Neil Lalonde
93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Sam
1b73ab614e Merge pull request #674 from kubabrecka/cs_update30 
cs translation update
 2013-04-08 15:17:01 -07:00
Sam
2f14ef4a68 Merge pull request #675 from kubabrecka/en_tos_typofix 
English TOS typos
 2013-04-08 15:16:02 -07:00
Kuba Brecka
8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward
75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka
b42570b61d English TOS typos 2013-04-08 22:31:44 +02:00
Kuba Brecka
9ee01948c3 cs translation update 2013-04-08 22:28:10 +02:00
Jonas Stendahl
21d3c96fca Updated swedish translations. 2013-04-08 11:03:55 +02:00
windyson2008
12a20f6547 Update server.zh_CN.yml 
1.Add tag
2.Fix transtration
 2013-04-08 11:22:51 +09:00
Régis Hanol
41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Robin Ward
ade4dd32de Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05 
keep French l10n up to date
 2013-04-06 07:30:15 -07:00
Jeff Atwood
0d26c819a0 better post quote description 
blockquote? seriously?
 2013-04-06 03:13:24 -07:00
Jeff Atwood
b75454219f improve the category definition default copy 2013-04-06 00:52:21 -07:00
Régis Hanol
1793f3e3bb keep French l10n up to date 2013-04-05 23:17:57 +02:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Robin Ward
c41bdc8752 Merge pull request #662 from kubabrecka/en_typos 
fix some typos in English strings
 2013-04-05 08:20:52 -07:00
Kuba Brecka
6dff266930 cs translation update 2013-04-05 11:31:43 +02:00
Kuba Brecka
920e1dfd24 fix some typos in English strings 2013-04-05 11:31:06 +02:00
Kuba Brecka
5f4b66d1bd replace CRLF with LF 2013-04-05 11:05:03 +02:00
Jeff Atwood
efa99eb242 copyedits on Site Content editor help 2013-04-04 22:47:32 -07:00
Jeff Atwood
e7499adacc clarify language on enable_private_messages 2013-04-04 22:24:58 -07:00
Jeff Atwood
e3b6fc3ec0 trust ranges are 0-4, not 0-5 (moderators diff) 2013-04-04 22:19:13 -07:00
Sam
fe434710e1 Merge pull request #647 from windyson2008/patch-1 
Update client.zh_CN.yml
 2013-04-04 21:40:41 -07:00
Sam
162af29aae Merge pull request #653 from kubabrecka/cs_typos 
fix some typos in cs translation
 2013-04-04 21:36:31 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde
66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Kuba Brecka
53bcf99f57 fix some typos in cs translation 2013-04-04 16:57:54 +02:00
Jeff Atwood
cb9370b00c clarify that read tab is in order that you read 2013-04-04 02:06:31 -07:00
windyson2008
d8b6ecef74 Update client.zh_CN.yml 
1,Add tag
2,Fix translation
 2013-04-04 13:20:45 +09:00
Sam
86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00
Kuba Brecka
317b884943 cs translation update 2013-04-03 23:22:35 +02:00
Robin Ward
33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde
bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward
ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward
2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes 
make post actions (likes, flags) translatable as whole sentences
 2013-04-03 08:09:13 -07:00
Robin Ward
f7a4b82a53 Minor change to text 2013-04-03 11:04:31 -04:00
Robin Ward
0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images 
prevent users from uploading files other than images
 2013-04-03 07:39:55 -07:00
Robin Ward
c2f1b70a6f Merge pull request #631 from kubabrecka/cs_update27 
cs translation update
 2013-04-03 06:51:42 -07:00
Régis Hanol
a02b8730de keep French l10n up to date 2013-04-03 10:41:30 +02:00
Kuba Brecka
51b25e104f cs translation update 2013-04-03 09:21:23 +02:00
Robin Ward
ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Kuba Brecka
f957b0aee5 make post actions (likes, flags) translatable as whole sentences 2013-04-02 21:15:55 +02:00
Robin Ward
e8d66beea5 Fix @notification text for non visitors 2013-04-02 11:58:12 -04:00
Robin Ward
753e3675b1 Merge pull request #625 from kubabrecka/cs_update23 
cs translation client.cs.yml update
 2013-04-02 06:51:04 -07:00
Robin Ward
be0ce029e6 Merge pull request #626 from kubabrecka/cs_update25 
cs translation server.cs.yml pluralization
 2013-04-02 06:50:36 -07:00
Kuba Brecka
8245c0d9ce cs translation server.cs.yml pluralization 2013-04-02 15:07:11 +02:00
Kuba Brecka
6715e7c55a cs translation client.cs.yml update 2013-04-02 15:01:38 +02:00
Kuba Brecka
b1249df598 update i18n:stats task to count pluralization based on locale setting 2013-04-02 14:56:26 +02:00
Régis Hanol
3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Sam
9c9087b99c less bloated browser update 
no need for respond.js (ie8 compat stuff)
preload store should not be naming stuff get, its reserved
bad js generates for preload store
use browse happy, cause its better
 2013-04-02 17:44:48 +11:00
Jeff Atwood
ae82b5d0ea Revert "forgot to sync untranslated languages" 
This reverts commit 805e782845.
 2013-04-01 21:42:57 -07:00
Jeff Atwood
805e782845 forgot to sync untranslated languages 2013-04-01 21:15:17 -07:00
Jeff Atwood
91f9dc7267 clarify tracking: seeing counts ain't a notify 2013-04-01 21:13:38 -07:00
Sam
ade1f50f19 update pseudolocale, we really should do this in a post commit step 2013-04-02 11:23:20 +11:00
Sam
343dfaf503 Merge pull request #617 from kubabrecka/cs_pluralization_client 
cs translation update - client.cs.yml correct pluralization
 2013-04-01 17:20:36 -07:00
Sam
ae32e3071c Merge pull request #618 from ZogStriP/keep-french-l10n-up-to-date-2013-04-01 
keep French l10n up to date
 2013-04-01 17:20:17 -07:00
Régis Hanol
7918bef7ff keep French l10n up to date 2013-04-02 01:09:08 +02:00
Sam
f6ec8e01ec debug assets for debugging assets ... set to 1 in my .rvmrc 2013-04-02 09:50:00 +11:00
Kuba Brecka
01ed72d091 cs translation update - client.cs.yml correct pluralization 2013-04-01 23:21:17 +02:00
Neil Lalonde
acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Jeff Atwood
6aaaa55ced oops, left out a word 2013-04-01 12:57:22 -07:00
Jeff Atwood
e1e2768412 improve Email Deliverability Test email 2013-04-01 12:55:32 -07:00
Robin Ward
4e6b62b1f5 Much faster development mode reloading. 2013-04-01 14:32:24 -04:00
Robin Ward
f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization 
split i18n strings where there are 2 pluralizable variables
 2013-04-01 07:49:05 -07:00
Robin Ward
0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization 
implement pluralization for server-side and js
 2013-04-01 07:48:10 -07:00
Robin Ward
75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload 
improved images upload on the client side
 2013-04-01 07:11:26 -07:00
Régis Hanol
72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka
af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Kuba Brecka
1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Robin Ward
5bf3a0eaf3 Merge pull request #591 from potthast/german-l10n 
Updated German l10n.
 2013-03-30 12:11:25 -07:00
Robin Ward
9288be750f Merge pull request #594 from kubabrecka/cs_update22 
update cs translation
 2013-03-30 12:10:43 -07:00
Régis Hanol
f5567c10e3 keep French l10n up to date 2013-03-30 16:25:08 +01:00
Kuba Brecka
1349b24c4a update cs translation 2013-03-30 13:43:06 +01:00
Neil Lalonde
25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Martin Potthast
328b31d10e Updated German l10n. 2013-03-29 19:07:34 +01:00
Neil Lalonde
436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward
83ab544e0c Merge pull request #580 from kubabrecka/typo_fix0 
typo fix in client.en.yml
 2013-03-29 10:05:28 -07:00
Robin Ward
9f16309904 Merge pull request #581 from kubabrecka/cs_update21 
update cs translation
 2013-03-29 10:04:07 -07:00
Régis Hanol
6b4022dbfc keep French l10n up to date 2013-03-29 01:00:16 +01:00
Robin Ward
473a64d39d Add score, percent_rank to topics. Adds HotTopic model and consolidated job to calculate 
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
 2013-03-28 15:39:54 -04:00
Jeff Atwood
9b103e6d97 correct error in new tab tooltip text 2013-03-28 11:49:01 -07:00
Kuba Brecka
ae1561930b update cs translation 2013-03-28 19:26:58 +01:00
Kuba Brecka
435a46b729 typo fix in client.en.yml 2013-03-28 19:22:27 +01:00
Robin Ward
08267f5171 Merge pull request #481 from ZogStriP/selecting-default-landing-tab 
FIX: allows the selection of the default landing tab
 2013-03-28 08:27:05 -07:00
Robin Ward
2e4d73efc7 Merge pull request #578 from tonytonyjan/patch 
Patch
 2013-03-28 08:23:48 -07:00
Neil Lalonde
b0fd89b4a7 Fix spelling of Github to GitHub 2013-03-28 11:07:55 -04:00
Régis Hanol
1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Tony Jian
833d8a2557 correct zh_TW 2013-03-28 15:00:46 +08:00
Tony Jian
d783769a67 correct zh_TW 2013-03-28 14:58:02 +08:00
Tony Jian
f0728b16f6 add whitespace 2013-03-28 14:54:43 +08:00
Tony Jian
8cfa5d8e15 correct zh_TW 2013-03-28 14:37:09 +08:00
Sam
36e950ee07 Merge pull request #576 from tonytonyjan/patch 
correct zh_TW locale
 2013-03-27 23:06:39 -07:00
Tony Jian
e93c8e0dce correct zh_TW locale 2013-03-28 13:42:30 +08:00
Régis Hanol
518203281d keep French l10n up to date 2013-03-28 03:19:23 +01:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde
35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Neil Lalonde
4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Robin Ward
4cb4843323 Includes post count in filter message by user 2013-03-27 10:53:43 -04:00
Robin Ward
15bd63cb64 Merge pull request #571 from ZogStriP/keep-french-l10n-up-to-date-2013-03-26 
keep French l10n up to date
 2013-03-27 06:58:57 -07:00
Kuba Brecka
125c2e7095 cs translation update 2013-03-27 09:25:37 +01:00
Régis Hanol
1db78185e0 keep French l10n up to date 2013-03-27 02:00:21 +01:00
Robin Ward
af7f6fea28 Can set the hotness of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -04:00
Neil Lalonde
5961ffc0e4 Add site setting to choose which share links to show and in what order 2013-03-26 17:17:37 -04:00
Neil Lalonde
7bfd66aa80 Add title attrs to share links 2013-03-26 17:17:37 -04:00
Robin Ward
6366c9f86d Specifically mention the visitor user level in the error messages for posts. 2013-03-26 15:44:31 -04:00
Robin Ward
a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Sam
bd4fcfa412 Merge pull request #567 from ZogStriP/keep-french-l10n-up-to-date-2013-03-25 
keeping French l10n up to date
 2013-03-26 04:53:40 -07:00
Sam
a2ada48089 it appears routes can be reloaded in dev under certain conditions 2013-03-25 18:08:23 -07:00
Sam
c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam
36d60befbd mini profiler fix for multisite 2013-03-25 18:04:46 -07:00
Régis Hanol
386967c56e keeping French l10n up to date 2013-03-25 23:15:10 +01:00
Sam
3f206e6c8c Merge pull request #493 from mikl/danish-translation 
Danish translation.
 2013-03-25 14:06:13 -07:00
Sam
6aaf868d9f Merge pull request #564 from kubabrecka/cs_update19 
cs translation update
 2013-03-25 14:05:26 -07:00
Robin Ward
19376bb17c Merge pull request #565 from alpacaaa/it_locale 
Italian Translation!
 2013-03-25 10:57:06 -07:00
Marco Sampellegrini
ce98ce4b93 Italian Translation! 2013-03-25 18:35:38 +01:00
Neil Lalonde
ba315c6610 If assets haven't been precompiled, fail to start server in production mode with a message 2013-03-25 13:33:58 -04:00
Robin Ward
6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04:00
Robin Ward
7c505df6d4 Merge branch 'update-sidekiq' of git://github.com/nverba/discourse 
Conflicts:
	config/initializers/sidekiq.rb
 2013-03-25 10:26:13 -04:00
Kuba Brecka
4c5a276a46 cs translation update 2013-03-25 15:07:38 +01:00
tangramor
a168ee25c7 Update zh_CN and zh_TW to current en.yml 2013-03-25 20:43:56 +08:00
Mikkel Hoegh
869df58461 Translated Discourse to Danish. 
Squashed commit of the following:

commit db81f4a15e5df5ceb64499aba077acd2f8aed192
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 23:10:25 2013 +0100

    All the user-facing server strings.

commit c7fdf0d4351664cd2a731556b99ecf7f05a09cde
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 22:43:53 2013 +0100

    Like -> Synes godt om.

commit 0f6ba13d65e31246a0a0a9a31707928a14d7220c
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 21:27:51 2013 +0100

    Lots of server strings.

commit d66af8246fb6bc9ccff51f97931f1375b07f2d85
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 19:48:53 2013 +0100

    Translated user facing strings (almost).

commit a84fcf6ff70d7c304c86263d7917207e505e77b1
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Thu Mar 21 22:15:20 2013 +0100

    Even more client strings.

commit ccfc0f7189fb979973b642bee9ec1440f7d39970
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:43:08 2013 +0100

    More client strings.

commit c3e21cab82d95ad5abe92e95ad99acf401cbe9ec
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:12:44 2013 +0100

    Translated a bunch of client strings.

commit 65aad7129b3d9c7df62213522b37e3a413df35de
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:09:28 2013 +0100

    Started work on Danish translation.
 2013-03-25 10:35:03 +01:00
Sam
622568fd57 fix mp in prd 2013-03-24 20:36:55 -07:00
Sam
f921d1c547 comment out dead code 
add some explanations
 2013-03-24 20:09:28 -07:00
Sam
67c438434b wow, this has been broken for OH so long, we need to segragate users correctly so MP results work as expected 2013-03-24 19:52:03 -07:00
Sam
988a712c77 correct multisite functionality for omniauth 2013-03-24 17:21:18 -07:00
Sam
deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax 
Convert a lot of :a => b to a: b and bring peace to the world
 2013-03-24 16:43:17 -07:00
Karan Misra
5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam
36a069488e Merge pull request #492 from sbauch/email-whitelist 
added email whitelist SiteSetting feature to replicate email blacklist S...
 2013-03-24 16:35:24 -07:00
Robin Ward
81c099a37c Merge pull request #551 from kubabrecka/cs_update 
cs translation update
 2013-03-23 13:57:43 -07:00
Kuba Brecka
274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Kuba Brecka
e38565ed1d cs translation update 2013-03-23 17:52:45 +01:00
nverba
0c7579ec9f Update Sidekiq and config 2013-03-23 14:49:50 +00:00
Robin Ward
cb9106c3a7 Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-2013-03-22 
keep French l10n up to date [ci skip]
 2013-03-23 07:38:03 -07:00
Robin Ward
3d210f143b Merge pull request #538 from kubabrecka/i18n_spec 
adding i18n integrity check for valid YAML and valid content
 2013-03-23 07:37:35 -07:00
Sam
bceb124da6 correct line endings 2013-03-23 03:19:26 -07:00
Sam
40b2f0f7d9 update better errors 
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
 2013-03-23 03:16:49 -07:00
Jeff Atwood
38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Kuba Brecka
624649ddc2 adding i18n integrity check for valid YAML and valid content 2013-03-23 08:57:31 +01:00
Sam
4907d162ef Merge pull request #534 from kubabrecka/cs_update 
update cs translation
 2013-03-22 19:28:50 -07:00
Régis Hanol
d2e47cad5f keep French l10n up to date 2013-03-22 23:57:23 +01:00
Neil Lalonde
158cda7628 Add moderator and admin count to dashboard 2013-03-22 17:50:34 -04:00
Kuba Brecka
260a113bea update cs translation 2013-03-22 22:07:21 +01:00
Robin Ward
86eaf10c3e Fix i18n integrity issue 2013-03-22 16:01:05 -04:00
Robin Ward
f1fbb9b09e Merge pull request #527 from dacap/spanish 
Spanish translation
 2013-03-22 12:50:17 -07:00
Neil Lalonde
aa6e87c5c1 Dashboard memory warning 2013-03-22 15:47:35 -04:00
Robin Ward
9c38c13ac5 The "Best Of" mode uses a percentage ranking of posts. 2013-03-22 15:44:39 -04:00
Sam Bauch
77e3434d81 added email whitelist SiteSetting feature to replicate email blacklist. email_validator method now also uses the regex method for both the whitelist and blacklist. 2013-03-22 14:49:42 -04:00
David Capello
2481fed8a4 Add Spanish translation (WIP) 2013-03-22 13:28:21 -03:00
Robin Ward
62f60a4f5d Merge pull request #530 from kubabrecka/fix_nl_translation 
attemping to fix NL translation (client.nl.yml) which seems to be somehow broken
 2013-03-22 09:19:18 -07:00
Robin Ward
de25c82a0c Merge pull request #525 from habfast/master 
Improving french L10E
 2013-03-22 09:18:09 -07:00
Robin Ward
291bd0b9e2 Merge pull request #526 from kubabrecka/cs_update 
cs translation update
 2013-03-22 09:17:28 -07:00
Kuba Brecka
30e275fb87 attemping to fix NL translation (client.nl.yml) which seems to be somehow broken 2013-03-22 16:45:34 +01:00
Neil Lalonde
6f8d13d47e Dashboard warning when sidekiq is not running 2013-03-22 11:35:51 -04:00
Kuba Brecka
377f380193 cs translation update 2013-03-22 15:54:50 +01:00
habfast
bc1aa12b02 Improving french translation 
Quoting everything
minor correction for respecting french grammar rules
 2013-03-22 15:15:32 +01:00
Régis Hanol
ce33432ac4 keeping the French l10n up to date 2013-03-21 22:12:48 +01:00
Neil Lalonde
8cc7f3c20b Dashboard warning when clockwork doesn't seem to be running 2013-03-21 16:51:50 -04:00
Neil Lalonde
40962c84ca Add 'all' column to admin dashboard counts 2013-03-21 16:51:50 -04:00
Robin Ward
ce3fa4d507 Replace "ok" with a close glyph 2013-03-21 16:11:05 -04:00
Robin Ward
5c4b794a8c Fixed a bunch of 'best of' errors and cleaned up JS. 2013-03-21 16:04:06 -04:00
Sam
e3d30f1366 turns out that instansiating a storage provider and assigning it nowhere, just don't work 2013-03-20 23:54:28 -07:00
Régis Hanol
6dc630383e keep French l10n up to date 2013-03-20 23:52:51 +01:00
Neil Lalonde
5db196315c Improve message when you change your password 2013-03-20 16:55:56 -04:00
Neil Lalonde
23cee77310 Merge pull request #506 from tangramor/master 
Update the zh_CN and zh_TW translations to the latest en.yml
 2013-03-20 13:17:42 -07:00
Neil Lalonde
d28d81a590 Dashboard warning when GC params are default 2013-03-20 16:16:23 -04:00
Neil Lalonde
c8508d3f26 Dashboard warning when host_names is localhost 2013-03-20 15:38:28 -04:00
tangramor
dc7b690921 Add I18n support for "The topic has been deleted" message 2013-03-21 00:10:41 +08:00
Neil Lalonde
1e4dd3ea0c Start detecting install problems and report them on the admin dashboard. This commit adds check for Rails.env 2013-03-20 12:00:52 -04:00
tangramor
841bf3f064 Update the translations according to the latest en.yml 2013-03-20 23:48:28 +08:00
Sam
62c60540be pull moderator into own column, rename trust levels 2013-03-19 21:06:11 -07:00
Sam
a95a756550 Merge pull request #500 from ZogStriP/keep-french-l10n-up-to-date-2013-03-20 
keep French l10n up to date
 2013-03-19 20:37:08 -07:00
nverba
9a1fb90b91 Update mini_profiler.rb 
Passing a pre-defined Redis connection to MiniProfiler stops connection leakage. Should limit MiniProfiler connections to one per running process.
 2013-03-20 03:29:07 +00:00
Régis Hanol
54399e4d2e keep French l10n up to date 2013-03-20 02:12:20 +01:00
Robin Ward
79884284c4 Add utf-8 headers to all ymls 2013-03-19 16:11:58 -04:00
Neil Lalonde
de84718894 Move 'upgrade often' nag to the commits widget 2013-03-19 14:43:04 -04:00
Neil Lalonde
70f5ee5fa9 New layout for version check on admin dashboard 2013-03-19 14:43:04 -04:00
Robin Ward
96ac0c5569 A site setting for how many similar topics are returned 2013-03-19 13:51:25 -04:00
Robin Ward
2d586d8052 Merge pull request #498 from williamherry/add_missing_translation 
keep chinese i18n up to date
 2013-03-19 07:39:11 -07:00
William Herry
5b987b7262 keep chinese i18n up to date 2013-03-19 22:21:14 +08:00
Robin Ward
b1ca53e00b Merge pull request #496 from kubabrecka/cs_update17 
cs translation update
 2013-03-19 06:42:55 -07:00
Régis Hanol
9acef70c1e FIX: post removal is in portuguese 2013-03-19 11:45:55 +01:00
Kuba Brecka
9850386b43 cs translation update 2013-03-19 09:38:52 +01:00
Sam
9805f7d2f5 max upload size message when images are too big. 2013-03-19 00:19:05 -07:00
Jeff Atwood
503520d885 less wordy automatic post flag hidden PM 2013-03-18 23:30:03 -07:00
Sam
0e1174dbe8 Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-with-status 
keep favorite/star button's title in sync with starred status
 2013-03-18 21:48:12 -07:00
Sam
cc9ea74b41 Merge pull request #490 from ZogStriP/updated-french-l10n 
keeping french l10n up to date
 2013-03-18 21:46:34 -07:00
Régis Hanol
967b03fcfc keep favorite/star button's title in sync with starred status 2013-03-18 18:57:03 +01:00
Neil Lalonde
766f437e44 Say 'mod' instead of '5' on users per trust level table 2013-03-18 13:25:40 -04:00
Régis Hanol
43e13cf3ea keeping french l10n up to date 2013-03-18 18:23:19 +01:00
Neil Lalonde
50b04b2209 Add email counts to admin dashboard 2013-03-18 10:08:09 -04:00
Neil Lalonde
6a99d12784 Add likes to admin dashboard 2013-03-18 10:08:08 -04:00
William Herry
4e1c3b635f add missing translation for chinese 2013-03-18 00:48:56 +08:00
Robin Ward
42c234e927 Merge pull request #483 from ZogStriP/site-setting-for-category-color 
site setting for category colors
 2013-03-17 04:48:01 -07:00
Robin Ward
4e057335d5 Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category 
displays a message when a failure happen while creating a new category
 2013-03-17 04:47:44 -07:00
Régis Hanol
bc9e931304 site setting for category colors 2013-03-17 01:24:52 +01:00
Sam
1a20291ff4 mini profiler and am serializer update 2013-03-16 15:56:16 -07:00
Sam
46b3c364f8 Merge pull request #470 from nverba/update 
refactored redis.yml.sample for easier local precompile, updated docs
 2013-03-16 15:51:01 -07:00
Robin Ward
ab2073f152 Merge pull request #473 from ZogStriP/update-french-l10n-1 
keeping the French l10n up to date
 2013-03-16 08:18:55 -07:00
Kuba Brecka
94c0e73ca6 extract string from commits widget 2013-03-16 12:39:20 +01:00
Sam
837dea355c Merge pull request #471 from kubabrecka/cs_update16 
cs translation update
 2013-03-16 02:44:20 -07:00
nverba
c5b62ac52a refactored redis.yml.sample for easier local precompile, updated docs 2013-03-16 01:35:38 +00:00
Régis Hanol
de58e30a8f keeping the French l10n up to date 2013-03-16 00:40:33 +01:00
Neil Lalonde
d9cdde9aa7 Add user counts for each trust level to admin dashboard 2013-03-15 18:09:02 -04:00
Neil Lalonde
8983df9856 Show current user count for now, not at different points in time 2013-03-15 18:09:01 -04:00
Jeff Atwood
3ba567eba0 copyedit on similar topics 2013-03-15 14:44:46 -07:00
Kuba Brecka
d40ebce979 cs translation update 2013-03-15 22:05:29 +01:00
Robin Ward
1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse 
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
 2013-03-15 16:49:17 -04:00
Robin Ward
76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3 
implement color picking from predefined set for category badges + option to change foreground color
 2013-03-15 13:43:59 -07:00
Robin Ward
ad082cea70 Big commit: 
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
 2013-03-15 14:35:33 -04:00
Robin Ward
7714e2050e Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files 
extracted hard coded strings in the admin javascript files [ci skip]
 2013-03-15 06:49:03 -07:00
Régis Hanol
aef014f439 displays the number of characters left when editing the topic title 2013-03-15 12:56:14 +01:00
Neil Lalonde
6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04:00
Régis Hanol
cad55bf244 extracted hard coded strings in the admin javascript files 2013-03-14 23:03:13 +01:00
Régis Hanol
3bf6625aa4 displays a message when a failure happen while creating a new category 2013-03-14 22:25:55 +01:00
Kuba Brecka
053eb0aa85 cs translation update + pseudolocalization 2013-03-14 17:54:00 +01:00
Robin Ward
025dd86e26 Merge pull request #423 from nverba/heroku-integration 
Basic Heroku integration
 2013-03-14 08:05:46 -07:00
Robin Ward
dc9d54f1c7 Merge pull request #461 from richp10/master 
Sample Apache2 configuration
 2013-03-14 07:47:52 -07:00
Robin Ward
bde8e3df4a Merge pull request #455 from ZogStriP/master 
keeping French localization up to date
 2013-03-14 06:39:19 -07:00
Robin Ward
42621859d1 Merge pull request #459 from tangramor/master 
Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
 2013-03-14 06:38:37 -07:00
Robin Ward
4c1ee78a78 Merge pull request #457 from kubabrecka/update_cs14 
update cs translation
 2013-03-14 06:36:19 -07:00
Kuba Brecka
8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
Richard Phillips
ff4aaa04cb Apache2 Configuration Sample 
Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
 2013-03-14 12:18:56 +00:00
Regis Hanol
6abfa5342c extracted a few missing strings 2013-03-14 11:59:40 +01:00
tangramor
30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese 
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
 2013-03-14 18:18:59 +08:00
Kuba Brecka
5f3ac08dba update cs translation 2013-03-14 08:41:40 +01:00
Régis Hanol
969a62841c keeping French l10n up to date 2013-03-14 01:32:19 +01:00
Robin Ward
518910a54d FIX: Don't include link counts when selecting text to quote a post. 2013-03-13 15:51:41 -04:00
Neil Lalonde
213d3e5c10 Remove unused code and routes that don't exist in session_controller 2013-03-13 15:21:45 -04:00
nverba
68e3f5228f Basic Heroku integration 2013-03-13 19:07:49 +00:00
Neil Lalonde
58004d44cd Support for browser password managers, but doesn't quite work in IE 2013-03-13 13:55:33 -04:00
nverba
3c0274a00b init message_bus before site_settings 2013-03-13 15:15:22 +00:00
Robin Ward
572a87d5d8 Merge pull request #447 from kubabrecka/history_date_i18n 
move date formatting from server side to javascript, so we can reuse Sugar's i18n
 2013-03-13 06:57:42 -07:00
Robin Ward
dff9d65cc9 Merge pull request #437 from kubabrecka/i18n_serverside_date_2 
2nd try: localize date formats on server side
 2013-03-13 06:54:27 -07:00
Kuba Brecka
921a658548 move date formatting from server side to javascript, so we can reuse Sugar's i18n 2013-03-13 13:38:41 +01:00
Sam
38f185355d added options to disable quoting and open links in new tabs 
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
 2013-03-12 20:06:58 -07:00
Sam
5a2d8e344f Merge pull request #438 from ZogStriP/keeping-french-l10n-up-to-date 
keeping French localization up to date
 2013-03-12 17:01:20 -07:00
Kuba Brecka
505bf29bad update cs translation 2013-03-12 23:40:01 +01:00
Régis Hanol
7365edefe5 keeping French localization up to date 2013-03-12 23:22:24 +01:00
Jeff Atwood
cde9d8c3a9 copyedit on reply to diff topic reminder 2013-03-12 13:33:32 -07:00
Neil Lalonde
40c27ff3cf Add flag counts to admin dashboard 2013-03-12 14:40:59 -04:00
Neil Lalonde
4eda422cdf Add total users report; restructure dashboard reports js 2013-03-12 14:40:59 -04:00
Kuba Brecka
b97a3c8d34 reports don't work when default_locale != en + some missing translations 2013-03-12 14:38:15 -04:00
Kuba Brecka
cf5deaba6c 2nd try: localize date formats on server side 2013-03-12 19:30:56 +01:00
Robin Ward
a5a97f88cd When editing a post, provide more information in the composer title 2013-03-12 13:34:27 -04:00
Robin Ward
1e017ddc62 Merge pull request #434 from kubabrecka/cs_typo_fixes 
cs translation typo fixes
 2013-03-12 07:38:40 -07:00
Kuba Brecka
1cab4d3265 cs translation typo fixes 2013-03-12 15:12:54 +01:00
Kuba Brecka
ac47c36f8b extract hardcoded "post {{number}}" into locale strings 2013-03-12 14:41:27 +01:00
Robin Ward
9db0ddeeac Merge pull request #429 from tangramor/master 
Add some missed translations for server.zh_CN.yml
 2013-03-12 06:31:08 -07:00
Sam
079b2d3842 Merge pull request #430 from kubabrecka/cs_update12 
cs translation update
 2013-03-12 03:31:41 -07:00
Kuba Brecka
f5f502d2a0 extract hardcoded string into locale 2013-03-12 11:29:59 +01:00
Kuba Brecka
e0ab379bce cs translation update 2013-03-12 10:59:58 +01:00
Sam
91b507f4c4 if you try posting a reply and are looking at a different topic, pop this window up 2013-03-11 20:57:06 -07:00
tangramor
3a6a4c628d Merge remote-tracking branch 'upstream/master' into mywork 2013-03-12 10:30:45 +08:00
tangramor
4b8a39248b modified reports related translations and a few email templates 2013-03-12 10:12:58 +08:00
Régis Hanol
1d7aa1f6cf globalized some missing strings 2013-03-12 02:17:45 +01:00
Sam
3a58e7aac2 amend airbrake location 2013-03-11 17:16:54 -07:00
Sam
a0bdbe046a don't try to load airbrake if there is no config for it 2013-03-11 16:59:21 -07:00
Robin Ward
1205e0d3d4 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 11:32:09 -04:00
Robin Ward
0b3910c969 Merge pull request #400 from alxndr/i18n-chinese 
remove duplicated quote_title translation string
 2013-03-11 08:28:16 -07:00
Robin Ward
d175da6816 Merge pull request #392 from kubabrecka/date_i18n_support 
1st attempt to support i18n in dates and times
 2013-03-11 08:15:58 -07:00
Robin Ward
de1d488d91 Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse 2013-03-11 11:14:17 -04:00
Robin Ward
4360d1bd61 Cleaned up probe code a little. 2013-03-11 11:13:28 -04:00
Robin Ward
b554bf4520 Merge pull request #415 from Andersos/example-1 
Updated pull #405 for all language files
 2013-03-11 07:13:04 -07:00
Sam
1c8eef7dbd added basic passenger support, no long polling but functions 
clean up initializers so they are ordered properly
 2013-03-11 05:33:20 -07:00
Anders Sandvik
bd0c979043 Updated pull #405 for all languagefiles 
Small change from xyz.com to example.com
 2013-03-11 06:47:56 +01:00
Sam
a2facaa4d0 Merge pull request #411 from potthast/german-l10n 
German l10n of Discourse. Works so far, but lots of fine-tuning still required.
 2013-03-10 18:30:53 -07:00
Sam
46b33c3949 Merge pull request #405 from Andersos/patch-1 
Small change from xyz.com to example.com
 2013-03-10 17:53:07 -07:00
Sam
22a4580df5 added profile environment for perftools profiling (1.9.3 only) 2013-03-10 17:21:56 -07:00
Martin Potthast
0ffa0fe0a7 And some further revisions to German l10n. 2013-03-10 21:38:16 +01:00
Martin Potthast
ef134b426d Further revisions. 2013-03-10 21:30:58 +01:00
Martin Potthast
d39f32430c Revised German l10n 2013-03-10 20:57:48 +01:00
Martin Potthast
ba90001828 Failed to declare de: at the top of the translation files. 2013-03-10 17:48:44 +01:00
Martin Potthast
8d2b53a256 Initial version of the German l10n. 2013-03-10 16:44:07 +01:00
Robin Ward
45c4382cce Merge pull request #408 from ikbear/fix_zh_CN_translation_error 
Add some zh_CN translation
 2013-03-10 08:14:53 -07:00
Robin Ward
0b3ae6632f Merge pull request #409 from kubabrecka/cs_update10 
updating cs translation
 2013-03-10 08:13:08 -07:00
Kuba Brecka
e27f499fcc updating cs translation 2013-03-10 11:10:04 +01:00
ikbear
b7687b4174 Add some zh_CN translation 2013-03-10 17:18:24 +08:00
Régis Hanol
7fc1565553 keeping french translations up to date 2013-03-10 00:38:28 +01:00
Neil Lalonde
8927432a93 Add stats to the admin dashboard 2013-03-09 15:34:27 -05:00
Anders Sandvik
a7a1cd7269 Small change from xyz.com to example.com 2013-03-09 18:25:36 +01:00
Régis Hanol
6478db3953 keeping French translations up to date 2013-03-09 01:29:50 +01:00
Jeff Atwood
53d8e49a5d copyedits 2013-03-08 12:30:32 -08:00
Robin Ward
d1d4530efd User Profile enhancements: 
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
 2013-03-08 15:04:37 -05:00
Alexander
fe7fd2ac7f remove duplicated quote_title translation string 2013-03-08 10:46:32 -08:00
Robin Ward
0af114aff5 Merge pull request #399 from kubabrecka/update_cs9 
update cs localization + pseudolocalization
 2013-03-08 08:58:12 -08:00
tangramor
c5761eae8a Support for Simplified Chinese thanks to tangramor 2013-03-08 11:56:17 -05:00
Kuba Brecka
bb1021264a update cs localization + pseudolocalization 2013-03-08 17:44:34 +01:00
Robin Ward
fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting 
added the min-search-term-length site setting
 2013-03-08 06:58:45 -08:00
Kuba Brecka
d8993272d1 updating cs translation 2013-03-08 13:18:20 +01:00
Neil Lalonde
2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Kuba Brecka
2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward
c7359145aa Merge pull request #384 from kubabrecka/fix_html_escapes 
fix wrongly escaped HTML in <noscript> tags
 2013-03-07 09:24:16 -08:00
Robin Ward
0d9b251b31 Merge pull request #388 from ryanprayogo/master 
More translation for the Indonesian language
 2013-03-07 09:22:05 -08:00
Robin Ward
f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Ryan Prayogo
fee31828d7 More translation for the Indonesian language 2013-03-06 23:35:58 -05:00
Régis Hanol
9d9329257d keeping client.fr.yml up to date 2013-03-07 01:04:10 +01:00
Sam
674ed9432e Merge pull request #379 from Sinemys/portuguese-translations 
Portuguese translations
 2013-03-06 14:59:14 -08:00
Sam
33d1ea500b Merge pull request #383 from kubabrecka/cs_update7 
CZ translation update + pseudolocalization update
 2013-03-06 14:58:18 -08:00
Kuba Brecka
69d9856d43 fix wrongly escaped HTML in <noscript> tags 2013-03-06 22:25:44 +01:00
Kuba Brecka
98ebd91f96 CZ translation update + pseudolocalization update 2013-03-06 21:42:08 +01:00
Neil Lalonde
fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Luís Ramalho
3333abefb7 PT corrections 2013-03-06 19:19:55 +00:00
Ismael Abreu
2396673847 Portuguese translations 2013-03-06 19:18:45 +00:00
Luís Ramalho
7324c74191 Postuguese translations 2013-03-06 19:18:22 +00:00
Robin Ward
3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1 
Markdown editor translations into client.en.yml + tiny translation fixes
 2013-03-06 09:15:52 -08:00
Robin Ward
fa50d651ae Merge pull request #374 from ZogStriP/french-18n-update 
keeping the server.fr.yml file up to date
 2013-03-06 09:15:14 -08:00
Ryan Prayogo
6adbf7730b Adding initial Indonesian translation 2013-03-05 20:31:26 -05:00
Régis Hanol
6aedc06266 keeping the server.fr.yml file up to date 2013-03-05 23:48:27 +01:00
Robin Ward
030857ac8c Give a pretty "from" address to the digest emails 2013-03-05 16:53:49 -05:00
Kuba Brecka
da7a41f5b9 Markdown editor translations into client.en.yml + tiny translation fixes 2013-03-05 21:58:37 +01:00
Robin Ward
ef47a55202 Merge pull request #371 from kubabrecka/cz_update1 
CZ translation update (client.cs.yml, server.en.yml) + update of pseudolocalization
 2013-03-05 12:41:44 -08:00
Neil Lalonde
595901f351 Remove dashboard welcome message 2013-03-05 14:28:46 -05:00
Robin Ward
e0e8cad80d Merge pull request #370 from ZogStriP/keep-french-l10n-up-to-date 
updated french translations
 2013-03-05 11:11:50 -08:00
Kuba Brecka
ea2f099177 CZ translation update (client.cs.yml, server.en.yml) + update of pseudolocalization 2013-03-05 20:10:51 +01:00
Régis Hanol
9b52f1b4c2 updated french translations 2013-03-05 19:37:15 +01:00
Neil Lalonde
739d6391a9 Fix error during db:migrate on a new database 2013-03-05 13:02:16 -05:00
Robin Ward
0c5ca30188 Merge pull request #361 from ZogStriP/enforce-coding-convention 
enforce coding convention
 2013-03-05 07:25:19 -08:00
Robin Ward
0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5 
extract some strings from views/modal
 2013-03-05 06:43:01 -08:00
Robin Ward
97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization 
globalizing the image selector modal
 2013-03-05 06:41:49 -08:00
Robin Ward
7b861e5a6f Merge pull request #364 from baus/master 
Set reasonable nginx defaults for proxying to thin.
 2013-03-05 06:36:17 -08:00
Kuba Brecka
5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol
5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol
239cbd2d58 enforce coding convention 
replaced every `and` by `&&` and every `or` by `||`
 2013-03-05 01:42:44 +01:00
Neil Lalonde
3fdc59b1d9 Raise an error in production env if host_names is using production.localhost 2013-03-04 16:07:02 -05:00
Robin Ward
ccf8e1e87f Merge pull request #354 from jyggen/master 
Updated swedish client strings.
 2013-03-04 11:52:18 -08:00
Robin Ward
ccbd3b2841 Let's default Persona to off right now, change button text 2013-03-04 12:01:20 -05:00
Robin Ward
f7c9efb101 Merge branch 'persona-integration' of git://github.com/callahad/discourse 2013-03-04 11:51:26 -05:00
Jonas Stendahl
2be3bec5c7 Updated swedish client strings. 2013-03-04 17:05:22 +01:00
Kuba Brecka
9bf5e31f94 some more extracted strings for translation 2013-03-03 23:00:16 +01:00
Régis Hanol
2d00f97d98 better french traduction... 
... regarding the minimum entropies
 2013-03-03 12:59:40 +01:00
Chris Baus
71984bf01a Update nginx.sample.conf 2013-03-02 12:53:42 -08:00
Robin Ward
a0218ffece Merge pull request #320 from jk779/secret_token 
Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku)
 2013-03-02 08:04:00 -08:00
Kuba Brecka
821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
Michael Berg
5e95dfb1c9 Removing unnecessary Rails.env check 2013-03-02 05:58:05 +01:00
Michael Berg
de154f3ef1 Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku) 2013-03-01 23:55:49 +01:00
Robin Ward
d78a2b2b91 Removed unused type parameter in site settings. Remove hardcoded date reference in en.yml 2013-03-01 17:27:59 -05:00
Robin Ward
d410f043a9 Merge pull request #290 from alxndr/category-rss 
RSS for topics in a category
 2013-03-01 12:01:26 -08:00
Dan Callahan
7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan
81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward
72cbb948b8 Fixes broken "From" header in Private Message emails. 2013-03-01 14:56:52 -05:00
Dan Callahan
fd4d384dc1 Add Mozilla Persona Omniauth Gem and initializer 2013-03-01 13:29:47 -06:00
Robin Ward
d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access 
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
 2013-03-01 14:27:41 -05:00
Alexander
fd240c1967 RSS for topics in a category 
Creates a new route for category RSS
 2013-03-01 09:52:59 -08:00
Kuba Brecka
9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Kuba Brecka
5f2215290e adding some missing translations in the EN locale 2013-03-01 09:19:25 +01:00
Neil Lalonde
72edc9262b Add a comment about host_names in database.yml for production servers 2013-02-28 17:13:07 -05:00
Neil Lalonde
c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Robin Ward
b6f69ed57f Merge pull request #299 from kubabrecka/cs_client_localization 
client (js) side of Czech language localization
 2013-02-28 12:25:00 -08:00
Robin Ward
04f0105daf Fix locale path for precompiling assets 2013-02-28 15:06:04 -05:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward
e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde
a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Kuba Brecka
c53e101822 client (js) side of Czech language localization 2013-02-28 18:41:07 +01:00
Robin Ward
93a257707e Add X-Forwarded-Proto to nginx config to support SSL. Fixes #293 2013-02-28 11:24:03 -05:00
Robin Ward
9c0cbe8311 Merge pull request #298 from nverba/login-buttons 
added option to enable/disable login buttons individually
 2013-02-28 08:13:04 -08:00
nverba
b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Robin Ward
a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse 
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
 2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a Merge pull request #222 from alxndr/rss-for-topics 
RSS view of topics
 2013-02-27 08:30:08 -08:00
Jeff Atwood
7087c2b847 clarify some /admin site setting descriptions 2013-02-27 00:47:47 -08:00
Kuba Brecka
acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander
8855a0bfbe RSS of a topic via new route 
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
 2013-02-26 14:54:17 -08:00
Robin Ward
e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings 
extract some more strings into locales/*.yml
 2013-02-26 14:38:40 -08:00
Kuba Brecka
e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Neil Lalonde
cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Robin Ward
0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward
88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by 
it.
 2013-02-26 10:47:23 -05:00
Robin Ward
1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
 2013-02-26 10:42:49 -05:00
Régis Hanol
679d955db3 Pluralization bug when hovering on likes 2013-02-26 11:20:49 +01:00
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
Jeff Atwood
b50e0536c7 copyedit topic load failure messages 2013-02-25 17:05:26 -08:00
Jeff Atwood
ea9196a8a2 minor copyedits around login / email 2013-02-25 16:23:09 -08:00
Robin Ward
397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Jeff Atwood
d9d3419a51 some copyedits on admin / email 2013-02-25 15:07:40 -08:00
Robin Ward
2a7345b96e Merge pull request #237 from kubabrecka/pseudolocalization 
'pseudo' locale files for testing/development + script to generate these files
 2013-02-25 14:26:57 -08:00
Robin Ward
4be869db34 Merge pull request #257 from jyggen/master 
Swedish translation of client strings
 2013-02-25 14:24:31 -08:00
Robin Ward
c69cac517a Merge pull request #260 from nverba/patch-1 
Update config/routes.rb
 2013-02-25 14:22:35 -08:00
Robin Ward
e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
nverba
c6eeffec3b Update config/routes.rb 
Facebook and Twitter controllers are no longer defined.
 2013-02-25 17:16:53 +00:00
Jonas Stendahl
4990eab952 Added swedish translation for client strings. 2013-02-25 16:30:08 +01:00
Robin Ward
ea861ebb57 Merge pull request #249 from goshakkk/cleaner-routes 
Omit explicit route => action mappings where possible
 2013-02-25 07:05:31 -08:00
Sam Saffron
b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Gosha Arinich
81d03e6a39 omit explicit route => action mappings where possible 2013-02-24 17:02:11 +03:00
Jeff Atwood
e962ff36a9 copy change on topic not found, curious problems 2013-02-23 12:38:55 -08:00
Kuba Brecka
623cc66968 'pseudo' locale files for testing/development + script to generate these files 2013-02-23 11:38:27 +01:00
Jeff Atwood
9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Jeff Atwood
8631c215ad improved admin site setting descriptions 2013-02-22 12:34:42 -08:00
Robin Ward
1c5afc9686 Merge pull request #231 from shapkin/master 
Add english locale to page.
 2013-02-22 10:58:31 -08:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde
ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Alexander Shapkin
ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Robin Ward
588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00
Neil Lalonde
1e794f98a7 Add an option to not flush redis every time sidekiq.rb is loaded in development 2013-02-21 13:45:16 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
ba8efd8b51 Merge pull request #211 from Shahor/master 
French translation fixes
 2013-02-21 07:12:37 -08:00
Neil Lalonde
803a86a21d Add more documentation to secret_token.rb 2013-02-20 20:32:40 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See: 
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
 2013-02-20 19:01:13 -05:00
Shahor
f1c011ebcc Added new translations and fixed typo/grammar 2013-02-20 23:03:27 +01:00
Alexandre Gaudencio
2d51bd9919 French translation : Grammar,typo fixes and useless file removal 2013-02-20 18:43:56 +01:00
Sam Saffron
a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron
15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron
ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron
0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies 
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
 2013-02-20 16:11:56 +11:00
Sam Saffron
c914a3cf22 missing localization 2013-02-20 16:11:56 +11:00
Neil Lalonde
e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward
a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
963c11c72d Merge pull request #197 from mquandalle/master 
French translation
 2013-02-19 11:10:54 -08:00
Robin Ward
928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward
73cac65d3a Merge pull request #195 from merugear/master 
Updated Dutch Locale
 2013-02-19 08:21:05 -08:00
merugear
6ad9fc7049 Changed quotes 
I used " -quotes in the text, which didn't escape properly. Ran it through a YAML linter and it seems to validate.
Sorry for the inconvenience!
 2013-02-19 12:49:18 +01:00
merugear
dd302a6366 Updated, removing tabs and whitespaces. Changed 'en' to 'nl' 
Sam: could you try this one instead? Forgot to change 'en' to 'nl' Cheers.
 2013-02-19 12:36:06 +01:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
mquandalle
ef76a8db66 Split fr.yml into client.fr.yml + server.fr.yml 2013-02-19 00:08:13 +01:00
mquandalle
4cab57a2eb Create fr.yml 
Add french translation.
 2013-02-18 13:30:27 -08:00
merugear
c338760f6e Split from nl.yml, updated and ran spellcheck 2013-02-18 10:27:10 -08:00
merugear
d5d48d3ee0 Split from nl.yml, updated and ran spellcheck 
As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.
 2013-02-18 10:19:49 -08:00
Kevin Ansfield
1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron
0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam Saffron
87b929eac6 added secret token warning in prd 
added task to stamp builds
 2013-02-18 17:34:43 +11:00
Sam Saffron
1228e351a8 a much more basic but robust restart watcher, 
removed the pid stuff cause it needs to be a lot more careful not to think
pids from other machines restarted. robust working code is better than
complex graceful broken code.
 2013-02-16 13:54:23 +11:00
Sam Saffron
c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam Saffron
ff0d58e4ee message bus work in progress 2013-02-16 12:14:52 +11:00
Sam
db66e9facc Merge pull request #181 from danneu/flags-i18n 
added "flagged_by" i18n
 2013-02-17 13:56:33 -08:00
tms
fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Robin Ward
3cdf89d052 Merge pull request #162 from jessepollak/omniauth-failure 
Adds failure callback for omniauth
 2013-02-15 07:13:17 -08:00
Sam Saffron
eb188c57e8 started work on message bus diags 2013-02-15 19:23:40 +11:00
Sam Saffron
89ff51e108 a stop gap so notifications do not look horrible 2013-02-15 19:22:25 +11:00
Jesse Pollak
ad5a5b4866 This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml 2013-02-14 18:08:40 -08:00
Sam Saffron
6132373fab for some reason people seem to not understand why you can not submit close to empty posts, fix that 2013-02-15 12:20:17 +11:00
Jeff Atwood
e94b6e7796 rename nl.yml file as it's WIP 2013-02-14 16:50:16 -08:00
Jeff Atwood
bfd0b1ef29 add contributed nl.yml file 2013-02-14 16:43:51 -08:00
Sam Saffron
c833e2f290 migrate to glyph notifications 2013-02-15 11:44:14 +11:00
Jeff Atwood
0244834a97 copyedit on watching/tracking 2013-02-14 15:51:41 -08:00
Jeff Atwood
91e79670c4 copyedits on new user education panel 2013-02-14 15:32:06 -08:00
Robin Ward
b9457197c0 First stab at new user education - configurable messages that pop up on a user's first 
few posts/topics.
 2013-02-14 15:33:51 -05:00
Jeff Atwood
898efeaea2 suggested copy change to clarify grey unread old 2013-02-14 10:57:26 -08:00
Neil Lalonde
39eab7c425 Replace mentions of mothership with discourse_hub 2013-02-14 12:57:26 -05:00
Robin Ward
b94b9d2383 Merge pull request #146 from ismaelga/moderators-buttons 
Create moderators
 2013-02-14 07:26:50 -08:00
Sam Saffron
87d83802b9 added option that allows users to decide when they consider topics new (default 2 days old or newer) 
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
 2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29 Replace email_blacklist_regexp with email_domains_blacklist site setting 2013-02-13 22:45:43 -05:00
Jeff Atwood
d9d2565c25 remove extra text in login error 2013-02-13 17:23:30 -08:00
Ismael Abreu
80bec6efc9 Adds grant and revoke moderation buttons so admins can make users moderators 2013-02-14 01:12:23 +00:00
Sam Saffron
fd694e7b83 Merge branch 'master' of github.com:discourse/discourse 2013-02-14 09:12:49 +11:00
Sam Saffron
4ccb7354d1 nuking SSL = bad 2013-02-14 09:12:20 +11:00
Robin Ward
4c6379ea56 New users are highlighted when posting. .new-user class 2013-02-13 16:12:30 -05:00
Neil Lalonde
f850fe1e75 Implement the email_blacklist_regexp ssite setting 2013-02-13 12:28:39 -05:00
Robin Ward
4aa89ed2c0 Merge pull request #156 from kubabrecka/correct_typos 
correcting some typos in locales/en.yml
 2013-02-13 07:26:28 -08:00
Robin Ward
81f34349a7 Merge pull request #143 from pixelcort/ninja_edit_window_clarification 
Clarify the unit of time for ninja_edit_window
 2013-02-13 07:24:41 -08:00
Robin Ward
afc23cc8cb Merge pull request #133 from xdite/apply_omniauth 
Apply omniauth
 2013-02-13 07:19:13 -08:00
Kuba Brecka
1b5aaa1a7b correcting some typos in locales/en.yml 2013-02-13 16:16:40 +01:00
Sam Saffron
b7c5687b10 Merge branch 'master' of github.com:discourse/discourse 2013-02-13 20:38:59 +11:00
Sam Saffron
161420fac0 Added method for testing ember stuff 
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
 2013-02-13 20:38:43 +11:00
Jeff Atwood
e380ebde40 no uppercasin' 2013-02-13 01:20:02 -08:00
xdite
67cc766f0c using redis as backend store 2013-02-13 16:48:44 +08:00
Jeff Atwood
1a0ead770e add base_url to all /faq links in emails 2013-02-12 23:33:35 -08:00
xdite
a7908e07d1 merge master 2013-02-13 15:16:39 +08:00
xdite
9189d937f7 move all logic to omniauth 
implement omniauth-facebook / omniauth-twitter
 2013-02-13 15:08:38 +08:00
xdite
be3d036084 use omniauth-openid to replace google id 2013-02-13 15:08:32 +08:00
Jeff Atwood
36165d4687 copyedits 2013-02-12 22:20:53 -08:00
Robin Ward
d7f3241285 Option to supress replies button below a post, when its reply is directly following. 2013-02-12 14:35:21 -05:00
Cortland Klein
9ce896840c Clarify the unit of time for ninja_edit_window 2013-02-12 11:17:11 -08:00
Robin Ward
be9c374285 Oops, database.yml and redis.yml were still included 2013-02-12 11:32:32 -05:00
Robin Ward
3875806315 Introduction of Chef to Vagrant. Removed redis.yml and database.yml. Also updated 
instructions a lot, and included setup instructions for provisioning your own VM.

Closes #28 and #61.
 2013-02-12 11:18:59 -05:00
Sam Saffron
ad88487a32 Merge branch 'master' of github.com:discourse/discourse 2013-02-12 13:45:24 +11:00
Sam Saffron
2609350457 sample bluepill config 2013-02-12 13:44:44 +11:00
Jeff Atwood
ecbaa45736 remove extraneous text on PM summary 2013-02-11 16:14:44 -08:00
Neil Lalonde
c18b85873f Prevent login until email is confirmed 2013-02-11 11:18:37 -05:00
Sam Saffron
f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Sam Saffron
374820ae8b not required there, if anything should go in the initializer 2013-02-11 15:13:40 +11:00
Sam Saffron
543845c673 rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default. 2013-02-11 11:43:07 +11:00
Sam Saffron
c50a9e4d01 added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false 2013-02-11 11:02:57 +11:00
Sam Saffron
af810f38dd UserSearch refactor 
Added .sql_builder to all AR models
 2013-02-10 23:37:24 +11:00
tms
9e653ad370 Show "You" to same-user on activity stream items 2013-02-09 23:44:03 -05:00
Jeff Atwood
c5e1dba31f copyedit on PM invite button 2013-02-09 13:33:38 -08:00
Robin Ward
25e9cfe3b8 Remove the distinction between "x replies below" and "x replies" 2013-02-08 17:10:18 -05:00
Neil Lalonde
1635d8e553 Add email_blacklist_regexp to site settings. Not implemented yet. 2013-02-08 16:31:21 -05:00
Neil Lalonde
d1a04fa06a Enforce max username length on client 2013-02-08 16:08:45 -05:00
Jeff Atwood
cc21cf16d1 copy on email mentions 2013-02-08 11:13:50 -08:00
Sam Saffron
e925d53463 disable diags for now 2013-02-08 22:35:35 +11:00
Sam Saffron
d3f911cc4c Revert "Something here is messed up Revert "message bus fixes and diagnostics"" 
This reverts commit f3c6144e3b.
 2013-02-08 22:03:45 +11:00
Sam Saffron
457229b133 Revert "Revert "structure.db to my structure"" 
This reverts commit 7c61c3d699.
 2013-02-08 22:03:25 +11:00
Sam Saffron
7c61c3d699 Revert "structure.db to my structure" 
This reverts commit 616a1f4906.
 2013-02-08 21:57:16 +11:00
Sam Saffron
f3c6144e3b Something here is messed up Revert "message bus fixes and diagnostics" 
This reverts commit 36d1aafe1e.
 2013-02-08 21:39:38 +11:00
Sam Saffron
616a1f4906 structure.db to my structure 
tone down watch for restart
 2013-02-08 21:09:46 +11:00
Sam Saffron
36d1aafe1e message bus fixes and diagnostics 2013-02-08 19:13:36 +11:00
Neil Lalonde
79dfccf717 Username validation in signup and username change forms 2013-02-07 18:23:52 -05:00
Jeff Atwood
b8ded55450 a few minor copyedits, 1px adjust 2013-02-07 13:41:33 -08:00
Robin Ward
084a873b91 Give regular users a delete button. If they click it, their post will be revised to 
say it was deleted.
 2013-02-07 15:14:23 -05:00
Sam Saffron
85973ce6b0 added delete all posts button 
wired up the ability to enable all themes
 2013-02-07 18:11:56 +11:00
Sam Saffron
8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
Sam Saffron
7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
Sam Saffron
c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
Robin Ward
7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward
40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Neil Lalonde
471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
Sam Saffron
f79f0e740a Don't allow users to double flag stuff 
Correct seed fu to match model
 2013-02-07 10:45:58 +11:00
Robin Ward
2d2b907d2c Temporary Nuclear option on topic titles - disallow non ascii characters so we 
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
 2013-02-06 15:47:36 -05:00
Sam Saffron
0f88947279 fix onebox for your own site 2013-02-06 16:22:11 +11:00
Robin Ward
21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00