Commit Graph

1168 Commits

Author SHA1 Message Date
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