Commit Graph

1776 Commits

Author SHA1 Message Date
Neil Lalonde 3328973f04 Category description placeholder text mentions that the category won't appear on categories page unless it has topics or the placeholder text is replaced with a real category description. 2014-01-06 11:21:46 -05:00
Robin Ward 14ec64a36a Give a better error message from the server if you've been replying too much. 2014-01-06 11:10:37 -05:00
Régis Hanol 87217d940e Merge pull request #1457 from skisulli/keyboard-shortcuts
Global Gmail style keyboard shortcuts
2014-01-06 06:40:55 -08:00
Régis Hanol d3c223e464 Merge pull request #1791 from vikhyat/smtp-auth-option
Make SMTP authentication mechanism configurable.
2014-01-06 05:28:21 -08:00
Vikhyat Korrapati 6d50504a83 Make SMTP authentication mechanism configurable. 2014-01-06 18:19:42 +05:30
Régis Hanol 8d73b7f94d BUGFIX: hide sensitive site settings 2014-01-06 13:03:53 +01:00
Régis Hanol a1f80e9e51 fixed a couple typos in the French translations 🇫🇷 2014-01-06 12:14:01 +01:00
Régis Hanol bd043ba60f Merge pull request #1790 from Bahanix/master
Update french locales
2014-01-06 03:12:26 -08:00
Sam b703d8c77a BUGFIX: redis-rails has always been a problem child
implemented an ActiveSupport::Cache::Store for our internal use.
* allows for expire by family
* works correctly in multisite
* namespaced correctly

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

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

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

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

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

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

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

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

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

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