Commit Graph

1735 Commits

Author SHA1 Message Date
Sam a28a0bbeeb PERF: stop messing with strings that come back from I18n.t
allows better caching
2014-02-18 14:10:03 +11:00
Sam 6360868341 Merge pull request #1968 from stephankaag/drop_rails3
Drop Rails3 support
2014-02-18 10:50:36 +11:00
Régis Hanol f81680d5c7 BUFGIX: we should have uploads in the backup 2014-02-17 19:58:50 +01:00
Stephan Kaag f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Régis Hanol 6f6a8c3f1b dump only the public schema when backing up the db 2014-02-17 19:14:57 +01:00
Wojciech Zawistowski b097cf4997 Refactors PostCreator. 2014-02-17 01:57:37 -05:00
Sam 70c50d321a BUGFIX: allow facebook auth for people refusing email 2014-02-17 14:45:17 +11:00
Sam abb2de22ab BUGFIX: search could break when expanding 2014-02-17 14:34:14 +11:00
Sam 2b10fdc97f FEATURE: search auto scopes on topic first 2014-02-17 13:54:51 +11:00
Sam 0438abf139 BUGFIX: Use ENV["USER"] before falling back to postgres 2014-02-17 10:44:37 +11:00
Sam 23af46a66c Merge pull request #1960 from verg/subcategory-search-links
Fix subcategories links from search
2014-02-17 10:33:35 +11:00
verg f723f11443 Fix subcategories links from search 2014-02-16 12:49:20 -05:00
Neil Lalonde d298e2e065 Detect Googlebot from user agent and use a different layout that doesn't load javascript 2014-02-15 17:54:34 -05:00
Neil Lalonde fba0958486 Version bump to v0.9.8.5 2014-02-14 13:51:25 -05:00
Neil Lalonde 35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
Régis Hanol 29b6b71d61 don't pass arguments when they're empty to pg_sql/pg_dump 2014-02-14 02:58:36 +01:00
Régis Hanol a8b3269fdb reload the page when read_only mode is disabled 2014-02-14 00:27:25 +01:00
Régis Hanol b89d328de2 display/preload the logs of the last/current operation 2014-02-13 13:31:14 -08:00
Régis Hanol 50273ba815 rename site setting to 2014-02-13 13:31:14 -08:00
Régis Hanol 62f98993cd fix pg_dump syntax to exclude schemes 2014-02-13 13:31:14 -08:00
Régis Hanol 6e44ca8e17 fix rollback 2014-02-13 13:31:14 -08:00
Régis Hanol aff3463957 we want to wait for workers and not enqueued jobs 2014-02-13 13:31:13 -08:00
Régis Hanol d94774ceec force sidekiq resest after fork 2014-02-13 13:31:13 -08:00
Régis Hanol 269f52b8f7 fix db rake tasks 2014-02-13 13:31:13 -08:00
Régis Hanol e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol 79a40658bf new backup & restore code 2014-02-13 13:31:13 -08:00
Régis Hanol 8344f0d8fd remove old import/export code 2014-02-13 13:31:13 -08:00
Régis Hanol 90c00fcaba pausable sidekiq module 2014-02-13 13:31:13 -08:00
Régis Hanol 794c7bf730 fix code styling 2014-02-13 13:31:13 -08:00
Régis Hanol 1397a8057f refactor system_message a bit 2014-02-13 13:31:13 -08:00
Régis Hanol 831ad524e6 added some comments 2014-02-13 13:31:13 -08:00
Neil Lalonde 8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
Sam 4ff6780758 Merge pull request #1935 from eriko/remove_cas
Remove cas
2014-02-13 17:26:20 +11:00
Robin Ward f73a3f252a FIX: Don't allow parent categories to be deleted. Also, remove
duplicated logic and rely on the server response for `can_delete`
status.
2014-02-12 17:24:25 -05:00
Robin Ward a963dd9081 Support `embeddable_host` values that contain a HTTP/HTTPs protocol 2014-02-12 15:56:06 -05:00
Robin Ward 318e692290 FIX: If there is an exception when parsing one email, don't stop all
work, return an error code and continue.
2014-02-12 12:08:34 -05:00
Sam 22af3fe085 FEATURE: muted categories should not be missing from drill down 2014-02-12 17:01:13 +11:00
Sam 71a38542a4 FEATURE: automatic orphan recovery
BUGFIX: improve scheduler robustness, in case redis is disconnected during operation

