github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-18 12:44:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,919 Commits 214 Branches 500 Tags 960 MiB
60fce196c7
Commit Graph

577 Commits

Author SHA1 Message Date
Sam
e9ebadb414 Nuke message_bus_observer move to service class and classes 
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
 2013-05-16 15:03:16 +10:00
Régis Hanol
27dfb7a948 FIX: @username mentions when there are multiple code blocks in a post. 
Meta: [All of my internal users show as coming from 127.0.0.1!](http://meta.discourse.org/t/all-of-my-internal-users-show-as-coming-from-127-0-0-1/6607)

This fixes the regular expression used to identify @ inside <code> or <pre> blocks in the `postConversion` hook.
 2013-05-16 01:59:07 +02:00
Lee Machin
dadb7eaa23 fix crash caused by incorrect query in scope 
setting all categories to be secured led to a blank screen on all pages

use stabby lambda for consistency in class

make the test a little more concise

- move the local assignments into let blocks for
reusability

- remove calls to `to_a`, which aren't needed

- use 'be_empty' instead of '[]' to be consistent
with the other matchers in the test

add a test for the `secured` scope with multiple
secured categories
 2013-05-15 22:26:52 +01:00
Sam
ef98b60184 disable observers in tests, enable as needed, tests are 20% faster 2013-05-14 11:59:55 +10:00
Robin Ward
fff46cf5aa Can search by URL or ID 2013-05-13 17:07:58 -04:00
Robin Ward
be234ce9b9 You can now 'move' the first post of a topic to another topic as a merge. In that 
case, the first post is cloned instead of being deleted from the original topic.
 2013-05-13 14:07:31 -04:00
Neil Lalonde
9828c87525 Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days 2013-05-13 12:53:52 -04:00
Sam
b6bf95e741 speed up startup (avoid loading some gems on startup) 
correct group permission leaks
add Discourse.cache for richer caching support
 2013-05-13 18:04:03 +10:00
Sam
9b33e826f2 clear flags on reply to notify moderators 2013-05-13 11:48:01 +10:00
Sam
98d9f174ae fix spec 2013-05-13 11:07:22 +10:00
Sam
30501e943c fix search 2013-05-13 11:07:21 +10:00
Robin Ward
cf01c98d81 Experimental: Interface to Move Posts to an Existing Topic 2013-05-10 14:55:51 -04:00
Régis Hanol
297680c28d FIX: pinned topic excerpt is not properly truncated 2013-05-10 12:28:17 +02:00
Sam
942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Sam
5280b3a01b more group progress, UI getting there, controller mostly done 
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
 2013-05-09 17:37:34 +10:00
Sam
4f328e3e45 +x on files makes no sense unless they really are executable 
rails in the script dir makes no sense, use binstubs or bundler instead
 2013-05-09 17:35:15 +10:00
Sam
0f0fd281a8 group progress, never email banned users 2013-05-09 11:34:58 +10:00
Sam
6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam
7571152d1d fix issue adding users to groups 2013-05-08 10:32:29 +10:00
Robin Ward
6843ba7ed6 Fix regression: default to JSON type on GET requests. 2013-05-07 17:17:21 -04:00
Neil Lalonde
f9a82f3aa0 Add a spec for category list with empty category 2013-05-07 15:52:45 -04:00
Neil Lalonde
8e24a608b0 Show empty categories on categories page to people people who can edit and delete categories 2013-05-07 15:31:56 -04:00
Sam
e9fc272db7 remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed 
makes upgrading to rails 4 possible
 2013-05-07 14:39:01 +10:00
Neil Lalonde
69be7d0ad1 Change the title Visits to Clicks in referral tables on admin dashboard 2013-05-06 11:56:35 -04:00
Sam
be1ab8b275 automatic group infrustructure 2013-05-06 14:49:56 +10:00
Régis Hanol
392b9696f4 prevent duplicate actions on a post 2013-05-04 02:52:45 +02:00
Sam
3eab0be4a8 deleting posts as an admin was bust 2013-05-03 17:56:23 +10:00
Sam
5ec52bd2e9 :s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff 2013-05-02 17:22:27 +10:00
Sam
65cd00cf25 moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5 
allow pms to be targetted at groups
 2013-05-02 15:15:53 +10:00
Sam
e59ab32210 Merge pull request #800 from goodbrews/imgur-api-v3 
Update to Imgur API v3
 2013-05-01 21:52:00 -07:00
David Celis
6be26f5316 Update to Imgur API v3 
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.

This PR updates Discourse to use the new version of Imgur's API.

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-01 21:39:10 -07:00
Neil Lalonde
3c7afeb233 Fix incoming links dashboard data when topic record can't be found 2013-05-01 19:10:31 -04:00
Neil Lalonde
38ed86d0c5 Add reports for IncomingLinks on admin dashboard 2013-05-01 18:12:02 -04:00
Sam
e4a76812a6 this is a slightly round about way of making our self oneboxes sane 
shrunk avatar to 60px, added global whitelisting
 2013-05-01 16:38:13 +10:00
Sam
08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Sam
58dbfa1b91 Merge pull request #796 from ZogStriP/fix-shift-clicks-on-links 
FIX: shift+click on links
 2013-04-30 16:02:24 -07:00
Régis Hanol
ff309cf024 FIX: shift+click on links 
Default browser's behavior when shift+clicking was messed up.

This adds the shift key modifier to the list of click modifiers in both
`click_track` and `discourse`.

Also updated & refactored a bit the `click_track_spec`.
 2013-04-30 15:48:58 +02:00
Sam
acc4f73ba0 very subtle, autospec was not using inotify if guard was already running 2013-04-30 22:54:52 +10:00
Sam
b25a5a20bb option to strip links from excerpts 2013-04-30 13:25:55 +10:00
Sam Saffron
94a578e4b2 ignore assets 
fix runner so it works on mac
get rid of some test warnings
 2013-04-30 12:43:59 +10:00
Régis Hanol
017ee7c2da FIX: [security bug] XHR check bypass 2013-04-30 02:34:19 +02:00
Neil Lalonde
eb151d440b Don't call discourse hub during user destroy if hub integration is disabled 2013-04-29 11:39:05 -04:00
Neil Lalonde
dc07563c0d Add unstarred_at column to topic_users so we can permanently track when topics are starred 2013-04-29 11:39:05 -04:00
Sam
5cfcdc7ef0 backend for secure categories mostly done (todo pm groups) 2013-04-29 16:33:43 +10:00
Ryan Boland
9bc8faeaf2 added rottentomatoes.com onebox 2013-04-28 16:24:03 -04:00
Jonathan Roes
057b4768e6 strip whitespace when changing e-mail addresses 
Fixes #778.
 2013-04-27 23:03:06 -04:00
Neil Lalonde
1375954fbc Add title tags to dashboard stats to show percent change from previous period 2013-04-26 17:14:03 -04:00
Neil Lalonde
c589b4b187 Add a js spec for admin/report model, and find a bug too 2013-04-26 17:14:02 -04:00
Sam
f9e33ec6b8 store ip address and current user with incoming links 
make links long an readable in share dialog
 2013-04-26 16:18:55 +10:00
Sam
a56a926582 seed fu should not run before the suite, just before fork 
we have no seeds.rb so do nothing there
 2013-04-26 16:18:55 +10:00
Sam
eb085beea8 attempt to fix the UTF-8 warn in the log, turns out this runs really deep, when you hit deliver in test it clones the mail not setting charset properly, leaving as is for today but fixing prod at least 2013-04-26 16:18:54 +10:00
Sam
14f33b80e4 lets not let without a block rspec gets very upset 2013-04-26 16:18:54 +10:00
Sam
37867af1bb track incoming links, amend share link to include user 
fix pm styling
 2013-04-24 18:05:35 +10:00
Régis Hanol
451a818162 do not display clicks count in oneboxes 2013-04-22 20:21:29 +02:00
Sam
cfc62dadff speed up tests 
add the ability to find the first notify private message
 2013-04-22 17:45:03 +10:00
Sam
8827dd3e42 speed up tests 2013-04-22 13:48:41 +10:00
Sam
2843f1cf4b collapse some slow tests 2013-04-22 11:06:10 +10:00
Sam
aea988a447 before: 
Finished in 6.38 seconds

after:

Finished in 1.52 seconds
 2013-04-22 11:05:54 +10:00
Jeff Atwood
b64a4100fa change "visitor" trust level to "new user" 
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
 2013-04-17 16:11:24 -07:00
Régis Hanol
e76f629df8 Text Cleaner now removes all periods from the end of the title 2013-04-18 00:19:42 +02:00
Sam
437142424c speed up tests, fix notification of mentioned users in pms 2013-04-17 17:39:18 +10:00
Neil Lalonde
3b6aeb14c7 Add subtype to topics to classify private messages 2013-04-16 16:56:18 -04:00
Régis Hanol
c2e58b61c9 automatically resizes images 2013-04-15 23:32:26 +02:00
Régis Hanol
b24c1a1ad9 better consistency around email case sensitivity 2013-04-15 02:20:33 +02:00
Neil Lalonde
c6ab9fec9d Unregister forum membership at Discourse Hub when deleting a user 2013-04-15 14:52:07 -04:00
Sam
f314e7a89c make source git pull freindly, no need to copy files around when updating 2013-04-15 15:07:40 +10:00
Sam
ea3c6d2e6f fix jshint 2013-04-15 13:18:26 +10:00
Philipp Weissensteiner
3dcb1905e3 Refactor user controller, create action, mostly. 
The gist of the commit are a few improvements in the
create action, where:

* long boolean statemenst have been wrapped in smaller more readable
  methods.
* the 3rd party user info creation has been extracted (still in controller)
* a small helper method for creating a new user from params (to reduce
  visual clutter)
* specs have been added where I came across untested methods/branches

Other changes are more trivial like formatting and whitespace fixes.
Hope this helps. Regards.
 2013-04-13 00:53:59 +02:00
Neil Lalonde
651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam
1725bf77a7 fix build 2013-04-12 21:09:41 +10:00
Sam
5551ef9418 ok I should not be coding to a deadline ... grrr 2013-04-12 18:15:19 +10:00
Sam
86b317ea73 oops 2013-04-12 18:14:36 +10: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
Neil Lalonde
36dc5874e5 Post image_count doesn't count favicons and thumbnails in oneboxes, so visitors can post links that get oneboxed 2013-04-11 12:36:45 -04: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
Régis Hanol
d120a5d139 FIX: setting min_topic_title_length is ignored 2013-04-10 14:54:10 +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
Michael Scott Shappe
2fb673dd72 Create and use new rspec matcher 'match_html' 
This introduces match_html, which converts actual and expected HTML strings into "canonical" HTML using Nokogiri with NOBLANKS and COMPACT, and then does a simple equality comparison.

This eliminates whitespace differences introduced by library changes (e.g. the libxml2 2.9.0 change).

pretty_text_spec.rb has been changed to use match_html where appropriate. and all tests pass under libxml2 2.7.6, 2.8.0 or 2.9.0
 2013-04-09 22:30:10 -05:00
Sam
9b487953c4 collapse some db tests 
ensure deleted topics do not show up in user stream
 2013-04-10 12:50:00 +10:00
Robin Ward
6198c1a35b Missed a jshint thing in the spec 2013-04-09 18:04:25 -04:00
Robin Ward
00f9e628e0 Don't apply markdown to content of [quote] -- it messes up spacing. 2013-04-09 17:32:50 -04:00
Neil Lalonde
467d59ec5a Merge some work: topic counts in category select; fix All count on dashboard 2013-04-08 10:23:29 -04:00
Sam
73c508115a better consistency check 2013-04-08 13:02:20 +10: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
Sam
11ff0ccd03 correct logic for tracking the highest seen post number so its always consistent 2013-04-08 11:12:52 +10:00
Régis Hanol
d080ae4d2d don't track links in oneboxes 2013-04-08 02:24:12 +02:00
Sam
3e9b782f3e save it ... 2013-04-08 08:21:54 +10:00
Régis Hanol
1692350336 added some tests for uploads 2013-04-07 17:52:46 +02:00
Robin Ward
a14f62766e Replace MultisiteI18n hack with SiteContent and admin editing. 2013-04-05 16:48:15 -04:00
Robin Ward
cecdafd4e8 Fixes broken spec 2013-04-05 16:27:25 -04:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Neil Lalonde
eb212aec9b Fix dashboard totals for topics, posts, and private messages 2013-04-05 14:09:16 -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
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
27776287f4 Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads 
consistent behavior regarding file uploads
 2013-04-04 21:36:17 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Régis Hanol
82bd92dd46 consistent behavior regarding file uploads 2013-04-05 01:07:31 +02:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Sam
e61a28f3e1 utc vs non utc is a subtle issue, tests were failing for a few hours every day cause of this 2013-04-04 13:29:54 +11:00
Régis Hanol
7105349f1f FIX: accessing a topic with a 'page' parameter 2013-04-04 00:12:27 +02:00
Neil Lalonde
bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward
738789f336 Admins can't lock themselves out of a site by setting approval. 2013-04-03 12:23:28 -04:00
Robin Ward
368011d03b Merge pull request #628 from ZogStriP/add-uploads-controller-specs 
add UploadsController specs
 2013-04-03 08:06:49 -07:00
Régis Hanol
cf3eb98321 add GitHub commit onebox 2013-04-03 03:36:38 +02:00
Régis Hanol
2b120ef886 add UploadsController specs 2013-04-03 01:17:17 +02:00
Robin Ward
61b5c0340e Convert all Ajax calls to use Discourse.ajax() 2013-04-01 18:09:23 -04:00
Robin Ward
79c986dd92 Fix issue with duplicate slugs 2013-04-01 12:26:51 -04:00
Robin Ward
f9ea1a448d Merge pull request #600 from kubabrecka/consistent_topic_count 
make sure Category.topic_count is consistent with week/year stats
 2013-04-01 07:37:07 -07:00
Philipp Weissensteiner
c34f476b31 Improve suggest_username method in user.rb 
The suggest_username method showed up on codeclimate
so I thought I'd give it some love and make it more readable.
In the process removed trailing whitespaces and had to fix a
terrible spelling error :)
 2013-03-31 19:01:11 +02:00
