github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 11:52:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,576 Commits 190 Branches 500 Tags 938 MiB
8fff53775a
Commit Graph

1065 Commits

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