If sidekiq is terminated while task is running, it will be picked up and ran again
New owner on tasks to help debugging
better #stop semantics for tests
2014-02-12 13:33:24 +11:00
Erik Ordway f1e8bdaee5 Remove cas auth from core and convert the settings over so they can be used by the plugin 2014-02-11 15:57:08 -08:00
Erik Ordway 34f9e17eac Allow plugins to specify the value used for require statements. This allows using forked gems in plugins until the original gem gets updated. 2014-02-11 15:53:54 -08:00
Sam 7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Sam 820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
Robin Ward b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it
and apply a CSS class to their posts.
2014-02-10 17:00:15 -05:00
Wojciech Zawistowski 2a7b609cae Refactors PostCreator. 2014-02-10 20:29:31 +01:00
Sam de9e1a5049 BUGFIX: allow sorting prior to sidekiq starting 2014-02-10 09:21:46 +11:00
Robin Ward 350eb82223 Don't include category definitions on Categories page 2014-02-07 17:01:31 -05:00
Régis Hanol cef2d8dc82 BUGFIX: make sure moderators can't view topics they aren't allowed to 2014-02-07 07:08:56 -08:00
Sam cfa5882035 Be slightly less aggressive at clearing assets 2014-02-07 21:43:05 +11:00
Régis Hanol e47f462f54 Merge pull request #1916 from vikhyat/pm-dominating
Don't notify about dominating private messages
2014-02-07 00:28:27 -08:00
Sam d9c05fcfc8 SECURITY: dissalow mods from seeing PMs 2014-02-07 14:24:19 +11:00
Sam 93434be16d SECURITY: reduce moderator rights
You can now hide particular categories from certain moderators
2014-02-07 14:11:52 +11:00
Sam 8e9cfdfcda BUGFIX: plugins not updating after assets:precompile
Now that we have a fancy cache we can nuke all old assets
This is way better cause it ensures all .erbs get re-evaluated
And ensures plugins are updated
2014-02-07 11:37:07 +11:00
Sam 12cea8cb92 BUGFIX: scheduler crash in blocking_tick 2014-02-07 11:21:28 +11:00
Vikhyat Korrapati 2f38316bfc Don't notify about dominating private messages. 2014-02-07 05:49:45 +05:30
Sam 227873df78 FEATURE: proper mailing list mode
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Neil Lalonde 3a1c5ed39d Version bump to v0.9.8.4 2014-02-06 18:59:45 -05:00
Régis Hanol 3be822f97e Merge pull request #1914 from velesin/topic_creator_refactoring
Refactors TopicCreator
2014-02-06 15:04:54 -08:00
Sam 0efcb9cee9 BUGFIX: race condition in blocking_tick
causes erratic spec failure
2014-02-07 08:40:43 +11:00
Sam f27ffe3223 BUGFIX: scheduler was showing up empty in multisite 2014-02-07 08:37:02 +11:00
Wojciech Zawistowski bc1824a6ed Refactors TopicCreator 2014-02-06 20:52:50 +01:00
Wojciech Zawistowski 4485ae7b05 Refactors PostDestroyer 2014-02-06 07:54:34 -05:00
Sam d9df40dfcd minor refactor 2014-02-06 17:07:15 +11:00
Sam a69f59ef51 FEATURE: much faster asset precompilation with a redis backed cache 2014-02-06 16:55:53 +11:00
Sam fad80bbee3 Sort schedules by "next run due" time 2014-02-06 10:59:42 +11:00
Sam e1f293ad66 FEATURE: new scheduler
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
2014-02-06 10:26:16 +11:00
Vikhyat Korrapati 6acc5c19e7 Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency. 2014-02-05 10:50:28 +05:30
Vikhyat Korrapati fab4e59f76 Fix plugin:spec rake task to include subdirectories. 2014-02-05 06:11:49 +05:30
Robin Ward 659546c4e4 CHANGE: Hide category definition topics unless you are viewing that
category.
2014-02-04 15:55:30 -05:00
Régis Hanol 4fb274fb9d BUGFIX: history link doesn't work on deleted posts 2014-02-04 20:05:50 +01:00
Neil Lalonde 9601684405 Suggested topics includes closed and archived in new and unread, but not in random results 2014-02-04 12:26:49 -05:00
Sam d54f6faa35 minor style fix 2014-02-04 12:57:16 +11:00
Sam 1556548ff6 BUGFIX: JS errors could crash our process 2014-02-04 11:14:04 +11:00
Sam d0a6dd88df FEATURE: exclude muted categories from the latest and new tabs 2014-02-03 16:05:49 +11:00
Vikhyat Korrapati 102352e205 Add rake task for running plugin tests. 2014-02-02 01:52:53 +05:30
Neil Lalonde 3a6c3ee65d Add two rake tasks: db:rebuild_indexes and import:remove_backup 2014-01-31 15:30:47 -05:00
Robin Ward 6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward 7564d9a20c Server side implementation for bulk editing categories 2014-01-30 11:44:29 -05:00
Robin Ward b315a5c28f Delegate bulk operations to a `TopicsBulkAction` object. 2014-01-30 11:44:29 -05:00
Sam ed45a1dce3 FEATURE: new scheduler so we can deprecate sidetiq
This is a work in progress, should have it finished tomorrow.
2014-01-30 16:21:38 +11:00
Neil Lalonde 946e837542 Add twitter to Onebox.options 2014-01-29 14:14:07 -05:00
Neil Lalonde d343e9f360 Add DiscourseLocalOnebox 2014-01-29 14:14:07 -05:00
Robin Ward e453bfa073 Work in progress: Swap out onebox code for onebox gem 2014-01-29 14:14:07 -05:00
Sam cce5fb3303 BUGFIXES: improved performance of import an export
we no longer generate the entire dump in memory, instead we generate one table at a time
added some basic progress
2014-01-29 16:49:01 +11:00
Neil Lalonde 947d896a8c FIX: when filling suggested topic list, don't try to add topics that have already been added, and topics that are category descriptions 2014-01-28 18:15:46 -05:00
Neil Lalonde 74f1c553e3 FIX: 1868 Security: Dangerous Send 2014-01-27 13:05:51 -05:00
Neil Lalonde ec58a00765 Version bump to v0.9.8.3 2014-01-24 15:21:36 -05:00
Régis Hanol 245bc19379 BUGFIX: PMs could be created with a category
BUGFIX: hide category column when displaying the list of private messages
2014-01-24 12:57:48 +01:00
Robin Ward e3a151d66a FIX: Show category text color in oneboxes 2014-01-23 13:35:29 -05:00
Régis Hanol bfc9664231 BUGFIX: site_contact_username was case-sensitive 2014-01-23 11:26:31 +01:00
Robin Ward 2d15c82b26 FIX: Digest styling for oneboxes 2014-01-22 15:30:44 -05:00
Sam 7e5a17f277 FEATURE: mute/watch/track buttons for private conversations 2014-01-22 17:46:52 +11:00
Robin Ward 194081ca47 FIX: Hidden posts were not being displayed with the correct messaging. 2014-01-21 17:23:03 -05:00
Régis Hanol 1fd71bb237 BUGFIX: make the system_user an elder (TL=4)
Otherwise it won't be able to create topic when the `min_trust_to_create_topic` is > 0
2014-01-21 15:21:38 +01:00
Régis Hanol a0d9821b37 FIX: Digest::Digest deprecation 2014-01-20 18:33:40 +01:00
Régis Hanol b49e448556 FEATURE: show pinned topics for TL0 on top/year page
BUGFIX: word-wrap on topic-excerpt
2014-01-18 19:27:26 +01:00
Régis Hanol 59ab71b060 remove duplicated order_with_pinned_sql method 2014-01-18 19:27:26 +01:00
Régis Hanol 8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Robin Ward 4981525047 REFACTOR: Fixes poor class hierarchy for listing topics
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
Herb Jiang 5fa464e10b force_encoding according to the charset in mail, this solve encoding problem when not using ‘utf-8’ charset. 2014-01-19 02:12:38 +08:00
Shiv Kumar c281dd2c1e sub space for underscore in 'name' when registering public folder in plugin 2014-01-17 15:35:52 -08:00
Robin Ward 8c29ed870e Non-staff users may not delete their posts in archived topics. 2014-01-17 17:42:12 -05:00
Robin Ward cf04026b15 Merge pull request #1836 from nitper/patch-2
fix for nil session in mobile_detection.rb
2014-01-17 13:50:32 -08:00
Robin Ward 18e719b0af In development mode, if an avatar is missing just serve up a placeholder 2014-01-17 11:47:23 -05:00
nitper fc9c6c8d18 fix for nil session in mobile_detection.rb 2014-01-16 20:04:38 -08:00
Sam cdce117941 BUGFIX: support nil params 2014-01-17 13:07:17 +11:00
Sam ce8bc3682f BUGFIX: do not install dependencies from plugin, must be explicit 2014-01-17 12:33:42 +11:00
Neil Lalonde 64431c3605 Version bump to v0.9.8.2 2014-01-16 16:54:07 -05:00
Neil Lalonde 7c8ea8c166 Trust level 3 users can edit topic titles and change category 2014-01-16 11:59:26 -05:00
Neil Lalonde 89908cdb47 Admins don't see uncategorized on /categories if it has no topics and allow_uncategorized_topics is false 2014-01-15 14:11:36 -05:00
Neil Lalonde 4f6b208e8d Posts by trust level 3 users do not have nofollow on their external links. 2014-01-15 11:40:51 -05:00
Sam aa577f11fd BUGFIX: use a more widely compatible version of sadd 2014-01-15 12:39:20 +11:00
Sam a247389d4e FEATURE: automatically update site to latest version of assets
if a user neglects to move around the site it will prompt to do so 2 hours in
2014-01-15 12:08:35 +11:00
Régis Hanol b024bebbe2 BUGFIX: emoji's url were relatives (was breaking the wordpress plugin) 2014-01-14 23:51:36 +01:00
Régis Hanol 3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Neil Lalonde e7a05c54e8 FIX: suggested topics sometimes adds new topics from other categories before new topics of the current category 2014-01-13 15:02:15 -05:00
Sam 2c75e15049 FEATURE: query param for closed / archived / open
?status=closed for closed topics
?status=open for open topics
?status=archived for archived topics
2014-01-13 14:40:21 +11:00
Patrick ffb29dea77 Refactor guardian as dissused in this topic https://meta.discourse.org/t/so-you-want-to-help-out-with-discourse/3823/41?u=hunter
Creates a mixin for the ensure_* functions and creates seperate mixins for functions dealing with posts, categories, and topics.
2014-01-10 21:22:54 -06:00
Neil Lalonde 52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Neil Lalonde 73e41a2702 Version bump to v0.9.8.1 2014-01-10 14:36:06 -05:00
Robin Ward 1aee217a61 FIX: sidekiq 100% CPU usage due to `ice_cube` 2014-01-10 11:43:51 -05:00
Neil Lalonde 303d7a619a Version bump to v0.9.8 2014-01-09 17:02:30 -05:00
Neil Lalonde 259295d865 Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year. 2014-01-09 11:55:04 -05:00
Sam adc9a58f4a BUGFIX: anon cache was mucking with params 2014-01-09 16:49:12 +11:00
Sam 74c1555885 BUGFIX: fix broken spec 2014-01-09 15:11:04 +11:00
Sam 177983afe6 BUGFIX: mobile ui was being cached for anon views 2014-01-09 14:08:42 +11:00
Sam 1533a1163c use_ssl is just confusing, it means use_https , fix name of setting 2014-01-09 10:51:38 +11:00
Neil Lalonde 92f0c6537c FIX: version check job when no versions are returned in json 2014-01-07 14:31:54 -05:00
Régis Hanol e732aa8a86 BUGFIX: we should not store absolute urls for locally uploaded avatar templates
Highly recommended to run: `RAILS_ENV=production bundle exec rake avatars:regenerate` to fix the avatar templates stored in the database.
2014-01-07 17:45:06 +01:00
Sam 660d87a108 BUGFIX: cache did not support non strings
also reduced mocking in tests
2014-01-07 17:36:47 +11: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 9a3ce5f54f there is no need for that much $ 2014-01-06 14:02:42 +01: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 7b7d6f3fa7 Merge pull request #1464 from GarantiaData/single_redis_db
Support single redis DB.
2014-01-05 16:30:41 -08:00
Robin Ward 1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00
Régis Hanol 28bf78d801 BUGFIX: make sure we only show topics that have a useful score in the Top page 2014-01-03 09:15:10 +01:00
Sam b482b280d6 FEATURE: Basic backend support for muted and watched categories 2014-01-02 12:00:29 +11:00
Sam 126433cf65 Merge pull request #1744 from verg/prevent_delete_uncategorized
Prevent deleting 'uncategorized' category
2014-01-01 16:09:49 -08: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 e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
verg 8a830fb8e3 Prevent deleting 'uncategorized' category 2013-12-31 11:22:44 -06:00
Régis Hanol 7fd88a52c9 FEATURE: allow plugins to overwrite handlebars templates 2013-12-31 16:43:29 +01:00
Sam 530b67aabd Merge pull request #1709 from chancancode/boot_to_master
Make Discourse work on Rails master (4.1)
2013-12-30 15:52:29 -08:00
Sam 95cbcc198e FEATURE: add support for gem source in plugins 2013-12-31 09:58:58 +11:00
Godfrey Chan f9110ad4cb No more `with_default_scope` on Rails master, see 94924dc32b 2013-12-30 14:36:51 -08:00
Neil Lalonde 47e1d00f96 Check that common passwords list is greater than 0 2013-12-30 14:26:02 -05:00
Robin Ward 3a459f3634 Support for dry runs when importing via Disqus, replacing text, foreign accents 2013-12-30 11:32:21 -05:00
Sam 9738c4ff48 FEATURE: backport a minimal String#scrub
BUGFIX: invalid byte sequence in email would explode all processing
2013-12-30 14:05:25 +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
Régis Hanol 9c8e50351d first stab at calculating the score of a topic for the top tab 2013-12-27 18:10:35 +01: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
Régis Hanol cb6d83943a only show topics that have activity in top page 2013-12-24 15:26:03 +01:00
Régis Hanol 567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Régis Hanol 0b13b8d7ea Merge pull request #1737 from chancancode/add_missing_references
Added some missing references
2013-12-23 05:51:04 -08:00
Neil Lalonde e44f51f9fa Version bump to v0.9.7.9 2013-12-22 11:28:43 -05:00
Robin Ward 0c45eba037 FIX: Users can edit posts when they've reached the `newuser_max_replies_per_topic` threshold. 2013-12-20 11:30:51 -05: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
Neil Lalonde 33c6997ded Move password validation into PasswordValidator 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
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
Godfrey Chan e41eecb91b Added some missing references, see https://github.com/rails/rails/issues/12982 2013-12-18 15:06:19 -08:00
Neil Lalonde 7fa07f3401 create_account_controller.js passwordRequired needs the same logic as user_authenticator. Make twitter and facebook signup work again. 2013-12-17 12:39:29 -05:00
Régis Hanol 2ce75a8523 FIX: canonical url should not use the CDN 2013-12-17 00:35:34 +01: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 f1a7b63afc FIX: Large `pre` blocks in emails were increasing the width. 2013-12-16 14:41:59 -05:00
Robin Ward acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Régis Hanol ccd0f9c371 add onpdiff tests 2013-12-16 18:39:49 +01:00
Régis Hanol 206ef3dc08 add discourse_diff tests 2013-12-16 18:11:46 +01:00
Régis Hanol c6fb60e0a0 FIX: S3 upload when using dots in bucket name 2013-12-16 11:44:59 +01:00
Sam fa4a8e052f to_a not needed 2013-12-13 19:01:35 +11:00
Sam 1649f56529 work around odd scoping bug in Rails 2013-12-13 19:01:04 +11:00
Sam 05a3c8090f Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
Sam 96fdf72d5e rails master compatability 2013-12-13 17:04:45 +11:00
Régis Hanol 1884bd959f make sure extension-based oneboxes are first to run 2013-12-13 00:56:48 +01:00
Robin Ward b41ee7256e Support for importing Disqus posts into a category 2013-12-12 16:31:24 -05:00
Robin Ward fcad3b8119 Experimental: Disqus XML importer 2013-12-12 15:36:19 -05:00
Régis Hanol c7741c9622 FIX: absolute canonical link on topic pages 2013-12-12 17:24:00 +01:00
Régis Hanol 1d058e57e5 Merge pull request #1729 from S-YOU/master
amazon oneboxer
2013-12-12 02:42:14 -08:00
Régis Hanol fe0188fd24 remove unused diff_engine class 2013-12-12 10:37:57 +01:00
Régis Hanol 06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Jeff Atwood 14328a24ef attempt to fix amazon item descriptions 2013-12-11 16:40:15 -08:00
YOU 43ce37a653 changed . to \. 2013-12-11 16:06:43 +09:00
YOU dacd3409cb added international amazon domains to matcher 2013-12-11 16:05:15 +09:00
Neil Lalonde 763b36baa6 Version bump to v0.9.7.8 2013-12-10 17:42:21 -05:00
Neil Lalonde 557f6ff499 Version bump to v0.9.7.7 2013-12-10 16:15:14 -05:00
Robin Ward 6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Robin Ward 744add9ece FIX: Post count progress was a little off. Minor fix to hidden posts 2013-12-09 14:28:32 -05:00
Sam 6ebc2dcf5c never allow any js that takes longer than 5 seconds to run. 2013-12-09 12:44:09 +11:00
Neil Lalonde ec26063fdc In populate:posts tool, catch post validation errors and retry 2013-12-06 14:39:11 -05:00
Régis Hanol 7bb23c8ce8 FIX: better handle errors in youtube onebox 2013-12-06 12:01:30 +01:00
Régis Hanol 418856a789 make sure assets always use schemaless absolute uris 2013-12-06 11:16:13 +01: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
Scott Albertson 51eff92170 Refactor UsersController#create
* Simplify controller action
* Extract service classes
2013-12-05 10:11:16 -08:00
Neil Lalonde 13da653f2b Add a tool to generate a lot of posts in a topic. thor populate help posts to see usage. 2013-12-05 12:41:24 -05:00
Neil Lalonde 0e44b90c7b Version bump to v0.9.7.6 2013-12-04 16:55:30 -05:00
Robin Ward 8b4c030c16 Small email fixes 2013-12-03 10:11:04 -05:00
Robin Ward 5fd5b18c19 Missing # in email colors 2013-12-02 10:04:29 -05:00
Régis Hanol 5150376e12 add wrapper class for lightboxes 2013-12-02 10:06:48 +01:00
Sam 5e0b22365a skip validations for Spam Rules when needed 2013-12-02 16:13:47 +11:00
Godfrey Chan 6bbea9de0b The Rails JSON encoder API requires `as_json` to take an optional arg 2013-11-29 21:43:44 -08: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
Robin Ward 3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Robin Ward 8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Neil Lalonde 4ec0543362 FIX: emails with embedded posts should always use absolute URLs 2013-11-28 15:57:21 -05:00
Régis Hanol 47e1f1d1fe add classic google maps onebox 2013-11-28 19:23:11 +01:00
Neil Lalonde 1cc72d564f Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error. 2013-11-28 11:06:04 -05:00
Neil Lalonde 617a605ca2 NO_QUNIT=1 disables qunit in autospec 2013-11-28 11:04:53 -05:00
Sam e1db744d6a URGENT: blank string in auto close time was causing stuff to blow up - non mods could not create topics 2013-11-28 12:41:04 +11:00
Régis Hanol 52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01:00
Robin Ward a2b70f64ca FIX: Hidden posts would screw up the docking of the post progress 2013-11-27 14:59:14 -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
Sam d6a14889ac Merge branch 'master' of github.com:discourse/discourse 2013-11-26 10:21:57 +11:00
Sam 3fa48f8d76 Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937 2013-11-26 10:21:41 +11:00
Régis Hanol 6b6c3d05dd FIX stretched thumbnails 2013-11-25 18:36:13 +01:00
Neil Lalonde bc8cd043ad Send the locale of your site to the Discourse Hub 2013-11-22 15:30:47 -05:00
Sam b804f0bec9 add license for oobgc, should not be gpl 2013-11-22 17:04:32 +11:00
Régis Hanol f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Neil Lalonde bcfbacec16 Don't show category descriptions as suggested topics 2013-11-21 16:43:22 -05:00
Neil Lalonde c85fca58b5 Version bump to v0.9.7.5 2013-11-20 17:42:55 -05:00
Robin Ward 5055da76e6 Abort triggers for email body processing 2013-11-20 13:30:01 -05:00
Neil Lalonde f3feb441f9 Allow translations for admin_js in plugins. Use deep_merge so plugins can add to existing sections. 2013-11-20 11:51:07 -05:00
Régis Hanol 31fd5b85bc FIX markdown hotlinked images were not properly pulled 2013-11-20 13:10:08 +01:00
Sam 37267f36a6 we better rm on startup to work around jenkins messing it up, till I figure a cleaner way 2013-11-20 17:31:58 +11:00
Sam 8278fdb9dd relocate emoji plugin, stop pre-compiling assets 2013-11-20 14:38:21 +11: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 309904ef8f Revert "Merge pull request #1673 from aperrault/patch-04"
This reverts commit c9ea89bdd3, reversing
changes made to 9ed49888fc.
2013-11-19 14:08:45 -05:00
Robin Ward c9ea89bdd3 Merge pull request #1673 from aperrault/patch-04
Fixing neglect to determine whether a user has the permission to create ...
2013-11-19 10:50:38 -08:00
Robin Ward 8f0a0059cc Sorting by activity now sorts on `created_at` rather than `bumped_at` 2013-11-19 12:28:50 -05:00
Régis Hanol 3a8bc60bf2 fix build 2013-11-19 17:16:07 +01:00
Régis Hanol 291acca4fa autoload server/client locales in plugins 2013-11-19 16:42:28 +01:00
Autumn Perrault d9c026bec5 Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein. 2013-11-19 05:09:58 -07:00
Sam 67222ce8a0 tune down ... 80k is over aggressive 2013-11-19 15:06:34 +11:00
Sam 518ae2c608 added a minimal number of free slots that should always exist 2013-11-19 14:58:27 +11:00
Sam 2841434e36 slow down decay to accommodate for long polling and other tiny reqs 2013-11-19 14:47:13 +11:00
Sam ef64c1b757 more logging for miss 2013-11-19 14:27:18 +11:00
Sam f61920565a reimplemnt oobgc algorithm 2013-11-19 14:13:42 +11: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
Robin Ward 639394e38a FIX: Pinned topics within a category weren't working without a refresh 2013-11-18 10:52:01 -05:00
Régis Hanol 482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde fc180ccd71 Site settings: move category into the opts hash so that it's compatibale with existing plugins 2013-11-15 14:32:33 -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 2984d649f5 remove log 2013-11-15 18:22:02 +11:00
Sam 8a868bad58 time saving log 2013-11-15 18:21:19 +11:00
Sam ce6b0ff22e remove puts 2013-11-15 17:54:29 +11:00
Sam c1d7bbdc79 more diags 2013-11-15 17:26:58 +11:00
Sam a92ada0493 tune down min requests, tune up largest multiplier, tune up history 2013-11-15 17:17:08 +11:00
Sam 466459db51 more diags for a bit 2013-11-15 17:08:38 +11:00
Sam 8513164b85 lets not explode if init is called incorrectly 2013-11-15 17:03:03 +11:00
Sam 3219afd666 fix bug, num request should be zeroed, better logging 2013-11-15 16:56:21 +11:00
Sam 461972844e unicorn out of band GC 2013-11-15 12:15:49 +11:00
Scott Carleton 908ba32d37 Avoiding double manifest files
Capistrano chokes if there's two manifest files. 
http://meta.discourse.org/t/rails-4-non-digest-assets-and-capistrano/10948?u=scotterc
2013-11-14 18:22:44 -05:00
Neil Lalonde 8a7fa6e467 Version bump to v0.9.7.4 2013-11-14 17:30:10 -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
Robin Ward 968c0672ef Enable column sorting main topic list 2013-11-14 15:50:36 -05:00
Robin Ward bda5a72c6a Server side support for custom ordering of topics 2013-11-13 14:17:06 -05:00
Robin Ward 7207cef7aa TopicQuery cleanup in advance of custom sorting:
- Move SQL method constants into a module
- Removed unused count methods
- Moved methods that don't return a TopicList into Topic
- Replaced some confusing method signatures
2013-11-13 12:26:32 -05:00
Robin Ward df568df9dc Controls for sorting topic columns 2013-11-13 11:48:38 -05:00
Régis Hanol 7e7d951152 do not pull hotlinked images when max_image_size_kb == 0 2013-11-13 17:30:48 +01: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 932c2675a7 work in progress, admin page for upgrades (provides source lives in git) 2013-11-12 16:42:35 +11:00
Régis Hanol d65cd0f97e Merge pull request #1637 from railsaholic/refactor_users_upload_avatar_action
Refactor Users#upload_avatar method
2013-11-11 09:59:30 -08:00
railsaholic 58f78e9001 Refactor Users#upload_avatar method
Moved avatar file upload to ```AvatarUploadService``` class and
```AvatarUploadPolicy```

