github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 20:20:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
38,006 Commits 190 Branches 500 Tags 938 MiB
e29afa200a
Commit Graph

7304 Commits

Author SHA1 Message Date
Neil Lalonde
4413d2a92b Version bump to v0.8.6 2013-04-12 16:55:24 -04:00
Neil Lalonde
651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam
e969eb14e8 added 2 new flag types: notify user and notify moderators 
fixed up messed up user navigation
refactored
 2013-04-12 17:55:45 +10:00
Sam
e1b958d483 oops 2013-04-11 21:31:56 +10:00
Sam
850b042cab introduce rack:cache as a default, so users don't need to configure apache or nginx 
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)

reorganised so mini profilers can be cleanly disabled from config file

added caching for categories index

move production.rb to production.sample.rb
 2013-04-11 16:24:21 +10:00
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles 
auto replace rules in titles
 2013-04-10 21:12:20 -07:00
Kuba Brecka
17becd0e5f update the list of i18n postgre stemmers 2013-04-10 19:45:29 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
33e3ad1603 clean up onebox application so it uses a single code path 
use fragments for oneboxes
strip parent <p> if <div> is in it
clean some tests
 2013-04-10 17:52:38 +10:00
Robin Ward
00f9e628e0 Don't apply markdown to content of [quote] -- it messes up spacing. 2013-04-09 17:32:50 -04:00
Sam
47fb99198a path to asset is insanely slow cause it is pluralizing the word "javascript" over and over and over and over again. 2013-04-09 11:54:00 +10:00
Robin Ward
8942d9a094 Okay, THIS time the specs should pass. Geez. 2013-04-08 11:23:03 -04:00
Robin Ward
9c461aced4 Safer code - check that topic is present. 2013-04-08 11:01:55 -04:00
Robin Ward
1715aa66d9 Fixes issue with featuring topic users 2013-04-08 10:51:01 -04:00
Sam
9ad320768e Merge pull request #667 from ZogStriP/dont-track-links-in-oneboxes 
don't track links in oneboxes
 2013-04-07 18:30:24 -07:00
Régis Hanol
d080ae4d2d don't track links in oneboxes 2013-04-08 02:24:12 +02:00
Sam
3d3b589b4d for now, run seed fu automatically after migrate ... still think there should be a cleaner way 2013-04-08 09:56:42 +10:00
Robin Ward
a14f62766e Replace MultisiteI18n hack with SiteContent and admin editing. 2013-04-05 16:48:15 -04:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Robin Ward
af9b27358c If an admin or moderator edits a visitor's post, the restrictions should be based 
on the *editors* access rights, not the original poster.
 2013-04-05 13:59:00 -04:00
Wojciech Kocjan
68bdab6635 Post processing of images adds prefix second time when post processing a post with one or more images if running with a prefix 2013-04-05 12:38:20 +02:00
Sam
a2cca2540e some minimal site settings diags 
fix issue where days_visited was totally out of sync
 2013-04-05 17:47:54 +11:00
Sam
a7f92ec0c1 topic reply count resync for each new post 2013-04-05 17:47:54 +11:00
Sam
bf8e756175 Merge pull request #637 from wojciechka/master 
Putting rootURL in JavaScript using Discourse::base_uri and erb
 2013-04-04 21:42:54 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Wojciech Kocjan