Kuba Brecka
d50b5e1fd8 make sure Category.topic_count is consistent with week/year stats 2013-03-31 13:22:05 +02:00
Neil Lalonde
25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Neil Lalonde
436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward
3d615ada12 Merge pull request #583 from wpp/add_some_user_specs 
Add a few specs to user model
 2013-03-29 10:01:32 -07:00
Robin Ward
a0867bff24 Topic Statuses need to be updated by those who have access. I have self flaggelated 
as punishment for checking in broken specs before running out earlier.
 2013-03-29 02:38:54 -04:00
Philipp Weissensteiner
095cbaa093 Add a few specs to user model 
I noticed a few assertions of the has_many type were missing.
Also added a couple of specs which were testing in one direction only.
Just tipping my toes in discourse hope this helps a little.
 2013-03-29 00:24:35 +01: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
af7f6fea28 Can set the hotness of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -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
Robin Ward
90443dac30 Don't email about posts if the user deleted it. 2013-03-25 13:40:48 -04:00
Robin Ward
c372e36cb6 Don't count @mentions as links in a post 2013-03-25 13:12:15 -04:00
Robin Ward
6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04: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
36a069488e Merge pull request #492 from sbauch/email-whitelist 
added email whitelist SiteSetting feature to replicate email blacklist S...
 2013-03-24 16:35:24 -07:00
