Commit graph

796 commits

Author SHA1 Message Date
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
Sam
0a7bbb08e1 fix broken build 2013-07-24 17:24:55 +10:00
Sam
366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
Neil Lalonde
cf102be953 Allow deletion of a post belonging to a deleted topic, so that users can be destroyed 2013-07-23 11:50:58 -04:00
Robin Ward
adf7c9ad06 Merge pull request #1237 from stephankaag/improve_post_analyzing
Improve post analyzing
2013-07-23 07:07:49 -07:00
Sam
ef201e02d7 Merge pull request #1238 from ZogStriP/moar-bullets
change the pipe into a bullet in the lightbox overlay
2013-07-23 00:41:47 -07:00
Sam
4b735a5a09 Merge pull request #1239 from abbat/patch-1
Add russian stemmer for FTS
2013-07-23 00:39:00 -07:00
Sam
478ae6d6c7 correct bug where delete stub job would fail when attempting to delete stubs off deleted topics
skip deleting stubs if a post is actively flagged
2013-07-23 16:11:44 +10:00
Doug Alcorn
35a2bb7919 Parameterize the PBKDF2 algorithm in application config
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
2013-07-22 21:36:01 -04:00
Sam
7b1f9928e4 staff can change trust levels 2013-07-23 09:13:48 +10:00
Anton Batenev
4a6a4db241 Add russian stemmer for FTS 2013-07-23 02:05:18 +04:00
Sam
ea7684fb32 Merge pull request #1226 from stephankaag/rails4_updates
Some Rails4 updates
2013-07-22 15:03:37 -07:00
Régis Hanol
dbf6fb0232 change the pipe into a bullet in the lightbox overlay 2013-07-22 22:41:08 +02:00
Stephan Kaag
ad2b667504 Remove dead code 2013-07-22 22:16:46 +02:00
Robin Ward
5398553628 Merge pull request #1234 from stephankaag/template_args
Determine template_args only once per instance
2013-07-22 12:20:23 -07:00
Robin Ward
3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
Stephan Kaag
ea51f0fe04 Determine template_args only once per instance 2013-07-22 20:20:41 +02:00
Stephan Kaag
b19f631b3a Some Rails4 updates 2013-07-22 19:01:22 +02:00
Robin Ward
ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues
Fix s3 related issues
2013-07-22 07:30:41 -07:00
Robin Ward
80a0943f54 Merge pull request #1228 from ZogStriP/fix-thumbnailing-with-cdn-enabled
FIX: thumbnailing isn't working with CDN enabled
2013-07-22 07:22:59 -07:00
Robin Ward
8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting
add newuser-max-attachments setting
2013-07-22 07:22:23 -07:00
Neil Lalonde
e7fec0c405 Exporter: add ordering for more tables without id column 2013-07-22 09:49:17 -04:00
Sam
1f3c5cb656 allow end user to recover a post they delete
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
Sam
58e7c3e1f3 push some work out of AR callbacks into PostCreator, add a couple of helpers for post and topic creation in test
fix it so the auto_track false marks topics as new
2013-07-22 15:07:20 +10:00
Sam
31bb08bcdd added an option to bypass auto tracking of topics on post creation 2013-07-22 15:07:20 +10:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
649ab85740 FIX: thumbnailing wasn't working with CDN enabled 2013-07-22 00:37:23 +02:00
Sam
e7e00601c6 ok, we now dual boot rails 4 and rails 3 ... to run in rails 4 mode: RAILS4=1 bundle exec thin start 2013-07-21 10:56:48 +10:00
Régis Hanol
33977252c9 rollback to previous s3 syntax (ie. subdomains) 2013-07-20 11:30:36 +02:00
Robin Ward
147a239b28 Prefer unread topics in the same category 2013-07-18 14:47:59 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
Robin Ward
2d466d72ca Merge pull request #1207 from stephankaag/refactor_topic_query
Refactor topic_query.rb for better readability
2013-07-17 06:55:54 -07:00
Sam
81616a46ba db consistency check for mismatching topic_ids in user_actions
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
2013-07-17 16:40:56 +10:00
Régis Hanol
5c27dd175a make sure we handle both s3 url formats 2013-07-17 00:32:09 +02:00
Régis Hanol
7ae2fe304d renamed s3 to s3_store 2013-07-17 00:27:52 +02:00
Régis Hanol
f40cad0f4b changed s3 urls to using the folder convention 2013-07-17 00:27:52 +02:00
Régis Hanol
3136638b4b FIX: CDN doesn't work with S3 2013-07-16 22:16:33 +02:00
Stephan Kaag
6067736562 Refactor topic_query.rb for better readability
- Available options are defined and validated
- Internal methods are now protected
- Renamed some variables to be more consistent
2013-07-16 21:20:18 +02:00
Sam
c49731a91b fix failing server side quote localisation change 2013-07-16 17:48:48 +10:00
Sam
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Sam
352ac9e60c Finalize read only and post only categories, finished off UI work 2013-07-16 15:46:11 +10:00
Sam
ecf17cfebb work in progress, add fidelity to category group permissions (full, create posts, readonly) 2013-07-16 15:46:11 +10:00
Robin Ward
e83cd9d111 FIX: If you don't have permission to onebox a post, just show the link instead of crashing out 2013-07-15 15:10:05 -04:00
premprakash
8c5e0e7550 Adding Portuguese-Brazil language 2013-07-15 14:45:16 -03:00
Robin Ward
ed60f24502 Merge pull request #1194 from ZogStriP/uploads
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Robin Ward
19e0feac75 Merge pull request #1185 from novemberkilo/master
Reduce complexity of TopicView
2013-07-15 07:05:41 -07:00
Sam
8947d1aeac Merge pull request #1187 from stephankaag/refactor_array_concatenation
Refactor array concatenation
2013-07-15 03:13:44 -07:00
Régis Hanol
3397c2235f display the size of the attachment in the preview
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
Stephan Kaag
9c243aa9ce Simplify avatar lookup class 2013-07-12 23:10:21 +02:00
Stephan Kaag
f53ba6a3b0 Refactor array concatenation 2013-07-12 21:49:11 +02:00
Robin Ward
a43ed88699 Prefer your own topics in Suggested 2013-07-12 14:38:20 -04:00
Robin Ward
6ca5df0a09 Can recover deleted topics. Deleted topics show the first post as deleted in the UI. 2013-07-12 12:09:17 -04:00
Navin
9c5b5e3c7d Refactor TopicView - extract filter method to FilterBestPosts
Still much to do but this should reduce the complexity scores
for TopicView
2013-07-12 15:54:54 +02:00
Robin Ward
89152116c6 Only send digests to active users 2013-07-11 18:47:36 -04:00
Neil Lalonde
6c3c77df66 Version bump to v0.9.5 2013-07-11 17:26:14 -04:00
Robin Ward
19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments
Attachments
2013-07-11 06:49:20 -07:00
Sam
1aef6de4b0 automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
Régis Hanol
da614597fe post process attachments 2013-07-10 22:59:53 +02:00
Régis Hanol
27ab5f471c support arbitrary attachments 2013-07-10 22:59:53 +02:00
Neil Lalonde
8814f9ed05 Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records 2013-07-10 16:52:47 -04:00
Robin Ward
cc47616cdb Merge pull request #1157 from abbat/email-custom-headers
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Anton Batenev
60c49a85d0 Refactoring #1157 2013-07-10 17:47:38 +04:00
Sam
db196ee126 rake autospec should handle css file watching and reloading, guard is a bit pear shape at the moment 2013-07-10 12:16:56 +10:00
Neil Lalonde
7977deb3bf Don't allow editing of title and category of an archived topic 2013-07-09 16:54:46 -04:00
Robin Ward
b7327942af Add deleted_by to Trashable tables 2013-07-09 15:46:36 -04:00
Neil Lalonde
baf698f3c9 Merge pull request #1127 from rylnd/refactor_tmp_directory
Refactor #tmp_directory into helper module
2013-07-09 12:17:42 -07:00
Neil Lalonde
ba7a4e9845 Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts
Log all changes of user trust level by an admin
2013-07-09 12:16:08 -07:00
Ryland Herrick and Vipul A M
591a5c0e13 Refactor temp directory methods into helper module 2013-07-09 13:59:31 -05:00
Neil Lalonde
7348699801 Fix order of View table in exporter 2013-07-09 14:58:49 -04:00
Neil Lalonde
3c38062802 Check for updates: edge cases when the message on the dashboard doesn't make sense. 2013-07-09 14:01:08 -04:00
Anton Batenev
b0dbb0ea13 And add tests for empty string & null 2013-07-09 20:19:10 +04:00
Robin Ward
5cda0e556c Merge pull request #1111 from jamesaanderson/flash-video-onebox
Add flash video onebox support
2013-07-09 06:55:56 -07:00
Robin Ward
437175b102 Merge pull request #1166 from jamesaanderson/mobile-and-tablet-video-rendering-fix
Mobile and tablet video rendering fix
2013-07-09 06:44:49 -07:00
James Anderson
171e703e11 Mobile and tablet video rendering fix
http://meta.discourse.org/t/chrome-for-ipad-iphone-breaks-with-this-video-embed/7983
2013-07-08 17:22:25 -07:00
Neil Lalonde
9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Robin Ward
cfc4dda9ff FIX: OpenGraph should feature the desired post, if found in the set. 2013-07-08 12:21:39 -04:00
Robin Ward
013ad0fdda Added In-Reply-To and References email headers. Additionally removed username from
email replies and new posts to keep the subjects collapsable.
2013-07-08 11:48:40 -04:00
James A. Anderson & Jalil Mohammed
d51a3cf50f Add flash video onebox as disabled setting by default 2013-07-08 06:37:44 -07:00
Navin
45d85f4054 If the change doesn't go through, don't log anything 2013-07-08 12:51:35 +02:00
Navin
d77ce23de2 Log all changes of user trust level by an admin 2013-07-08 11:53:22 +02:00
Sam
f1a31cd9e6 Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor
refactored CookedPostProcessor
2013-07-07 22:01:48 -07:00
Sam
f6a8f6cfe5 don't notify on moderator actions, they just cause noise,
also filter out pms properly while at it
2013-07-08 12:44:55 +10:00
Régis Hanol
ac7253a938 refactor CookedPostProcessor & specs 2013-07-08 01:39:08 +02:00
Anton Batenev
4e04c4dddd Add custom headers for email messages
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
2013-07-07 04:37:44 +04:00
Robin Ward
337f393af5 Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
Régis Hanol
6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Régis Hanol
6d1d887b96 relaunch all the specs when a fabricator is modified 2013-07-06 19:05:23 +02:00
Robin Ward
88ca51bb00 FIX: Wordpress route wasn't updating filter count correctly 2013-07-05 16:59:16 -04:00
Robin Ward
6cd6484b5e New mode for Wordpress: Filter ONLY posts liked by moderators 2013-07-05 16:07:24 -04:00
Robin Ward
4c90b16681 FIX: Next pages were missing on <noscript> content. Also fixed some long standing bugs. 2013-07-05 14:45:54 -04:00
Sam
a1f1849392 getting weird exceptions after handling one, work around 2013-07-05 17:44:32 +10:00
Sam
1db9108c1b add some error handling 2013-07-05 16:55:14 +10:00
Sam
50767be722 user where as opposed to find to compensate for deleted topics 2013-07-05 15:21:04 +10:00
Robin Ward
2d821d1ff4 Clicking the #site-logo will refresh the latest list. 2013-07-04 17:31:06 -04:00
Robin Ward
4a3bc1fb43 More Javascript Tests + Fixtures. Also a rake task to crawl them. 2013-07-04 16:20:43 -04:00
Robin Ward
ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Sam
f9120f1250 let us not fail the spec suite cause the local provider for site settings reloads. 2013-07-04 16:49:17 +10:00
Régis Hanol
5a56af03bc FIX: can no longer paste image in Chrome post editor 2013-07-04 00:39:23 +02:00
Robin Ward
6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls
Conflicts:
	app/services/spam_rules_enforcer.rb