Address review comments + require missing file in spec
2013-11-11 23:21:14 +05:30
Neil Lalonde fe660ba52b FIX: in Rails 4, ActiveRecord::Base.descendants includes ActiveRecord::SchemaMigration for some reason. Exclude it from export. 2013-11-11 10:49:27 -05:00
Robin Ward be5de4244c FIX: Pinned posts were not displaying at the top of categories. 2013-11-08 15:05:14 -05:00
Neil Lalonde 15c29fdbed Version bump to v0.9.7.3 2013-11-07 17:29:01 -05:00
Neil Lalonde 0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Régis Hanol 706f96af0a rake task to install/update plugins (props to @marcoceppi) 2013-11-07 18:48:23 +01:00
Robin Ward de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Régis Hanol 8d47215ea5 Fixed Youtube videos appearing on top of compose panel (props to @hrobertson) 2013-11-06 17:19:02 +01:00
Régis Hanol 4863c4517a use absolute url for assets too 2013-11-06 16:59:11 +01:00
Régis Hanol 86a60113a6 fix avatars:regenerate rake task 2013-11-06 12:32:27 +01:00
Régis Hanol f8e2ecfa94 keep track of the user who revised a post 2013-11-06 11:43:40 +01:00
Régis Hanol 3992aa971d ninja_edit_window is is seconds, not minutes 2013-11-06 11:08:57 +01:00
Manoj a1e2706c2f Relation#all deprecation warning fix for Rails 4 2013-11-06 01:05:28 +05:30
Régis Hanol 37fd7ab574 pull hotlinked images 2013-11-05 19:07:29 +01:00
Neil Lalonde 8724b2e2b6 Add comments about the IPAddr hack 2013-11-05 11:24:13 -05:00
Régis Hanol e45ab7d4a8 fix rspec reloaders 2013-11-05 14:53:35 +01:00
Régis Hanol eb9c1f28ed add debug mode to autospec 2013-11-05 11:01:17 +01:00
Sam b11e665ecc Rails 4 is now the out-of-the-box default 2013-11-05 09:36:52 +11:00
Robin Ward c86b06e3fa Fix for non-english email polling. 2013-11-04 15:30:24 -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
Sam cc27c5f363 Rails 4 changes behavior of precompile not to include originals
This patch will restore rails 3 beavior and fix emoji etc under rails 4
2013-11-04 09:58:34 +11: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
Régis Hanol b56b11d96a add qunit to autospec 2013-11-01 23:57:50 +01:00
Neil Lalonde e679ba97a3 FIX: categories created by users who are deleted cannot be deleted 2013-11-01 16:56:15 -04:00
Robin Ward 744cd93f28 FIX: Non-English category name regression 2013-10-31 16:25:26 -04:00
Robin Ward 3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Sam 34be27f425 table_exists should be called aggresively while it is false or nil, to avoid bootstrapping issues
don't test 1.9.3 in travis, it blows up randomly due to incorrect implementation of weak refs in 1.9.3
2013-10-30 11:02:10 +11:00
Neil Lalonde 12ef8124cf Version bump to v0.9.7.2 2013-10-29 10:44:21 -04:00
Manoj 9650dbb97c Refactor topics controller
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments

fix typo
2013-10-28 11:42:07 +05:30
Neil Lalonde 4e46d91b8d Refactor SpamRulesEnforcer so that each spam rule is in its own class 2013-10-25 13:25:02 -04:00
Sam 270fde7dbd correct rake test:prepare so it seeds the db correctly
move category creation into seeds as well, so db can be seeded from structure.sql
2013-10-25 10:31:33 +11: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
Régis Hanol 3909f93a7e make sure image onebox is case insensitive 2013-10-24 12:21:38 +02:00
Sam b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam 89f801ac04 fix no sidetiq when using demon 2013-10-24 15:58:28 +11:00
Sam 3565f4c8cf correct monkey patch, disable it from rails4 mode (that has a proper implementation) 2013-10-24 13:35:21 +11:00
Sam b40d15f81d correct runner so you can run it in non-spork mode 2013-10-24 13:34:38 +11:00
Sam ff957a7b37 rails 4 deprecation fixes 2013-10-24 13:02:25 +11:00
Sam 1357f16563 add a simple runner for autospec 2013-10-24 12:08:03 +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 f73a64982a Raise an error if a `api_username` is supplied and does not match the key 2013-10-23 11:05:49 -04:00
Brian Alexander e2a5415aca fix #1567; nil reference in spam_rules_enforcer.rb 2013-10-22 19:14:31 -06:00
Neil Lalonde c1008f4359 Fixes for postgresql inet columns in Rails 4. They're backed by an IPAddr class now, which breaks sql parameter marker support, and automatically sets the attribute to nil when trying to assign an invalid ip address. 2013-10-22 19:19:32 -04: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
Régis Hanol fcd85b8a72 allow plugins to be symlinked 2013-10-21 19:59:28 +02:00
Sam 31b73171dc correct ordering algorithm 2013-10-21 16:14:09 +11:00
Sam 5f74cb6bf9 category is not "positionable" 2013-10-18 18:09:30 +11:00
Sam 1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam 7bf96ee690 naive implementation of post_count on categories 2013-10-18 11:10:10 +11:00
Neil Lalonde aaa2d81900 Version bump to v0.9.7.1 2013-10-17 16:40:54 -04:00
Sam 1b81f73325 logged in requests were being treated as anon, causing major havoc 2013-10-17 10:37:18 +11:00
Robin Ward f27413219e Support for MDTest 2013-10-16 10:28:42 -04: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
Neil Lalonde ff966e3276 FIX: don't load post.rb a second time in dev env 2013-10-15 18:33:06 -04:00
Robin Ward 5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-15 10:53:11 -04:00
Régis Hanol 4536b5fe04 added a job to clean up orphan uploads 2013-10-15 11:15:48 +02:00
Robin Ward af931f0444 Reverting the Sanitizer commit in case we have to do something urgent
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
2013-10-11 16:44:26 -04:00
Robin Ward 9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-11 16:25:40 -04:00
Neil Lalonde 380d8c028f Version bump to v0.9.7 2013-10-11 15:25:55 -04: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
Sam a80d3aa634 no need for this dependency 2013-10-11 12:24:34 +11:00
Sam 172a85ae14 prettier twitter links, extracted mini api 2013-10-11 11:46:35 +11:00
Régis Hanol f244650832 update images:pull_hotlinked rake task to add support for the markdown reference link style 2013-10-10 11:57:36 +02:00
Sam b0465c517e (experimental) added framework for filtering all sorts of internals in discourse and consuming by plugins 2013-10-10 18:45:40 +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
Régis Hanol 15de4ac890 add a rake task to pull hotlinked images 2013-10-10 04:04:08 +02: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
Claus Strasburger 109c10c883 YoutubeOnebox: FIX HTTP-specific URLs
by replacing with protocol-agnostic URLs.
This fixes the mixed-content warning for secure instances of discourse, at least for Youtube
2013-10-09 20:43:59 +02:00
Neil Lalonde acca220380 Allow Youtube onebox with start time. All params are used in the youtube onebox now. 2013-10-09 11:40:10 -04:00
Sam 7993845bfa add current_user_provider so people can override current_user bevior cleanly, see
http://meta.discourse.org/t/amending-current-user-logic-in-discourse/10278
2013-10-09 15:11:54 +11:00
Sam 094b5eccca bug fixes for user_stat extraction, decrease querying 2013-10-07 15:05:00 +11:00
Sam e18b93026a defer view creation on so updates are not performed when people navigate to topics 2013-10-07 15:04:59 +11:00
Sam 5bf26ec34e large refactor, ship a few columns from the user table into user_stats 2013-10-07 15:04:59 +11:00
Robin Ward c8487f6bc7 FIX: Amazon spec 2013-10-04 12:49:39 -04:00
Jeff Atwood 2a97dbbb1f fix amazon onebox to pull images again 2013-10-04 03:39:55 -07:00
Robin Ward f6afbcfb3a Version bump to 0.9.6.4 2013-10-03 15:14:03 -04:00
Sam af467a1675 404 page had horrible perf, it was using "take" instead of limit.
in such cases EVERY row is materialized and only after the limit is applied.