a875b1c44a Store base URI in Discourse.BaseUri and use it in all places where rootURL was previously used 2013-04-04 11:16:38 +02:00
Régis Hanol
7105349f1f FIX: accessing a topic with a 'page' parameter 2013-04-04 00:12:27 +02:00
Robin Ward
738789f336 Admins can't lock themselves out of a site by setting approval. 2013-04-03 12:23:28 -04:00
Régis Hanol
cf3eb98321 add GitHub commit onebox 2013-04-03 03:36:38 +02:00
Robin Ward
ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Neil Lalonde
9e269fbc7c Bump version to 0.8.5 2013-04-02 10:16:14 -04:00
Kuba Brecka
b1249df598 update i18n:stats task to count pluralization based on locale setting 2013-04-02 14:56:26 +02:00
Sam
08af09cd7d don't pass notification email into to the default cause it freezes in a potentially incorrect value 2013-04-02 13:29:34 +11:00
Sam
6ac8911a4e critical bug, onion not whitelisted, how could this be 2013-04-02 12:11:03 +11:00
Sam
2cc6f1159c exact username match first 2013-04-02 11:58:03 +11:00
Kuba Brecka
fd6c5c2068 let's make the "script/generate-pseudolocalization.rb" a rake task 2013-04-01 22:56:25 +02:00
Robin Ward
b54054c1d3 No idea why these tests weren't failing for me in guard when I pushed last time. Fixed! 2013-04-01 14:54:53 -04:00
Robin Ward
1e6f8dc93a Include uncategorized pinned topics on 'Hot' 2013-04-01 13:49:35 -04:00
Robin Ward
92eaa69df9 Merge pull request #589 from goshakkk/user-admin-scope 
Create the User.admins and User.moderators scopes
 2013-03-29 10:06:28 -07:00
Robin Ward
df3ae184f9 Fix: best_of flag was not being updated properly 2013-03-29 12:54:16 -04:00
Gosha Arinich
bdfa9b0508 create the User.admins and User.moderators scopes 2013-03-29 09:52:09 +03:00
Robin Ward
a819a26f34 BUGFIX: New status posts weren't using PostCreator 2013-03-28 16:40:54 -04:00
Robin Ward
473a64d39d Add score, percent_rank to topics. Adds HotTopic model and consolidated job to calculate 
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
 2013-03-28 15:39:54 -04:00
Régis Hanol
1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Sam
2295290383 added best=N option to get N best comment on a post 2013-03-27 22:53:11 -07:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Robin Ward
f1e2923a91 Display correct post counts, even with a filter active 2013-03-26 15:06:23 -04:00
Robin Ward
5dc47c2d82 Rename posts_count in topic view to post_counts_by_user which makes much more sense 2013-03-26 14:06:24 -04:00
Robin Ward
2efd3e61c7 TopicView respects sort_order and better specs 2013-03-26 13:27:11 -04:00
Sam
c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam
36d60befbd mini profiler fix for multisite 2013-03-25 18:04:46 -07:00
Robin Ward
90443dac30 Don't email about posts if the user deleted it. 2013-03-25 13:40:48 -04:00
Neil Lalonde
95a939d6af Fail version_check job silently in development mode 2013-03-25 11:35:48 -04:00
Neil Lalonde
4fec7d26fa Merge pull request #550 from kubabrecka/memtotal_macos 
implement MemInfo.mem_total on Mac OS X
 2013-03-25 07:11:16 -07:00
Sam
deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax 
Convert a lot of :a => b to a: b and bring peace to the world
 2013-03-24 16:43:17 -07:00
Karan Misra
5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam
ca997721b1 Merge pull request #532 from kubabrecka/fix_duplicate_tokens 
fix duplicate auth_token in development database images
 2013-03-24 16:32:48 -07:00
Régis Hanol
7d43058d20 FIX: Email notification for different user being mentioned 2013-03-24 01:57:00 +01:00
Kuba Brecka
0e27af8473 implement MemInfo.mem_total on Mac OS X 2013-03-23 16:57:47 +01:00
Robin Ward
7642f56e35 Merge pull request #542 from kubabrecka/translation_status2 
translation status script, take 2
 2013-03-23 07:34:32 -07:00
