christophe
dfb9b8fa58
Fix unused parameter
2014-01-04 08:53:27 +01:00
Robin Ward
25caec0e62
Change text at the bottom of embedded comments to be (x more replies)
2014-01-03 14:55:37 -05:00
Robin Ward
1ffcf39448
Make embedded comments look nicer
2014-01-03 12:52:42 -05:00
Robin Ward
aefad6ae85
FIX: Broken test
2014-01-02 12:15:48 -05:00
Robin Ward
01be681a95
Link embeded topic to second post. They've already read the first.
2014-01-02 11:59:20 -05:00
Robin Ward
15faa01178
FIX: Missing variable
2014-01-02 11:55:58 -05:00
Robin Ward
1478f08e4f
In development mode, relax restrictions on embedding.
2014-01-02 11:32:50 -05:00
Robin Ward
4f8aed295a
FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra
2013-12-31 15:01:22 -05:00
Robin Ward
62db063e1e
Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
...
which not every server has. Have to rethink this.
This reverts commit e3e4c62887
2013-12-31 12:52:31 -05:00
Robin Ward
e3e4c62887
Support for Embeddable Comments via IFRAME
2013-12-31 12:26:24 -05:00
Neil Lalonde
90bf3cc3d4
Merge pull request #1760 from dv2/fix_spelling
...
Correct few spelling in the comments
2013-12-27 11:00:02 -08:00
Régis Hanol
9c8e50351d
first stab at calculating the score of a topic for the top tab
2013-12-27 18:10:35 +01:00
Sam
cbaa0a3a49
BUG: drafts broken for new topics
2013-12-27 10:35:53 +11:00
Régis Hanol
567d2bd23c
add top page
2013-12-24 00:50:36 +01:00
DV Suresh
24886c300b
Correct few spelling in the comments
2013-12-21 01:19:22 -06:00
Neil Lalonde
854d9c8fc6
Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length.
2013-12-19 16:15:47 -05:00
Neil Lalonde
1f0a59584b
Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations."
2013-12-18 14:47:22 -05:00
Régis Hanol
94fda12795
use a helper instead of a view for custom HTML content
2013-12-17 18:56:59 +01:00
Régis Hanol
4c6b535cc0
move arbitrary html content out of noscript and into the preloadstore
2013-12-17 18:25:27 +01:00
Régis Hanol
2ce75a8523
FIX: canonical url should not use the CDN
2013-12-17 00:35:34 +01:00
Neil Lalonde
341adc93a4
Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories.
2013-12-16 15:13:57 -05:00
Robin Ward
acf262b631
Support for "no subcategories"
2013-12-16 13:06:35 -05:00
Robin Ward
06e9cbc6cb
FIX: Look up a url without the query string if it couldn't be found with it.
2013-12-13 12:56:20 -05:00
Sam
05a3c8090f
Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
...
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
Neil Lalonde
6fa2e68742
Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show.
2013-12-12 15:52:30 -05:00
Régis Hanol
c7741c9622
FIX: absolute canonical link on topic pages
2013-12-12 17:24:00 +01:00
Régis Hanol
06dd7ffe3c
better revision history
2013-12-12 03:41:34 +01:00
Neil Lalonde
5171a23a9c
Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations.
2013-12-11 11:19:22 -05:00
Neil Lalonde
561961eff6
FIX: can grant titles to regular users. Guardian initializer needs current_user, not the target user.
2013-12-10 12:46:35 -05:00
Neil Lalonde
2596f7dec2
Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations."
2013-12-09 16:28:11 -05:00
Neil Lalonde
ca5d4d5e54
Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations.
2013-12-09 13:28:42 -05:00
Neil Lalonde
9a24d2651d
Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days.
2013-12-06 16:39:35 -05:00
Scott Albertson
51eff92170
Refactor UsersController#create
...
* Simplify controller action
* Extract service classes
2013-12-05 10:11:16 -08:00
Harry Seo
2d9876a6ac
FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases
2013-12-04 20:49:54 +09:00
Robin Ward
8c8645f158
FIX: Code and Emoticon formatting in HTML emails.
2013-11-28 17:21:14 -05:00
Sam
79087f4e6f
fix exception in logs
2013-11-28 12:39:59 +11:00
Neil Lalonde
a9ab98ef9e
Auto-close time can be entered in 3 ways, so a topic can close at any time
2013-11-27 09:52:35 -05:00
Sam
3fa48f8d76
Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937
2013-11-26 10:21:41 +11:00
Neil Lalonde
981d8f6aea
Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing...
2013-11-19 14:15:28 -05:00
Robin Ward
309904ef8f
Revert "Merge pull request #1673 from aperrault/patch-04"
...
This reverts commit c9ea89bdd39ed49888fc
2013-11-19 14:08:45 -05:00
Robin Ward
c9ea89bdd3
Merge pull request #1673 from aperrault/patch-04
...
Fixing neglect to determine whether a user has the permission to create ...
2013-11-19 10:50:38 -08:00
Shiv Kumar
2f0e20bc11
add session to auth hash in oauth complete method
2013-11-19 09:58:12 -08:00
Autumn Perrault
d9c026bec5
Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein.
2013-11-19 05:09:58 -07:00
Robin Ward
639394e38a
FIX: Pinned topics within a category weren't working without a refresh
2013-11-18 10:52:01 -05:00
Régis Hanol
482b752046
add edit reason when editing a post
2013-11-15 23:28:49 +01:00
railsaholic
34bba737ff
Refactor SessionController#create, reduce complexity.
...
Don't compromise readablity
2013-11-15 22:09:03 +05:30
Robin Ward
41dfcd2774
FIX: Pagination while sorting on column headers
2013-11-14 12:35:18 -05:00
Robin Ward
bda5a72c6a
Server side support for custom ordering of topics
2013-11-13 14:17:06 -05:00
Robin Ward
7207cef7aa
TopicQuery cleanup in advance of custom sorting:
...
- Move SQL method constants into a module
- Removed unused count methods
- Moved methods that don't return a TopicList into Topic
- Replaced some confusing method signatures
2013-11-13 12:26:32 -05:00
Robin Ward
df568df9dc
Controls for sorting topic columns
2013-11-13 11:48:38 -05:00
Régis Hanol
7e7d951152
do not pull hotlinked images when max_image_size_kb == 0
2013-11-13 17:30:48 +01:00
Sam
8339337cd1
strip out docker stuff, put into a plugin
2013-11-13 17:42:31 +11:00
Régis Hanol
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +01:00
Robin Ward
32a3da86da
Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
...
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
Sam
932c2675a7
work in progress, admin page for upgrades (provides source lives in git)
2013-11-12 16:42:35 +11:00
Scott Albertson
77b59b54ce
Refactor UsersController#invited
...
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
railsaholic
58f78e9001
Refactor Users#upload_avatar method
...
Moved avatar file upload to ```AvatarUploadService``` class and
```AvatarUploadPolicy```
Address review comments + require missing file in spec
2013-11-11 23:21:14 +05:30
Sam
3473734af0
FIX: bust broken password
2013-11-11 22:28:26 +11:00
sirMackk
af67284995
User ctrl refactor - breaks up large methods, moves some logic into model
...
Includes missing methods from backup for travis to pass
fix missing code, failing specs
keep params handling in the controller.
2013-11-09 18:44:13 +05:30
Robin Ward
6e43372e7c
Merge pull request #1610 from salbertson/sa-refactor-users-update
...
Move logic for updating a user to a service class
2013-11-07 12:29:19 -08:00
Neil Lalonde
0c6f794eb0
Used the term suspended instead of banned.
2013-11-07 13:53:49 -05:00
Scott Albertson
72bfa4471f
Move logic for updating a user into a service class
2013-11-07 08:39:39 -08:00
Robin Ward
de30af9302
Support for inviting to a forum from a user's invite page.
2013-11-06 12:56:50 -05:00
Robin Ward
25ef66c60b
User invites page now has search, displays first invites_shown records
2013-11-05 17:53:26 -05:00
Neil Lalonde
9c91ddd854
Should have put order on the screened urls results
2013-11-04 16:31:31 -05:00
Neil Lalonde
bd9b85f076
Screened Urls page shows results for each domain instead of each url
2013-11-04 16:24:48 -05:00
Robin Ward
ae81d78ab9
Merge pull request #1605 from vikhyat/fix-activerecord-associations-collectionproxy-serialization
...
Fix serialization of ActiveRecord::Associations::CollectionProxy in Rails 4
2013-11-04 07:16:52 -08:00
Vikhyat Korrapati
855ee3b43d
Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4.
2013-11-03 10:41:38 +05:30
Régis Hanol
b56b11d96a
add qunit to autospec
2013-11-01 23:57:50 +01:00
Neil Lalonde
92a0729937
When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs.
2013-11-01 10:47:26 -04:00
Neil Lalonde
ce5ebc3eb5
On sites with login_required enabled, after signup, don't show the /login page again
2013-10-30 16:37:36 -04:00
Robin Ward
3d6d7c8abe
SiteSetting to hide regular names from users
2013-10-30 15:45:34 -04:00
Robin Ward
6063b52d6a
Support for choosing a destination category when splitting topics.
2013-10-29 15:30:06 -04:00
Manoj
9650dbb97c
Refactor topics controller
...
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments
fix typo
2013-10-28 11:42:07 +05:30
Robin Ward
f4d9bf9181
Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email
...
Utilize already existing method 'find_by_username_or_email'
2013-10-25 12:57:18 -07:00
Neil Lalonde
017efdece5
A form to add ip addresses to be blocked or whitelisted
2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27
Can assign a parent category to a category.
2013-10-24 17:03:28 -04:00
Manoj
96ae3cdacc
Utilize already existing method 'find_by_username_or_email'
...
check presence of email using include, dont use =~
2013-10-24 19:26:06 +05:30
Sam
b7d3b52e4f
basic implementation of per-category new/latest etc filters
2013-10-24 21:05:06 +11:00
Sam
738a25b732
fix failure in rails 4 mode
2013-10-24 13:40:18 +11:00
Sam
666264879c
change it so all topics MUST include a category, we store a special uncategorized category to compensate
...
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Robin Ward
541620c115
Routes and support for sub-categories
2013-10-23 15:22:49 -04:00
Neil Lalonde
bf06014a16
Order by creation time by default in screened ip addresses table
2013-10-23 13:01:50 -04:00
Robin Ward
348e2e3ef2
Support for per-user API keys
2013-10-22 17:34:39 -04:00
Neil Lalonde
7d582fbee3
Screened ip address can be edited, deleted, and changed to allow or block.
2013-10-22 16:30:46 -04:00
Régis Hanol
26218ce11f
RSS feeds should contain only publicly-available posts
2013-10-22 16:30:25 +02:00
Régis Hanol
9b2f821012
Merge pull request #1512 from ScotterC/avatar-from-url
...
Build out a URI Adapter to allow uploading an avatar via a url
2013-10-21 13:17:37 -07:00
Robin Ward
2308784713
Merge pull request #1543 from railsaholic/small_users_controller_refactoring
...
refactor UsersController to reduce complexity
2013-10-21 12:21:03 -07:00
Scott Carleton
cbef844a57
Build out a URI Adapter to allow uploading an avatar via a url
...
Currently only really accessible via the API. The UriAdapter creates a
tempfile from a url and gives a ActionDispatch::HTTP::UploadedFile back
to the controller to process as normal.
This will help a lot in being able to transfer avatar urls from another
app without monkey patching a lot of discourse code.
2013-10-21 14:53:03 -04:00
Neil Lalonde
648b11a0eb
Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address.
2013-10-21 14:50:18 -04:00
Sam
0f4f593c89
correct broken test
2013-10-21 17:21:35 +11:00
Sam
e7a037709f
allow ordering categories in the edit category ui
2013-10-21 17:21:34 +11:00
Sam
451a1620f9
Merge pull request #1545 from railsaholic/lists_controller_refactor
...
Remove duplication of action defintion
2013-10-20 22:19:40 -07:00
Sam
29c8d2ebec
oops add security
2013-10-21 15:33:42 +11:00
Sam
6067795780
categories can now be re-ordered
2013-10-21 15:25:20 +11:00
Manoj
7dfa99998f
Remove duplication of action defintion, add missing spec for topics_by, extract out URL construction logic
2013-10-21 08:34:18 +05:30
Manoj
868e4ffe6d
refactor UsersController to reduce complexity
...
Refactored: UsersController#create
2013-10-19 15:18:11 +05:30
Sam
1ee49798b2
work in progress wide category list
2013-10-18 11:10:10 +11:00
Sam
3d647a4b41
remove rack cache, it has been causing trouble
...
instead implement an aggressive anonymous cache that is stored in redis
this cache is sitting in the front of the middleware stack enabled only in production
TODO: expire it more intelligently when stuff is created
2013-10-16 16:39:18 +11:00
dbarbera
9106596a9a
add image authorization on upload_avatar
2013-10-12 14:11:44 +02:00
Régis Hanol
23bf4436f5
FIX: avatar was attached to the user who uploaded it...
2013-10-12 10:55:41 +02:00
Régis Hanol
c38ba8acdd
add rss links to anonymous homepages
2013-10-11 18:43:29 +02:00
Sam
939a452293
require dependency was leading to errors in dev
2013-10-09 17:22:41 +11:00
Sam
7993845bfa
add current_user_provider so people can override current_user bevior cleanly, see
...
http://meta.discourse.org/t/amending-current-user-logic-in-discourse/10278
2013-10-09 15:11:54 +11:00
Neil Lalonde
bccb37b6f3
When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics.
2013-10-08 14:41:20 -04:00
Sam
094b5eccca
bug fixes for user_stat extraction, decrease querying
2013-10-07 15:05:00 +11:00
Sam
e18b93026a
defer view creation on so updates are not performed when people navigate to topics
2013-10-07 15:04:59 +11:00
Robin Ward
fc00269b7f
Pop up with user information when clicking avatar on topic page
2013-10-03 13:06:30 -04:00
Régis Hanol
af96ef2994
FIX: deleting a flagged post issue
...
cf. http://meta.discourse.org/t/deleting-a-flagged-post-issue/10061
The bug was only happening when you were about the delete the first post, which means deleting the entire topic.
2013-10-02 16:59:57 +02:00
Sam
af467a1675
404 page had horrible perf, it was using "take" instead of limit.
...
in such cases EVERY row is materialized and only after the limit is applied.
So ... imagine what happens on a forum with 2,000,000 topics
2013-10-02 13:05:03 +10:00
Robin Ward
be0ce08cc2
Ember Upgrade: 1.0
2013-10-01 11:16:27 -04:00
Sam
f0a122a66c
move job files so they live underneath app/ and not in lib/
...
introduce new setting email_always, that will force emails to send to users regardless of presence on site
2013-10-01 17:04:02 +10:00
Robin Ward
3f0c03a20c
FIX: Prevent unauthorized list of private message titles. Also remove some unused code.
2013-09-30 14:35:11 -04:00
Régis Hanol
cd4cda5b4c
allow users to specify thumbnail size
2013-09-27 10:57:31 +02:00
Neil Lalonde
b06f928568
Fix missing provider param message when using Persona
2013-09-23 09:46:25 -07:00
Neil Lalonde
13f17b2a5c
Add ability to customize css and header for mobile
2013-09-16 12:28:02 -04: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
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
4fa11f159f
Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO
2013-09-11 15:33:27 -04:00
Neil Lalonde
fe3693cdef
Merge branch 'master' of github.com:discourse/discourse
2013-09-11 10:20:27 -04:00
Sam
e26b3662ee
drafts were saving but client was failing to parse
2013-09-11 16:18:46 +10:00
Sam
efb15af209
not needed, already in private section
2013-09-11 16:18:17 +10:00
Neil Lalonde
e8ef55c446
Rename StaffActionLog to UserHistory
2013-09-10 22:01:20 -04:00
Neil Lalonde
48ee89940e
Merge pull request #1423 from einarj/nickname_registration_service
...
Nickname registration service object
2013-09-09 11:37:56 -07:00
Neil Lalonde
b73f4e9864
Put category description in meta description tag
2013-09-09 11:38:09 -04:00
Einar Jonsson
724b3aadcf
Extracted nickname registration out of the UsersController and into its
...
own service.
2013-09-09 09:26:50 +00:00
Régis Hanol
45b838009c
proper content-disposition header when downloading attachments
2013-09-06 19:23:56 +02:00
Neil Lalonde
45d7765936
Merge branch 'master' into mobile
2013-09-05 15:54:22 -04:00
Robin Ward
71c1b8b9b9
When deleting a post as staff, ask if you want to delete direct replies too
2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91
Select +Replies for bulk operations
2013-09-05 11:03:29 -04:00
Robin Ward
46efbac40e
Add "Unread" filter to messages tab. Rename the other two views.
2013-08-30 12:32:05 -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
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
Neil Lalonde
89265c3a8b
FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything.
2013-08-27 11:31:14 -04:00
Sam
c4a0152dc6
recover from bad CSRF tokens without requiring a hard refresh of the browser
2013-08-27 15:56:12 +10:00
Einar Jonsson
9085cec232
Move json hash from users controller to NicknameUnavailable
2013-08-26 15:00:11 +00:00
Sam
afd1a3ac7b
yeah ... we should be installing the gem :)
2013-08-26 13:52:15 +10:00
Sam
213ce33af2
Fixed all broken specs
...
Moved middleware config into authenticators
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
90dddb4395
store honeypot challenge in redis for extra security
2013-08-26 12:55:13 +10:00
Sam
c4a2e62a95
Merge pull request #1378 from justin808/justin808_cc
...
Lower Complexity of UsersController
2013-08-25 17:14:39 -07:00
Einar Jonsson
0d22a77c63
Added test case for nickname registration failure
...
* Also made a minor readability change by moving the auth.present? check
* from UsersController#create into #create_third_party_auth_records
* which is the method that relies on the check.
2013-08-25 20:18:07 +00:00
Robin Ward
b32e87c929
Merge pull request #1377 from ZogStriP/avatar-work
...
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward
b74754e673
Merge pull request #1371 from einarj/cleanup_user_registration
...
Extracted nickname registration into a private controller method
2013-08-25 07:30:10 -07:00
Robin Ward
e1efde6707
Merge pull request #1376 from gcapizzi/lists_controller_refactoring
...
ListController refactoring
2013-08-25 07:29:35 -07:00
Justin Gordon
464595df5c
Lower Complexity of UsersController
...
https://codeclimate.com/github/discourse/discourse/UsersController#method-complexity
2013-08-24 22:57:12 -10:00
Robin Ward
c0b051c9f6
Show Private Messages pill as a topic list rather than individual messages.
2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9
improved specs for avatar
2013-08-24 22:45:05 +02:00
Giuseppe Capizzi
6f19cb7252
Extract ListController#list_target_user
2013-08-24 19:38:02 +02:00