So ... imagine what happens on a forum with 2,000,000 topics
2013-10-02 13:05:03 +10:00
Sam a3128665cf make it more idiomatic 2013-10-02 12:23:16 +10:00
Sam 5f8851cb44 Avoid superfluous transaction when saving drafts 2013-10-02 12:17:27 +10:00
Robin Ward be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Régis Hanol 01075c5e7a FIX database growth when running the PeriodicalUpdates job 2013-10-01 17:11:13 +02: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
Régis Hanol 40c08eab14 do not break oneboxes' favicon after updating favicons 2013-09-30 19:09:57 +02:00
Sam 5caa7a0e4d improve performance of periodical update job, decrease frequency and shift it by a few minutes 2013-09-30 16:59:16 +10:00
Sam a2690efa61 add db time instrumentation to job execution 2013-09-30 13:24:25 +10:00
Régis Hanol ce819b2a92 Merge pull request #1458 from thomas-mcdonald/remove-duplicate-method
Remove duplicate create method in PostCreator
2013-09-27 08:14:42 -07:00
Régis Hanol cd4cda5b4c allow users to specify thumbnail size 2013-09-27 10:57:31 +02:00
Gaurish Sharma f3c9822142 Typo fix 2013-09-24 18:47:57 +05:30
Discourse application 0c8f6ba9a4 Support single redis DB. 2013-09-24 15:47:35 +03:00
Thomas McDonald 5ad8718a87 Remove duplicate create method in PostCreator 2013-09-21 22:02:51 +01:00
Sam e9e017898c Merge pull request #1449 from seblavoie/patch-1
Added screencast.com to whitelist.rb
2013-09-21 10:31:47 -07:00
Robin Ward dba183efec Merge pull request #1455 from alxndr/category-rss-ordered-by-created_at
make category's RSS feed actually order by topic.created_at
2013-09-20 14:59:35 -07:00
Sam Saffron 964809f73b if we have not automatic assets, don't try deleting them 2013-09-20 14:39:14 -07:00
Alexander e7b5774bc6 make category's RSS feed actually order by topic.created_at 2013-09-20 14:36:19 -07:00
Robin Ward e3a56864dd Changes to support Spoiler Alert plugin 2013-09-19 18:01:30 -07:00
Sébastien Lavoie e5854b8b4c Added screencast.com to whitelist.rb
Adding onebox support to screencast.com could be useful.
2013-09-18 13:58:13 -04:00
Robin Ward 99b6a62fcb New composer message for people dominating a topic 2013-09-17 14:38:39 -04:00
Robin Ward 16dc0a7001 New user education notification was off by one. Also, remove the "basic" restriction on the
"posting too often" message.
2013-09-17 12:12:03 -04:00
Robin Ward 2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id
Make the composer and TopicCreator use category id instead of category name
2013-09-17 08:03:48 -07:00
Viktor Palmkvist 37673e3412 Make the composer and TopicCreator use category id instead of category name
Also fixes #1171
Includes backwards compatibility for topic creation
2013-09-17 12:13:19 +02:00
Sam 6af1e12cc1 after_initialize callback for plugins 2013-09-17 10:24:15 +10:00
Nathan Nontell d95172cb5d Allow TextSentinel#seems_unpretentious? to accept words joined with dashes or forward slashes. (Issue 1133) 2013-09-16 09:45:57 -04: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
Zvika Rap b071927ced HandlebarsOneboxes: avoid constants multiple declarations 2013-09-14 22:40:11 +03: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
Robin Ward b39d39dbb6 FIX: Use `post_count` instead of `topic_reply_count` in education for replies. 2013-09-14 00:32:18 -04:00
Neil Lalonde 09b640b782 Disable onebox of user pages 2013-09-13 17:01:28 -04: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
Neil Lalonde 827680766e Show which domains were used in the spam_post_blocked notification 2013-09-12 17:33:30 -04:00
Robin Ward 3fcd331d43 Add records that indicate a user's avatar has been checked 2013-09-12 14:58:20 -04:00
Sam 691377b5af remove patches that have been upstreamed
clean up rails4 checks so they are consistent
2013-09-12 15:39:02 +10:00
Sam 6d5e20fe4a plugins need paths too 2013-09-12 11:29:45 +10: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
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 2319924206 Adds a class that can detect whether a user has uploaded a custom avatar 2013-09-10 15:39:11 -04:00
Robin Ward 21e08a423e Added a little documentation to TurboDev middleware 2013-09-10 15:21:07 -04:00
Sam 36f8c9c45b improve logic and performance on front page to avoid massive query 2013-09-10 16:02:54 +10:00
Sam 279c3a3add rake task to generate api_key 2013-09-10 16:02:26 +10:00
Sam edf6f3012d backport fix for rails 2013-09-10 14:29:37 +10:00
Robin Ward 858e51c8ab Use `no-cache` in development mode for assets. Using `must-revalidate`, which is
Rails' default, seems to have Chrome sometimes not request assets in development
mode even though it's supposed to revalidate every time.
2013-09-09 16:55:41 -04:00
Neil Lalonde 78c15d5810 Move the unique post key storage code into the Post model 2013-09-09 16:17:31 -04: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
Sam b61d5c4092 freedom patches for fixes submitted to rack 2013-09-09 20:35:21 +10:00
Sam 030d2260a7 Perf: don't allocate hashes OVER and OVER in a loop, its bad 2013-09-09 20:35:21 +10:00
Régis Hanol 3e80e885ae rake task to regenerate avatars 2013-09-08 12:22:50 +02:00
Robin Ward c8ad977c8a Revert "Merge pull request #1215 from Elegios/composer_use_category_id"
This reverts commit 763859d439, reversing
changes made to b62caf80fb.
2013-09-06 18:00:57 -04:00
Robin Ward 763859d439 Merge pull request #1215 from Elegios/composer_use_category_id
Make the composer and TopicCreator use category id instead of category name
2013-09-06 11:55:27 -07:00
Neil Lalonde eae7e75611 FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post. 2013-09-06 11:50:15 -04: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
Sam 41a1b6942d notify moderators now goes to the "community" user, that saves our poor mods from a flood of pms
if any staff respond to a pm they are automatically added to the list of recipients and will start
getting email notifications
2013-09-06 14:07:23 +10:00
Neil Lalonde e7cf0a454c Version bump to v0.9.6.3 2013-09-05 18:42:53 -04:00
Neil Lalonde 45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -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
Sam 4933e9d6ab todo added to code 2013-09-05 09:33:51 +10:00
Neil Lalonde d76486a48b Topic can have null user_id when user was nuked 2013-09-04 15:42:24 -04: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
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 8829e1ae20 Merge pull request #1406 from ZogStriP/content-disposition-s3
Content disposition on S3
2013-09-03 07:22:46 -07:00
Sam 7b62f9ccd7 more fixes for rails 4 2013-09-03 19:11:55 +10:00
Sam 5dd199df26 bench fix and new arel patches for rails 4 2013-09-03 18:58:56 +10:00
Sam 1b9079ed20 centralize logic so mockers stop mocking me 2013-09-03 17:58:56 +10:00
Sam 46d5314ec4 Improve Rails4 performance by 20%, before the median on the page is 53ms, after it is 44ms 2013-09-03 17:58:56 +10: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
Neil Lalonde d875a9549d Version bump to v0.9.6.2 2013-08-30 13:41:57 -04:00
Robin Ward 46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Régis Hanol 9d6cb6aae4 added content-disposition header for uploads on S3 2013-08-30 17:28:18 +02:00
Régis Hanol 1a38f66c7e removed warning about already existing constants 2013-08-30 17:28:18 +02:00
Robin Ward eb5830f3b0 FIX: Make `getURL` available to plugins while they are starting up in a similar load order
to the client app.
2013-08-29 13:11:12 -04:00
Sam 39a6c25ebb Merge pull request #1393 from eparreno/cas_authentication
Allow CAS authentication
2013-08-28 14:28:59 -07:00
Neil Lalonde f611a5d898 If min entropy setting is greater than min post/body length setting, then use a sensible min entropy value instead 2013-08-28 11:04:28 -04:00
Emili Parreno ee96fabcba Allow CAS authentication 2013-08-28 14:34:51 +02: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
Sam 28466eb5b2 group the "suggested topics" by category correctly.
in the past new topics were not prioritizing current category and
new topics in a category were not being inserted before other unread topics
in other categories
2013-08-28 10:52:06 +10:00
Sam c0f610daf6 digest interfaces returning empty objects (except for id) interface needed correction 2013-08-28 10:52:06 +10:00
Neil Lalonde 9efa29e688 Detect whether to use mobile view. Session var mobile_view can override automatic detection. 2013-08-27 14:57:42 -04:00
Robin Ward 73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Sam bec463564f BUGFIX: When running under a forking server (apache or unicorn) openid strategy was caching a redis connection from the parent, this made "login with google" only work some of the time. 2013-08-27 14:44:06 +10:00
Robin Ward 29385f4898 Merge pull request #1387 from ZogStriP/fix-schemaless-urls-in-emails
FIX: schemaless urls in emails
2013-08-26 15:15:00 -07:00
Régis Hanol 561792a615 FIX: schemaless urls in emails 2013-08-27 00:08:38 +02:00
Robin Ward 1c3c468675 FIX: Single quotes in search terms would raise an error. 2013-08-26 16:25:54 -04: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
Einar Jonsson 9085cec232 Move json hash from users controller to NicknameUnavailable 2013-08-26 15:00:11 +00:00
Sam 982b763216 correct facebook logic 2013-08-26 18:01:01 +10:00
Sam d0b4c751b7 fix facebook authenticator 2013-08-26 17:36:20 +10:00
Sam afd1a3ac7b yeah ... we should be installing the gem :) 2013-08-26 13:52:15 +10: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 eebe21a8c8 fix open id so it creates records properly 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
Sam b52aba15e0 major refactor of auth, break up the gigantic omniauth controller into sub classes for way better extensibitily 2013-08-26 12:59:17 +10:00
Sam e0c99196a8 Merge pull request #1383 from ZogStriP/add-max-image-height-site-setting
add max_image_height site setting
2013-08-25 17:11:48 -07:00
Régis Hanol 32f717420d add max_image_height site setting 2013-08-26 00:24:24 +02:00
Navin Keswani d87389b38e No more rails 4 deprecation warnings 2013-08-25 23:18:11 +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
Robin Ward 2ce59d2585 FIX: If a topic/post cannot be oneboxed, don't swallow the href. 2013-08-24 15:08:36 -04:00
Neil Lalonde 50bab18206 Version bump to v0.9.6.1 2013-08-23 17:51:10 -04: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
Neil Lalonde 663adde90e Users can change their own username at any time if they have no posts 2013-08-23 11:23:00 -04:00
Neil Lalonde 3b15e2e58e Banned users are not returned as pending review users 2013-08-22 19:23:49 -04:00
Neil Lalonde 25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Robin Ward ff3b163a78 FIX: Another email regexp for quote lines in the format we can recognize including
the site name.
2013-08-21 16:54:51 -04:00
Robin Ward 1004edad1a FIX: Weird markdown in digest emails 2013-08-21 13:13:19 -04:00
Robin Ward 7f69a58439 Replace Markdown parser. 2013-08-21 10:10:57 -04:00
Einar Jonsson 916a3f33f2 Refactored user activation business logic out of UsersController and
into a UserActivator class.
2013-08-21 09:22:34 +00:00
Sam a9393e4a7a paging for flag list
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
2013-08-19 21:14:26 +10:00
Viktor Palmkvist febac442d9 Added backwards compatibility for topic creation 2013-08-19 12:28:24 +02:00
Viktor Palmkvist f8129c4e43 Make the composer and TopicCreator use category id instead of category name
Also fixes #1171
2013-08-19 11:57:35 +02:00
Sam 1cab98bf78 Merge pull request #1336 from novemberkilo/master
First pass at fixing rails4 deprecation warnings
2013-08-18 16:59:07 -07: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
Robin Ward 40599d20e8 FIX: Footer formatting in digest emails 2013-08-16 12:19:26 -04:00
Robin Ward 30caa0d0b0 Merge pull request #1339 from ZogStriP/fix-custom-avatars-in-email
FIX: custom avatars in email
2013-08-16 07:18:34 -07:00
Navin 2e700dd26d Patch ActiveRecord::Relation#references and clean up 2013-08-16 14:53:40 +02:00
Giuseppe Capizzi eaede108c7 Remove duplication from Guardian 2013-08-16 14:24:29 +02:00
Régis Hanol 2119774fb6 FIX: custom avatars in email 2013-08-16 09:58:20 +02:00
Sam b60c8080e5 Merge pull request #1337 from ZogStriP/avatar-work
Avatar work
2013-08-15 21:50:37 -07:00
Sam b2b01fd26c Urgent Bugfix: workaround therubyracer corruption when it is run within a fiber 2013-08-16 13:08:23 +10:00
Sam be4b326f46 avoid calling v8 multiple times ( makes certain testing simpler) 2013-08-16 13:03:47 +10:00
Jeff Atwood 9a2f758a00 remove unnecessary font-size on digest <a> 2013-08-15 16:52:10 -07:00
Régis Hanol c9969738bf FIX: N+1 query for avatars when searching for users 2013-08-16 00:26:49 +02:00
Régis Hanol 9724d3bf42 FIX: avatars in discourse's topic oneboxes 2013-08-16 00:26:49 +02:00
Jeff Atwood 8303f48004 add dimmed color to digest footer 2013-08-15 15:18:11 -07:00
Robin Ward c5c29e9c4c Revert "Revert "eliminate a class of v8 initialization bugs due to concurrency in sidekiq""
This reverts commit f1a693c8b7.
2013-08-15 18:12:10 -04:00
Robin Ward f1a693c8b7 Revert "eliminate a class of v8 initialization bugs due to concurrency in sidekiq"
This reverts commit 883db5798b.
2013-08-15 17:22:45 -04:00
Navin 9ab2471a92 Fix rails4 deprecation warnings
That appear when running topic_spec.rb
2013-08-15 17:52:18 +02:00
Sam 883db5798b eliminate a class of v8 initialization bugs due to concurrency in sidekiq 2013-08-15 21:16:37 +10:00
Sam a7eea65d53 se onebox could exception out 2013-08-15 21:16:37 +10:00
Sam 1eecb0cee5 use sigterm as opposed to hup, cause spork was not handling the hup correctly 2013-08-15 12:55:45 +10:00
Sam 1f0de36e41 extract method 2013-08-15 11:11:14 +10:00
Sam 628ec101c7 minor refactoring 2013-08-06 06:34:42 +10:00
Sam c2653b2915 Merge pull request #1309 from stephankaag/sidetiq
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Sam 997f2ee63a Merge pull request #1317 from novemberkilo/master
Extract methods to improve flog score of TopicView
2013-08-14 16:50:13 -07:00
Robin Ward 693bd7d7db Merge pull request #1328 from abbat/patch-1
Generate avatars with transparent background
2013-08-14 15:10:29 -07: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
Robin Ward b7c50ecdaa FIX: Respect protocol relative URLs in email styling 2013-08-14 11:32:17 -04:00
Anton Batenev 6b0e8e2ec1 Generate avatars with transparent background
Generate avatars with transparent background (for .png images) or with white background (for others).
2013-08-14 19:13:43 +04:00
Robin Ward 7cfb583016 Merge pull request #1324 from meglio/oneboxers
Add oneboxers for popular learning resources
2013-08-14 06:58:31 -07:00
Régis Hanol 4866f4d8f5 FIX: N+1 query for avatars 2013-08-14 15:25:05 +02:00
Anton Andriyevskyy a9ddad2b79 Add oneboxers for popular learning resources 2013-08-14 15:49:40 +03:00
Navin 2ea15adad9 Extract methods to improve flog score of TopicView 2013-08-13 18:23:04 +02: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
Robin Ward 1e730ccffe Suggested Topics tweak: Prefer topics in the same category 2013-08-08 13:18:52 -04:00
Neil Lalonde 62c0b109a4 Version bump to v0.9.6 2013-08-07 18:47:04 -04:00
Robin Ward fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Robin Ward de3c657ea3 FIX: Oneboxes with incorrect URL 2013-08-05 16:15:16 -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 0cc37ca331 generate avatars rake task 2013-08-13 22:08:43 +02:00
Régis Hanol c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Neil Lalonde ed060ed5f1 Change trust level logs the previous trust level 2013-08-13 12:04:28 -04:00
Neil Lalonde b8a1e21dbd Delete all posts is allowed for the same amount of time as delete user 2013-08-13 11:11:05 -04: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 4034dee3dc Add screenr to oneboxer whitelist 2013-08-13 15:54:43 -04:00
Neil Lalonde 98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Régis Hanol 4ec9b3ea39 fix: git-version isn't showing up 2013-08-02 23:25:57 +02: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
Sam 2b3cdf9f38 allow onebox whitelist to be extended 2013-08-02 15:48:35 +10:00
Sam 3246f066c6 an attempt at getting this working on rails 4 ... not fruitful 2013-08-02 10:31:36 +10:00
Robin Ward 4f0713b9da Merge pull request #1275 from ZogStriP/enable-thumbnailing-on-s3
Enable thumbnailing on s3
2013-08-01 07:35:35 -07:00
Sam 1132c10074 support server side js and arbitrary assets
proper chaining for emoji so other hooks can be called
2013-08-01 17:35:31 +10:00
Sam 4fcba7a6f1 when there are no providers do not blow up 2013-08-01 16:05:46 +10:00
Sam 1837cb769c pretty text would blow up on an <a tag with no href 2013-08-01 16:02:43 +10:00
Sam 160107a712 working plugin interface for custom openid auth, custom css and custom js 2013-08-01 16:02:43 +10:00
Sam 61b330abb4 odd formatting 2013-08-01 16:02:43 +10:00
Régis Hanol ed9417fa3b enable thumbnailing on S3
- added url to optimized image model
- refactored s3_store & local_store
2013-07-31 23:26:34 +02:00
Régis Hanol 36b6b8d78e removed old rake task until it's updated 2013-07-31 23:24:16 +02:00
Neil Lalonde 2c1326f89b Send login_required to discourse hub 2013-07-30 17:52:47 -04:00
Neil Lalonde 06140740d0 Version checks: tolerate old version check data that can happen immediately after upgrading but forgetting to restart sidekiq/clockwork. Don't cache version check data along with other dashboard data. 2013-07-30 12:12:04 -04:00
Sam df3a4c05cd upgrade rack mini profiler
fixes for ruby 1.9.3
2013-07-30 17:36:34 +10:00
Sam 9749001b54 a much more robust qunit daemonizer 2013-07-30 14:15:20 +10:00
Sam 7e5c7f5987 fork web server, makes much more sense 2013-07-30 13:04:29 +10:00
Sam 5aa50699f0 tweak so more time for starup 2013-07-30 12:35:41 +10:00
Sam 85ddf73cf3 make qunit at least wait for a network connection 2013-07-30 12:32:12 +10:00
Sam 8ec6d0ea6c let's not run 3 queries, when a single query will do. 2013-07-30 09:54:29 +10:00
Neil Lalonde 7661a5fed2 Version bump to v0.9.5.2 2013-07-29 18:34:04 -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 e076158789 Add ip_address, email, and context to staff_action_logs table. Context should usually be the url from which the staff member performed the action, but could be any string that describes what the staff member was doing when the action was performed. 2013-07-29 15:29:43 -04:00
Neil Lalonde 8cee3a9fcd Add a way to add email to block list when nuking a user 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
Neil Lalonde e25638dab0 add a way to delete posts and topics when deleting a user with UserDestroyer 2013-07-29 15:29:43 -04:00
Neil Lalonde a8df9778b5 Rename AdminLog to StaffActionLog 2013-07-29 15:29:43 -04:00
Jeff Atwood 412e600106 remove email footer font override
looks hideous to have mismatching body and footer fonts on anything
retina
2013-07-28 23:00:02 -07:00
Sam aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Sam 4a20d09523 distributed memoizer added to ensure absolute duplicate posts don't get through
in case of an absolute dupe just return the memoized post