2013-07-03 11:13:56 -04:00
Navin
3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Sam
4d4a5735d2 logic to bypass trust level filter for high scoring posts 2013-07-03 12:37:17 +10:00
Robin Ward
7f70bc3bbd Add discourse.forum to all List-Ids 2013-07-02 15:21:34 -04:00
Robin Ward
fab1be7c8e Adds a List-Id header to outgoing mail 2013-07-02 14:13:46 -04:00
Stephan Kaag
89b621d31a Refactor update_all statements in order to prevent deprecation warnings in Rails 4 2013-07-02 18:36:47 +02:00
Robin Ward
5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Ryland Herrick and Vipul A M
2ffdc5fa27 Refactor duplicated #log method 2013-07-01 21:57:18 -05:00
Sam
f6b850e7a4 allow skipping the validations on creation if its an api call AND skip_validations is specified
this allows wordpress plugin to post very very short titles or titles that would otherwise be disallowed
2013-07-02 12:23:19 +10:00
Sam
b92e912ac9 add min replies, min score and min trust level params for wordpress 2013-07-01 21:29:45 +10:00
Robin Ward
023d18cab2 FIX: Admins should be able to post short titles. This is especially important for when syndicating
a blog via the wordpress plugin into Discourse.
2013-06-29 17:57:10 -04:00
Robin Ward
e076661759 Merge pull request #1110 from ZogStriP/fix-updating-min-topic-title-length-needs-a-restart
FIX: updating  needs a restart
2013-06-29 14:10:49 -07:00
Robin Ward
8fa3eaea13 Merge pull request #1112 from jamesaanderson/use-existing-method
Use existing image_html method
2013-06-29 14:06:27 -07:00
Régis Hanol
5df9370ebe Update search_result.rb
Fix code styling
2013-06-29 21:45:15 +02:00
James A. Anderson & Jalil Mohammed
635ec38222 Use existing image_html method 2013-06-29 11:20:18 -07:00
James A. Anderson & Jalil Mohammed
34dc6a41d9 Add flash video onebox support
http://meta.discourse.org/t/will-there-be-flash-videos-in-the-future/7787
2013-06-29 10:53:03 -07:00
Sam
95facde04f Merge pull request #1109 from ZogStriP/fix-search-results-for-posts
fix deep link to post in search
2013-06-29 04:11:38 -07:00
Sam
5e7ffd830e hard code best requires trust level > 0, make it configurable later 2013-06-29 21:09:13 +10:00
Régis Hanol
121d08e25f FIX: updating needs a restart 2013-06-29 03:49:54 +02:00
Régis Hanol
9656759ecf fix deep link to post in search 2013-06-29 03:22:17 +02:00
Robin Ward
6106057328 FIX: Can view best filter while logged in 2013-06-28 12:20:06 -04:00
Sam
966513a66d my spec suite has been playing up attempting to clean some stuff by avoiding type checks 2013-06-28 12:18:04 +10:00
Neil Lalonde
94b8286819 Configurable FAQ url 2013-06-27 12:10:43 -04:00
Jeff Atwood
63d967e634 Merge pull request #1097 from ZogStriP/blob-blob-blob
provide a way to give a default filename to pasted images...
2013-06-26 16:24:51 -07:00
Neil Lalonde
b47f6e80b8 Version bump to v0.9.4 2013-06-26 17:55:12 -04:00
Régis Hanol
72745d257d provide a way to give a default filename to pasted images in the lightbox overlay 2013-06-26 21:54:08 +02:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Régis Hanol
d3eae56e71 soften the lightbox overlay 2013-06-26 02:44:20 +02:00
Neil Lalonde
b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Robin Ward
3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers
before sending the message as they are no longer needed.
2013-06-25 11:35:26 -04:00
Robin Ward
3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Régis Hanol
da52ac88b0 do not throw exception when parsing a bad URI 2013-06-24 21:38:00 +02:00
Sam
ea932b74e7 values is a much more consistent name than all_values ... we use {}.values not {}.all_values
also fixes random ordering of tests failure in site settings
2013-06-23 15:07:49 +10:00
Sam
22d6f6784c Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3
FIX: lightbox wasn't working when using s3 upload
2013-06-23 22:11:45 -07:00
Sam
7c726bd235 Merge pull request #1079 from ZogStriP/do-not-lightbox-oneboxed-images
do not lightbox oneboxed images
2013-06-23 22:07:25 -07:00
Régis Hanol
361062d53e do not lightbox oneboxed images 2013-06-24 02:10:21 +02:00
Sam
0b94c3c456 fix all sorts of issues with random spec order
SiteSetting no longer persisted across tests
2013-06-23 13:35:25 +10:00
Régis Hanol
08aa23f0ca FIX: lightbox wasn't working when using s3 upload 2013-06-22 13:38:42 +02:00
Robin Ward
456cff17f8 FIX: If the image has no thumbnail, don't update the src 2013-06-21 14:32:42 -04:00