309904ef8f
Revert "Merge pull request #1673 from aperrault/patch-04"
...
This reverts commit c9ea89bdd3bf3d92264cdbd7b0b971237ce34a72, reversing
changes made to 9ed49888fc6dcd2a60d8b8ef73f3508c64206dcd.
2013-11-19 14:08:45 -05:00
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
2f0e20bc11
add session to auth hash in oauth complete method
2013-11-19 09:58:12 -08:00
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
639394e38a
FIX: Pinned topics within a category weren't working without a refresh
2013-11-18 10:52:01 -05:00
482b752046
add edit reason when editing a post
2013-11-15 23:28:49 +01:00
34bba737ff
Refactor SessionController#create, reduce complexity.
...
Don't compromise readablity
2013-11-15 22:09:03 +05:30
41dfcd2774
FIX: Pagination while sorting on column headers
2013-11-14 12:35:18 -05:00
bda5a72c6a
Server side support for custom ordering of topics
2013-11-13 14:17:06 -05:00
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
df568df9dc
Controls for sorting topic columns
2013-11-13 11:48:38 -05:00
7e7d951152
do not pull hotlinked images when max_image_size_kb == 0
2013-11-13 17:30:48 +01:00
8339337cd1
strip out docker stuff, put into a plugin
2013-11-13 17:42:31 +11:00
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +01:00
32a3da86da
Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
...
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
932c2675a7
work in progress, admin page for upgrades (provides source lives in git)
2013-11-12 16:42:35 +11:00
77b59b54ce
Refactor UsersController#invited
...
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
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
3473734af0
FIX: bust broken password
2013-11-11 22:28:26 +11:00
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
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
0c6f794eb0
Used the term suspended instead of banned.
2013-11-07 13:53:49 -05:00
72bfa4471f
Move logic for updating a user into a service class
2013-11-07 08:39:39 -08:00
de30af9302
Support for inviting to a forum from a user's invite page.
2013-11-06 12:56:50 -05:00
25ef66c60b
User invites page now has search, displays first invites_shown
records
2013-11-05 17:53:26 -05:00
9c91ddd854
Should have put order on the screened urls results
2013-11-04 16:31:31 -05:00
bd9b85f076
Screened Urls page shows results for each domain instead of each url
2013-11-04 16:24:48 -05:00
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
855ee3b43d
Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4.
2013-11-03 10:41:38 +05:30
b56b11d96a
add qunit to autospec
2013-11-01 23:57:50 +01:00
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
ce5ebc3eb5
On sites with login_required enabled, after signup, don't show the /login page again
2013-10-30 16:37:36 -04:00
3d6d7c8abe
SiteSetting to hide regular names from users
2013-10-30 15:45:34 -04:00
6063b52d6a
Support for choosing a destination category when splitting topics.
2013-10-29 15:30:06 -04:00
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
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
017efdece5
A form to add ip addresses to be blocked or whitelisted
2013-10-24 17:19:10 -04:00
61468f6f27
Can assign a parent category to a category.
2013-10-24 17:03:28 -04:00
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
b7d3b52e4f
basic implementation of per-category new/latest etc filters
2013-10-24 21:05:06 +11:00
738a25b732
fix failure in rails 4 mode
2013-10-24 13:40:18 +11:00
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
541620c115
Routes and support for sub-categories
2013-10-23 15:22:49 -04:00
bf06014a16
Order by creation time by default in screened ip addresses table
2013-10-23 13:01:50 -04:00
348e2e3ef2
Support for per-user API keys
2013-10-22 17:34:39 -04:00
7d582fbee3
Screened ip address can be edited, deleted, and changed to allow or block.
2013-10-22 16:30:46 -04:00
26218ce11f
RSS feeds should contain only publicly-available posts
2013-10-22 16:30:25 +02:00
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
2308784713
Merge pull request #1543 from railsaholic/small_users_controller_refactoring
...
refactor UsersController to reduce complexity
2013-10-21 12:21:03 -07:00
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