This works around issues with wordpress being crazy
2013-07-29 12:25:19 +10:00
Sam 896e493531 don't ever delete unprocessable emails 2013-07-28 09:54:15 +10:00
Sam 0320a5ae64 correct email styles 2013-07-27 08:09:32 +10:00
Robin Ward 29519ece23 Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
2013-07-26 11:30:40 -04:00
Sam d51dcd1705 improve email styling, include extra respond link 2013-07-26 17:27:46 +10:00
James Anderson d7d3be1130 Add audio onebox
http://meta.discourse.org/t/audio-html5-tag/8168
2013-07-25 19:03:23 -07:00
Neil Lalonde cc79d22f82 Version bump to v0.9.5.1 2013-07-25 17:16:13 -04:00
Robin Ward 0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Sam e922f10f4e correct locale helper so it falls back to english message format if mf is missing 2013-07-25 11:16:07 +10:00
Sam d0f50cb266 fixing up moment locales, they were not set up properly 2013-07-25 11:09:29 +10:00
Sam 9351a7bcb1 Merge pull request #1244 from stephankaag/rails4updates
Rails 4 updates
2013-07-24 14:16:32 -07:00
Stephan Kaag f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
Neil Lalonde e0b9117f15 Fix for emails with empty body 2013-07-24 15:07:51 -04:00
Robin Ward 2319a824f8 Special work to never include previous posts in parsed emails. Also a new attempt
to catch reply strings in different languages.
2013-07-24 14:22:32 -04:00