Kuba Brecka
2d405be467 translation status script, take 2 2013-03-23 12:14:59 +01:00
Kuba Brecka
4424328bff remove unnecessary .gitkeep files 2013-03-23 10:45:40 +01:00
Neil Lalonde
aa6e87c5c1 Dashboard memory warning 2013-03-22 15:47:35 -04:00
Robin Ward
9c38c13ac5 The "Best Of" mode uses a percentage ranking of posts. 2013-03-22 15:44:39 -04:00
Kuba Brecka
113d0e0257 fix duplicate auth_token in development database images 2013-03-22 18:33:56 +01:00
Neil Lalonde
6f8d13d47e Dashboard warning when sidekiq is not running 2013-03-22 11:35:51 -04:00
Régis Hanol
2ab08ef21d FIX: OpenGraph tags not fully sanitized 2013-03-22 12:32:56 +01:00
Supermathie
eedd69631b Stage files to cdn77 one at a time 
* cdn77 API isn't allowing more than one file in a prefetch request
* modify code to do them one-by-one
 2013-03-21 23:56:58 -03:00
Robin Ward
ee5213be5f Fixes regression with video embeds 2013-03-21 20:53:12 -04:00
Neil Lalonde
8cc7f3c20b Dashboard warning when clockwork doesn't seem to be running 2013-03-21 16:51:50 -04:00
Robin Ward
babcfe6234 Cache oneboxes in Redis now instead of postgres. 2013-03-21 13:11:54 -04:00
Robin Ward
9d4ecd7ef8 Oneboxes should use a sorted array for ordering, not a hash. 2013-03-21 11:47:01 -04:00
Sam
62c60540be pull moderator into own column, rename trust levels 2013-03-19 21:06:11 -07:00
Sam
fcbc77d0cd pre-stage our locales as well 2013-03-19 18:12:19 -07:00
Sam
2a047df4f1 cache reply_to_user_id in post to eliminate a very nasty n+1 query 2013-03-19 16:54:23 -07:00
Sam
ec948dc660 loading a user in a post_action is wasteful 2013-03-19 16:54:23 -07:00
Sam
3da1104ec3 Hash is faster than delegation and simpler to explain 2013-03-19 16:54:23 -07:00
Robin Ward
1f0b28b069 Apply security fixes as a monkey^M^M^M^M^M^Mfreedom patch 2013-03-19 16:59:18 -04:00
Robin Ward
59fc3bfac4 PostDestroyer to replace callbacks for destroying 2013-03-18 17:55:11 -04:00
Robin Ward
897d48b145 Moved more Post callbacks into service classes 2013-03-18 17:54:55 -04:00
Robin Ward
d5e4243f02 Move draft sequence incrementing out of after_save 2013-03-18 17:54:50 -04:00
Robin Ward
5aec5261a7 Converted flag threshold constants to enums 2013-03-18 17:54:43 -04:00
Robin Ward
aea848f164 Move MessageBus observer into PostCreator 2013-03-18 17:54:39 -04:00
Robin Ward
b6224b014c Move a bunch of callbacks into PostCreator 2013-03-18 13:56:26 -04:00
Robin Ward
e1e1bdd0b1 Merge pull request #469 from wojciechka/master 
Support for running discourse with a prefix (i.e. as http://servername/discourse)
 2013-03-18 07:24:11 -07:00
Sandy Vanderbleek
204dcc43a4 Use Diffy as DiffEngine implementation 2013-03-15 17:31:51 -07:00
Wojciech Kocjan
e6ccc300dc Support for running discourse with a prefix (i.e. as http://servername/discourse) 2013-03-16 00:01:21 +01:00
Neil Lalonde
19860bd2c5 Version bump to v0.8.4 2013-03-15 18:21:19 -04:00
Robin Ward
76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3 
implement color picking from predefined set for category badges + option to change foreground color
 2013-03-15 13:43:59 -07:00
Kuba Brecka
8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
nverba
68e3f5228f Basic Heroku integration 2013-03-13 19:07:49 +00:00
Sam
fcc6aac008 hacked dates so jeff sees no more 1mons everywhere. 2013-03-13 00:05:21 -07:00
Sam
38f185355d added options to disable quoting and open links in new tabs 
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
 2013-03-12 20:06:58 -07:00
Robin Ward
1103dde5cd Fix: When you split topics, featured users and like counts were incorrect. 2013-03-12 12:33:42 -04:00
Sam
3053831b97 don't show pinned stuff on the front page for anon 2013-03-11 18:30:25 -07:00
Robin Ward
88bb25f2f6 Fixes #313 - Without a slug the search urls were wrong. 2013-03-11 12:18:25 -04:00
Robin Ward
de1d488d91 Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse 2013-03-11 11:14:17 -04:00
Sam
1c8eef7dbd added basic passenger support, no long polling but functions 
clean up initializers so they are ordered properly
 2013-03-11 05:33:20 -07:00
Sam
849066cff5 Merge pull request #396 from kubabrecka/sidekiq_i18n_1 
apply locale in sidekiq jobs
 2013-03-10 17:54:23 -07:00
Neil Lalonde
4aa1122ef2 Version bump to 0.8.3 2013-03-08 16:51:22 -05:00
Robin Ward
908bba8c13 First stab at oneboxing of meta.discourse.org 2013-03-08 15:59:12 -05:00
Robin Ward
d1d4530efd User Profile enhancements: 
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
 2013-03-08 15:04:37 -05:00
Kuba Brecka
3a8cfffb2d apply locale in sidekiq jobs 2013-03-08 16:22:08 +01:00
Robin Ward
fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting 
added the min-search-term-length site setting
 2013-03-08 06:58:45 -08:00
Sam
e11af13b12 add fast xor, we need really fast xor to keep our password function honest. 2013-03-08 05:54:40 -08:00
Sam
d6ca23a75b remove N+1 queries 2013-03-08 05:34:19 -08:00
Robin Ward
d848a9fedc Add opengraph and twitter card support to topics 2013-03-07 17:46:43 -05:00
Kuba Brecka
2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward
5349e1b163 Merge pull request #387 from ZogStriP/g10n-wikipedia-oneboxer 
globalized wikipedia onebox
 2013-03-07 09:23:19 -08:00
Robin Ward
f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Régis Hanol
621995f35a globalized wikipedia onebox 2013-03-07 03:30:40 +01:00
Robin Ward
6a63178411 Merge pull request #377 from kubabrecka/typos5 
various typos in comments
 2013-03-06 09:14:16 -08:00
Neil Lalonde
83f89b5c55 Fix check if you're up to date in javascript 2013-03-06 10:34:29 -05:00
Sam Saffron
8f56a09e82 PBKDF2 gem is trouble, removing and hand coding for now 2013-03-06 23:12:16 +11:00
Kuba Brecka
dc62136642 various typos in comments 2013-03-06 08:52:24 +01:00
Neil Lalonde
f8e04a5c48 Version check gets how many versions behind you are, and shows judgemental faces on the dashboard 2013-03-05 18:15:33 -05:00
Robin Ward
86af49e663 More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $. 2013-03-05 15:39:21 -05:00
Robin Ward
cf09e200a5 Moved Markdown out of Discourse.Utilities -> Discourse.Markdown 2013-03-05 14:56:43 -05:00
Neil Lalonde
016634d1d9 Don't memoize a SiteSetting in the DiscourseHub module because that breaks multisite support 2013-03-05 13:53:23 -05:00
Régis Hanol
239cbd2d58 enforce coding convention 
replaced every `and` by `&&` and every `or` by `||`
 2013-03-05 01:42:44 +01:00
Robin Ward
35d5c899dd Merge pull request #321 from tijmenb/fix-hosts-in-oneboxer 
Fix display hosts in oneboxer
 2013-03-04 11:04:02 -08:00
Tijmen Brommet
eaef66a423 Fix display host for onebox 2013-03-02 00:46:55 +01:00
Robin Ward
9858beb6af Missed reference to type 2013-03-01 17:33:23 -05:00
Robin Ward
d78a2b2b91 Removed unused type parameter in site settings. Remove hardcoded date reference in en.yml 2013-03-01 17:27:59 -05:00
Robin Ward
9a2588c46d Update SiteSettingExtension to use new Enum class 2013-03-01 17:21:13 -05:00
Neil Lalonde
5c986be753 Send forum title and hostname along with version check 2013-03-01 16:02:06 -05:00
Robin Ward
d410f043a9 Merge pull request #290 from alxndr/category-rss 
RSS for topics in a category
 2013-03-01 12:01:26 -08:00
Robin Ward
7c68224763 Merge pull request #309 from goshakkk/enums 
Introduce Enum
 2013-03-01 11:34:48 -08:00
Robin Ward
d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access 
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
 2013-03-01 14:27:41 -05:00
Gosha Arinich
0c99dea153 introduce Enum 2013-03-01 21:16:36 +03:00
Alexander
fd240c1967 RSS for topics in a category 
Creates a new route for category RSS
 2013-03-01 09:52:59 -08:00
Robin Ward
0c8c41b131 Merge pull request #287 from nverba/settings 
fixed SiteSettings without defaults Type of Null
 2013-03-01 08:46:18 -08:00
Robin Ward
98d4f40d05 Merge pull request #302 from kirushik/better_search 
Better search
 2013-02-28 12:31:31 -08:00
Kirill Pimenov
f639397aff Correct stripping of non BasicLatin characters 2013-02-28 23:52:35 +04:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Kirill Pimenov
ee0396198e Added basic locale recognition for expected FTS stemming 2013-02-28 23:14:22 +04:00
Kirill Pimenov
2f3ba0a791 Better SQL substitutions 2013-02-28 23:03:52 +04:00
Gosha Arinich
d2f3c829db refactor User and TrustLevel a bit 
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
  `TrustLevel#level_key`
 2013-02-28 19:15:54 +03:00
nverba
2ca81e8afa fixed SiteSettings without defaults Type of Null 2013-02-28 00:24:43 +00:00
Robin Ward
421f048458 Add a better from address to the email 2013-02-27 18:30:14 -05:00
Robin Ward
37175c264a Merge pull request #280 from nverba/patch-1 
Quick fix for Boolean SiteSettings
 2013-02-27 10:35:55 -08:00
nverba
c6e5e3acd2 Quick fix for Boolean SiteSettings 
Boolean SiteSettings are saved as 't' or 'f' on create!, but are being saved as 1 or 0 after update. This quick fix maintains consistency, allowing boolean values to be updated and saved.
 2013-02-27 16:19:09 +00:00
Alexander
8855a0bfbe RSS of a topic via new route 
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
 2013-02-26 14:54:17 -08:00
Robin Ward
1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
 2013-02-26 10:42:49 -05:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
tms
2e230d2661 Be more selective about when we allow oembed discovery 2013-02-25 20:48:17 -05:00
Jeremy Banks
a7a2dcebac Include /^http... prefix in onebox whitelist URLs regexes to prevent XSS. 2013-02-25 20:06:16 -05:00
Jeff Atwood
11bf337b52 add thinkgeek to onebox whitelist 2013-02-25 14:19:07 -08:00
Robin Ward
e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
Sam Saffron
47fedd8f4d correct breakage 
don't set permanent cookie, kill session if it conflicts
 2013-02-24 22:56:08 +11:00
Sam Saffron
fd2e9a99bf cookie recovery cause we have been messing with it. 2013-02-24 21:50:34 +11:00
Sam Saffron
b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam
ab97dc8fd6 Update lib/current_user.rb 2013-02-24 17:24:40 +11:00
tms
3e6641c07e Unsign auth token cookies per discussion on #215 2013-02-23 13:40:21 -05:00
Sam Saffron
47be98ed1c diff engine, help needed 2013-02-23 16:30:02 +11:00
Neil Lalonde
7f08765ba7 version bump to 0.8.2 2013-02-22 17:17:03 -05:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Sam
6347cbe275 HELP NEEDED. Implement Me! 2013-02-22 23:47:26 +11:00
Sam Saffron
21cc9ab1ff work in progress 2013-02-22 10:56:59 +11:00
Neil Lalonde
8620024798 Show which SHA is installed on the admin dashboard 2013-02-21 13:48:14 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
84cb08e035 Merge pull request #215 from tms/auth-token-changes 
Sign the auth token cookie and make it httpOnly
 2013-02-21 07:14:15 -08:00
Sam Saffron
97ceea8878 add delay and trivial 200 code check 2013-02-21 16:37:17 +11:00
Sam Saffron
012941ea62 basic smoke test script 2013-02-21 16:01:40 +11:00
Sam Saffron
250bd3cd21 post processor 2013-02-21 16:01:40 +11:00
Sam Saffron
2226207ecd smoke test 2013-02-21 16:01:40 +11:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See: 
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
 2013-02-20 19:01:13 -05:00
tms
5616fdc475 Sign the auth token cookie and make it httpOnly 2013-02-20 17:24:19 -05:00
Neil Lalonde
2668be690f version bump 2013-02-20 16:00:52 -05:00
Robin Ward
13b0b874fb Merge branch 'onebox-safety' of git://github.com/tms/discourse 2013-02-19 16:15:35 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
tms
e951eff5bb Allow oneboxers to specify their simple_onebox text is unsafe 2013-02-19 14:51:44 -05:00
Robin Ward
bb1156cee1 filter out closed/archived/invisible topics from suggested 2013-02-19 14:38:59 -05:00
Robin Ward
ba238f92c2 Revert "Merge branch 'onebox-safety' of git://github.com/tms/discourse" 
This reverts commit 7ca57db97a, reversing
changes made to b7e027cfd1.
 2013-02-19 14:22:13 -05:00
Robin Ward
7ca57db97a Merge branch 'onebox-safety' of git://github.com/tms/discourse 2013-02-19 13:10:52 -05:00
tms
1a0b23fd2b Allow oneboxers to specify their simple_onebox text is unsafe 2013-02-19 12:06:35 -05:00
tms
6d06420583 Be more selective about when we allow oembed discovery 2013-02-19 11:46:36 -05:00
Robin Ward
ae9bee2a91 Merge pull request #172 from jeremybanks/master 
Do not strip leading and trailing whitespace from raw posts
 2013-02-19 08:15:39 -08:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks
91f9844211 Include /^http… prefix in onebox whitelist URLs regexes to prevent XSS. 2013-02-19 01:49:58 -05:00
Jeremy Banks
eb2a5e4654 Merge branch 'origin/master' 
Conflicts:
	lib/text_sentinel.rb
 2013-02-18 21:41:20 -05:00
Sam Saffron
0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam Saffron
d9a84ddd01 chuck git version at the bottom of the page 2013-02-18 17:39:54 +11:00
Sam Saffron
87b929eac6 added secret token warning in prd 
added task to stamp builds
 2013-02-18 17:34:43 +11:00
Jeremy Banks
6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam
c7fba796b6 Merge pull request #185 from tms/search-all-the-things 
Search all the things
 2013-02-17 13:53:58 -08:00
Sam
bc1f8244e4 Merge pull request #186 from tms/oneboxes-shouldnt-explode 
Oneboxes shouldn't explode when the remote causes an HTTPError
 2013-02-17 13:52:40 -08:00
Sam
df63a3c516 Merge pull request #187 from tms/blog-onebox-tweaks 
Have oneboxer default to page title when og:title is missing
 2013-02-17 13:51:43 -08:00
tms
85b0c0afab Have oneboxer default to page title when og:title is missing 2013-02-17 04:31:21 -05:00
tms
702fbcdfa8 Oneboxes shouldn't explode when the remote causes an HTTPError 2013-02-17 04:10:17 -05:00
tms
eebc6c7e41 Request per_facet + 1 in search to know if we actually have more 2013-02-17 02:52:21 -05:00
Alexander
6c4ae05454 Removes iconv dependency 
Fixes #100
 2013-02-15 13:36:19 -08:00
Robin Ward
674c861eaf Adjust deadlock trap to match postgres format. 2013-02-15 11:48:38 -05:00
Robin Ward
036e795e10 Merge pull request #152 from xdite/canonical-url 
use canonical-url plugin to make view more clean
 2013-02-15 07:18:41 -08:00
Sam Saffron
eb188c57e8 started work on message bus diags 2013-02-15 19:23:40 +11:00
Sam Saffron
4aa7ba620e fix, so really long topics are correct, tested perf on a 4k post topic and seems fine 2013-02-15 13:08:37 +11:00
Sam Saffron
a8085f15c4 grab highest post number from the raw data, so deletions at the end of a topic work 2013-02-15 13:08:37 +11:00
Dan Neumann
44642d4d0c slug should replace underscores 2013-02-14 17:04:30 -06:00
Robin Ward
d740d7b25f Fix for foreign language titles: Only enforce upper case rule on english alphabet. 2013-02-14 16:09:57 -05:00
Neil Lalonde
39eab7c425 Replace mentions of mothership with discourse_hub 2013-02-14 12:57:26 -05:00
Robin Ward
cba4c9051a Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri 
Replace hpricot with nokogiri
 2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383 Merge pull request #146 from ismaelga/moderators-buttons 
Create moderators
 2013-02-14 07:26:50 -08:00
Jaime Iniesta
6995e75d41 Replace Hpricot with Nokogiri 2013-02-14 11:35:50 +01:00
Sam Saffron
87d83802b9 added option that allows users to decide when they consider topics new (default 2 days old or newer) 
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
 2013-02-14 17:36:14 +11:00
Ismael Abreu
80bec6efc9 Adds grant and revoke moderation buttons so admins can make users moderators 2013-02-14 01:12:23 +00:00
Robin Ward
dee9e9a51f Fix bug where links to posts weren't being tracked 2013-02-13 15:23:09 -05:00
Robin Ward
a9da9c5fde Merge pull request #148 from danneu/slug-simplify 
replace reinvention of #parameterize
 2013-02-13 07:23:26 -08:00
xdite
cab4d95eaf use canonical-url plugin to make view more clean 2013-02-13 19:04:43 +08:00
Robin Ward
27a07054d7 We never want to filter TopicView to just one post. 2013-02-12 19:02:16 -05:00
Dan Neumann
4a390bc562 remove reinvention of #parameterize 2013-02-12 17:53:06 -06:00
Robin Ward
924ad1dae0 Merge pull request #106 from gammons/master 
Refactored TopicsController#show into something that is much more maintainable
 2013-02-12 08:36:20 -08:00
Neil Lalonde
4636b354b4 Use the new mothership change_nickname API 2013-02-12 10:19:02 -05:00
Sam
4668cf1d54 Merge pull request #114 from edward/patch-1 
Consistency in SQL style
 2013-02-12 00:11:59 -08:00
Sam
6e74b4fb0c Merge pull request #130 from danneu/slug-refactoring 
Lean on Inflector for slug transliteration.
 2013-02-11 19:31:16 -08:00
Sam Saffron
ad88487a32 Merge branch 'master' of github.com:discourse/discourse 2013-02-12 13:45:24 +11:00
Sam Saffron
2b276bc2c8 gist oneboxer issues 2013-02-12 13:45:08 +11:00
Dan Neumann
50cf8cd4d5 Set up slug.rb for obvious method extractions. 2013-02-11 20:36:54 -06:00
Dan Neumann
9daf53df73 lean on Inflector transliteration 2013-02-11 20:34:38 -06:00
Grant Ammons
f3dc93a0db WIP, a very nice refactoring of TopicsController#show 2013-02-11 17:54:56 -05:00
Robin Ward
e033213f84 Merge pull request #94 from danneu/plugin-registry-patch 
Extracted default value initializers.
 2013-02-11 14:50:09 -08:00
Robin Ward
74220b4194 Don't update the current ip to an empty string 2013-02-11 16:01:53 -05:00
Robin Ward
57049b55a2 Little things: 
- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
 2013-02-11 15:47:28 -05:00
Sam Saffron
fd5f949116 formatting 2013-02-11 19:01:33 +11:00
Sam Saffron
f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Edward Ocampo-Gooding
b7a76cbd24 Consistency in SQL style 2013-02-11 01:03:21 -05:00
Sam Saffron
543845c673 rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default. 2013-02-11 11:43:07 +11:00
Robin Ward
0dcba67a7e Merge pull request #98 from blom/define_method 
Use define_method instead of eval-ing a string
 2013-02-10 14:15:48 -08:00
Sam
1264f628c8 Merge pull request #104 from kubabrecka/fix_non_us_locale 
fix user listing and search on non-US locale
 2013-02-10 14:08:13 -08:00
Sam Saffron
af810f38dd UserSearch refactor 
Added .sql_builder to all AR models
 2013-02-10 23:37:24 +11:00
Kuba Brecka
d0c1d94918 fix user listing and search on non-US locale 2013-02-10 12:18:11 +01:00
Ørjan Blom
f00853bee8 Use define_method instead of eval-ing a string 
It avoids the need for escaping the interpolations.
 2013-02-10 00:13:46 +01:00
Grant Ammons
701ecddac2 factor out @post.revise into its own class. clean up PostRevisor class to be more readable 2013-02-09 10:33:25 -05:00
Robin Ward
03a798b202 Can clear flags on deleted posts if you're a moderator 2013-02-08 19:07:29 -05:00
Robin Ward
12d3c3b66b Enforce entropy on flag text 2013-02-08 17:01:43 -05:00
Sam Saffron
d3f911cc4c Revert "Something here is messed up Revert "message bus fixes and diagnostics"" 
This reverts commit f3c6144e3b.
 2013-02-08 22:03:45 +11:00
Sam Saffron
f3c6144e3b Something here is messed up Revert "message bus fixes and diagnostics" 
This reverts commit 36d1aafe1e.
 2013-02-08 21:39:38 +11:00
Sam Saffron
36d1aafe1e message bus fixes and diagnostics 2013-02-08 19:13:36 +11:00
Dan Neumann
0cf68e2714 Extracted default value initializers. 2013-02-08 01:56:12 -06:00
Neil Lalonde
c524e769d0 Mothership#current_discourse_version had an invalid path 2013-02-07 18:23:52 -05:00
Robin Ward
c4ad927024 Site Settings was deleting the wrong cache object 2013-02-07 16:11:30 -05:00
Robin Ward
084a873b91 Give regular users a delete button. If they click it, their post will be revised to 
say it was deleted.
 2013-02-07 15:14:23 -05:00
Robin Ward
d49cf88c35 Merge pull request #51 from danneu/slug-patch 
Strip leading and trailing slug punctuation.
 2013-02-07 07:02:58 -08:00
Sam Saffron
85973ce6b0 added delete all posts button 
wired up the ability to enable all themes
 2013-02-07 18:11:56 +11:00
Robin Ward
7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward
40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Dan Neumann
ee8d68842e Strip leading and trailing slug punctuation. 2013-02-06 19:52:14 -06:00
Aaron Chambers
1c29b040c5 A tiny typo fix. It all adds up... 2013-02-07 00:46:57 +00:00
Robin Ward
96e67002ac Merge pull request #44 from bbonamin/patch-1 
Fixed minor typo in lib/guardian.rb
 2013-02-06 13:28:56 -08:00
Robin Ward
f1a3e76d2b Support for replacing Site Message content with keys specific to a multisite. 2013-02-06 15:29:03 -05:00
Bruno Bonamin
de871ccf8a Fixed minor typo in lib/guardian.rb 
Just a letter switch I found upon browsing the code :)
 2013-02-06 17:46:45 -02:00
Sam Saffron
0f88947279 fix onebox for your own site 2013-02-06 16:22:11 +11:00
Robin Ward
21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00