Robin Ward
3cb729df21 Merge pull request #546 from ZogStriP/improve-i18n-spec-speed 
prevent double work in the i18n integrity specs
 2013-03-24 08:28:04 -07:00
Régis Hanol
7d43058d20 FIX: Email notification for different user being mentioned 2013-03-24 01:57:00 +01:00
Régis Hanol
c98d58378c prevent double work in the i18n integrity specs 2013-03-23 15:49:31 +01:00
Kuba Brecka
624649ddc2 adding i18n integrity check for valid YAML and valid content 2013-03-23 08:57:31 +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
Sam Bauch
77e3434d81 added email whitelist SiteSetting feature to replicate email blacklist. email_validator method now also uses the regex method for both the whitelist and blacklist. 2013-03-22 14:49:42 -04:00
Robin Ward
3d4fb43c73 Re-enable integrity check 2013-03-22 12:49:46 -04: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
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
Sam
cd9d99aab8 Merge pull request #505 from ZogStriP/updated-preloadstore-api 
updated PreloadStore API
 2013-03-20 16:30:15 -07:00
Robin Ward
8b6dbfc1c6 Make spec pending for now -- jenkins does not like it 2013-03-20 18:10:52 -04:00
Robin Ward
a2796641b6 Merge pull request #504 from ZogStriP/ensure-locales-are-not-overwritten-take-2 
ensure locales are not overwritten
 2013-03-20 14:42:18 -07:00
Neil Lalonde
d28d81a590 Dashboard warning when GC params are default 2013-03-20 16:16:23 -04:00
Neil Lalonde
c8508d3f26 Dashboard warning when host_names is localhost 2013-03-20 15:38:28 -04:00
Neil Lalonde
c3c25b894a Cache dashboard data in the controller, not the report model 2013-03-20 13:54:32 -04:00
Neil Lalonde
1e4dd3ea0c Start detecting install problems and report them on the admin dashboard. This commit adds check for Rails.env 2013-03-20 12:00:52 -04:00
Régis Hanol
f1015fd73a updated PreloadStore API 
so that it is more clear that we are deleting preloaded data once read
 2013-03-20 16:26:46 +01:00
Régis Hanol
6dab9927c6 ensure locales are not overwritten 2013-03-20 10:51:28 +01:00
Sam
bfeb75a60f Revert "ensure locales are not overwritten" 
breaking now
 2013-03-19 21:23:03 -07:00
Sam
3f64a54898 SO AWESOME!!!!!!!!!!!!!!!!!!!!!!!! 2013-03-19 21:06:11 -07:00
Sam
62c60540be pull moderator into own column, rename trust levels 2013-03-19 21:06:11 -07:00
Régis Hanol
e61ca1f67f ensure locales are not overwritten 2013-03-20 03:07:45 +01:00
Robin Ward
49c66037b1 Moved deleting tests to post_destroyer_spec 2013-03-19 14:15:08 -04:00
Robin Ward
59fc3bfac4 PostDestroyer to replace callbacks for destroying 2013-03-18 17:55:11 -04:00
Robin Ward
c1e40f5d19 Convert Post type constants to Enum 2013-03-18 17:55:05 -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
Neil Lalonde
50b04b2209 Add email counts to admin dashboard 2013-03-18 10:08:09 -04:00
Neil Lalonde
6a99d12784 Add likes to admin dashboard 2013-03-18 10:08:08 -04:00
Neil Lalonde
0e63de59b5 Comment out report_spec.rb for now because it fails sometimes 2013-03-16 19:42:23 -04:00
Sandy Vanderbleek
204dcc43a4 Use Diffy as DiffEngine implementation 2013-03-15 17:31:51 -07:00
Neil Lalonde
d9cdde9aa7 Add user counts for each trust level to admin dashboard 2013-03-15 18:09:02 -04:00
Neil Lalonde
8983df9856 Show current user count for now, not at different points in time 2013-03-15 18:09:01 -04:00
Robin Ward
1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse 
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
 2013-03-15 16:49:17 -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
Robin Ward
ad082cea70 Big commit: 
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
 2013-03-15 14:35:33 -04:00
Neil Lalonde
6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04: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
Robin Ward
ea20993bed FIX: Don't create a new version when a post is recovered. Also display username instead of full name for consistency. 2013-03-13 12:35:55 -04:00
Sam
fcc6aac008 hacked dates so jeff sees no more 1mons everywhere. 2013-03-13 00:05:21 -07:00
Régis Hanol
439ac95b73 the composer will now count only significant whitespaces 2013-03-12 23:54:29 +01:00
Neil Lalonde
40c27ff3cf Add flag counts to admin dashboard 2013-03-12 14:40:59 -04:00
Neil Lalonde
4eda422cdf Add total users report; restructure dashboard reports js 2013-03-12 14:40:59 -04:00
Robin Ward
1103dde5cd Fix: When you split topics, featured users and like counts were incorrect. 2013-03-12 12:33:42 -04:00
Neil Lalonde
f1908fd8e8 Fix report_spec so it's not so fussy and breaks sometimes 2013-03-11 10:40:13 -04:00
Regis Hanol
2039c0f704 fix the specs errors due to a change to the min topic title's length 2013-03-11 14:51:24 +01:00
Sam
621f946193 fuff with test so it passes 2013-03-10 19:58:42 -07:00
Neil Lalonde
8927432a93 Add stats to the admin dashboard 2013-03-09 15:34:27 -05:00
Robin Ward
97ba6f32c7 Fixes broken jasmine test - PreloadStore now returns null 2013-03-08 15:10:57 -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
Robin Ward
b8fd734d0e Merge branch 'refactor-category' of git://github.com/goshakkk/discourse 
Conflicts:
	app/models/category.rb
 2013-03-08 10:49:25 -05: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
Robin Ward
d848a9fedc Add opengraph and twitter card support to topics 2013-03-07 17:46:43 -05:00
Neil Lalonde
2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Robin Ward
052887c296 Category Topics are no longer invisible, they are pinned. 2013-03-07 12:46:23 -05: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
c123e40638 Merge pull request #373 from alxndr/master 
Raise 404 from Admin::UsersController#show if no user found
 2013-03-06 09:17:47 -08:00
Robin Ward
30aae8e793 Topic was not sanitizing <b> and <img> tags from titles 2013-03-06 11:36:42 -05: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
Alexander
c4f1cb0d7b Raise 404 from Admin::UsersController#show if no user found 
[Fixes #353]
 2013-03-05 14:02:23 -08: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
Robin Ward
e4277757c4 Fix onebox loading on every keystroke after a request fails. 2013-03-05 14:06:39 -05:00
Gosha Arinich
a1825fece9 refactor Category 
* move callback bodies to separate methods (easier to test)
 2013-03-05 21:09:13 +03: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
e669b10966 Merge pull request #355 from dracula2000/site_setting_spec_fix 
Fix order dependency in site_setting_spec.rb
 2013-03-04 11:53:17 -08: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
Robin Ward
51f6ae69c9 Check when logging in whether a auth provider is enabled, including specs 2013-03-04 13:44:41 -05:00
Brian Kim
1f94ac154b Fix order dependency in site_setting_spec.rb 
The spec contained an order dependency which would cause the default
bool test to fail. You can confirm this by running the spec with the
option "--order rand" a couple times. This dependency was caused by
surprising behavior in SiteSetting::setting as shown below:

SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> false
SiteSetting.random_setting = true
SiteSetting.bool_setting? #=> true
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> true!

The spec is merely desriptive, and I have labeled what I think could be
possible bugs.
 2013-03-04 11:18:05 -05:00
Robin Ward
59b0299a27 Merge pull request #331 from goshakkk/enum-spec-valid 
Make Enum#valid? specs test the right thing
 2013-03-02 08:00:46 -08:00
Michael Berg
50dcaa0205 Removed Strange Test-Output 2013-03-02 12:23:40 +01:00
Gosha Arinich
28bc5a6c89 make Enum#valid? specs test the right thing 2013-03-02 10:40:32 +03:00
Tijmen Brommet
ba04e72a99 Fix weirdly indented code 2013-03-02 00:48:49 +01:00
Tijmen Brommet
eaef66a423 Fix display host for onebox 2013-03-02 00:46:55 +01:00
Robin Ward
5cf69baf56 Add specs for Enum class 2013-03-01 17:05:39 -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
b66b17bf19 Merge pull request #300 from goshakkk/cleanup 
Minor cleanup, using AR querying DSL over raw SQL in some places
 2013-03-01 07:52:34 -08:00
Régis Hanol
4fa4c15559 Quoting another reply won't satisfy the minimum character count (fixes #180) 2013-02-28 23:58:40 +01: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
Robin Ward
e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Gosha Arinich
6e5399d544 minor cleanup, using AR querying DSL over raw SQL in some places 2013-02-28 21:54:12 +03:00
Neil Lalonde
a58668cbcd Remove extra comma so jshint passes 2013-02-28 12:38:35 -05:00
Robin Ward
6c25eca2d6 Merge pull request #296 from goshakkk/refactor-user 
Refactor User and TrustLevel a bit
 2013-02-28 08:17:21 -08: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
Robin Ward
5d0d958a45 Merge pull request #289 from ZogStriP/bbcode-component 
added more tests & documentation to the BBCode component
 2013-02-28 08:03:44 -08:00
Robin Ward
3922a4f356 Merge pull request #288 from ZogStriP/test-readability 
cleaned up all javascript specs for better readability
 2013-02-28 08:02:44 -08:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Régis Hanol
f93a26e03d added more tests & documentation to the BBCode component 2013-02-28 03:29:52 +01:00
Régis Hanol
9a40789f4d cleaned up all javascript specs for better readability 2013-02-28 03:26:20 +01:00
Robin Ward
a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward
421f048458 Add a better from address to the email 2013-02-27 18:30:14 -05:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff Merge pull request #271 from goshakkk/topic-refactor 
Refactor Topic
 2013-02-27 10:32:44 -08:00
Robin Ward
0e6cd9410f Fixes lines that were too long. 2013-02-27 12:27:56 -05:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse 
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
 2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a Merge pull request #222 from alxndr/rss-for-topics 
RSS view of topics
 2013-02-27 08:30:08 -08:00
Kuba Brecka
acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Régis Hanol
3a41400d63 formatted some tests 
- formatted the bbcode_spec
- added 3 tests regarding the quotes
- corrected a test label in the smoke test
- cleaned up a bit the Guardfile
 2013-02-27 03:18:23 +01: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
Gosha Arinich
12d664a610 refactor Topic 
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
 2013-02-26 19:27:59 +03: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
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00