github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-17 00:13:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14,764 Commits 214 Branches 500 Tags 960 MiB
a4c7f55a48
Commit Graph

1309 Commits

Author SHA1 Message Date
Sam
7d5c0ae28e FIX: broken and uneeded code 2014-08-08 09:07:51 +10:00
Régis Hanol
3ae1ebdfc3 FIX: use PostDestroyer when deleting/recovering a topic 2014-08-07 19:12:35 +02:00
Arpit Jalan
b3926efebc convert space to plus for invite email parameter 2014-08-06 14:02:00 +05:30
Sam
0b01310c84 FIX: system badges where created under id 100 2014-08-06 10:51:39 +10:00
Robin Ward
06c681b0de Merge pull request #2617 from techAPJ/patch-2 
FEATURE: dynamically load more invites
 2014-08-05 12:54:06 -04:00
Arpit Jalan
4cd8abc905 FEATURE: dynamically load invites 2014-08-05 22:20:23 +05:30
Régis Hanol
ec30086dea FEATURE: agree all the flags 2014-08-04 22:48:04 +02:00
Sam
cb0ecd9ff1 PERF: store topic views in a topic view table 
* cut down on storage of the work Topic, 3 times per row (in 2 indexes)
* only store one view per user per topic
* only store one view per ip per topic
 2014-08-04 19:07:55 +10:00
Sam
03c8f09be8 PERF: finalize porting to new incoming links structure 2014-08-04 16:43:57 +10:00
Sam
0920c4bea6 PERF: reduce storage requirements for incoming links 
Only store incoming links for topics.
 2014-08-04 11:06:48 +10:00
Sam
6dbd6f7428 FIX: redirect to preserve json 2014-07-30 15:25:49 +10:00
Sam
5a3466a6c3 FIX: keep correct ordering on admin badges 2014-07-30 08:46:59 +10:00
Robin Ward
ac4a33a656 FIX: Display proper error message when changing a trust level fails 2014-07-29 15:54:20 -04:00
Robin Ward
7cc4a157f6 Merge pull request #2603 from techAPJ/patch-1 
FEATURE: allow staff to send multiple invites to same email
 2014-07-29 14:58:39 -04:00
Arpit Jalan
f571abfaaf FEATURE: allow staff to send multiple invites to same email 2014-07-30 00:13:11 +05:30
Sam
49d03cf14e FEATURE: support for /t/1234 2014-07-29 16:04:28 +10:00
Régis Hanol
bddffa7f9a FEATURE: flag dispositions normalization 
All flags should end up in one of the three dispositions
  - Agree
  - Disagree
  - Defer

In the administration area, the *active* flags section displays 4 buttons
  - Agree (hide post + send PM)
  - Disagree
  - Defer
  - Delete

Clicking "Delete" will open a modal that offer to
  - Delete Post & Defer Flags
  - Delete Post & Agree with Flags
  - Delete Spammer (if available)

When the flag has a list associated, the list will now display 1
response and 1 reply and a "show more..." link if there are more in the
conversation. Replying to the conversation will NOT give a disposition.
Moderators must click the buttons that does that.

If someone clicks one buttons, this will add a default moderator message
from that moderator saying what happened.

The *old* flags section now displays the proper dispositions and is
super duper fast (no more N+9999 queries).

FIX: the old list includes deleted topics
FIX: the lists now properly display the topic states (deleted, closed,
archived, hidden, PM)
FIX: flagging a topic that you've already flagged the first post
 2014-07-28 19:28:07 +02:00
Sam
1a6aa07611 FEATURE: editable badge groups 2014-07-27 18:22:01 +10:00
Régis Hanol
3d6e2713d1 BUGFIX: login was broken when login was required 2014-07-26 23:16:08 +02:00
Neil Lalonde
5a33e6f00c Move FAQ, Terms of Service, and Privacy Policy into topics in the Staff category. First post of those topics will be rendered on their respective pages. Site settings and content are not used for these documents anymore. Translations of the default text is moved into the standard YML files. 2014-07-25 14:41:20 -04:00
Sam
d47d323f29 FIX: corrupt avatar record causing 404 2014-07-25 15:26:43 +10:00
Sam
40af9ce612 FIX: do not store incoming links on avatars or uploads 2014-07-25 15:10:06 +10:00
Sam
ec03d135fa FEATURE: allow advanced badge options in admin screen 
clean up serializer, allow simplistic preview
 2014-07-24 18:28:23 +10:00
Sam
b9a7d945c3 Improve badge grouping UI 
Start work on triggers
 2014-07-23 11:43:17 +10:00
Sam
c8284170ad FEATURE: badge grouping UI 
FIX: not loading more badges on badge show page
 2014-07-18 15:46:36 +10:00
Sam
1359a02128 Merge pull request #2532 from riking/sidekiq 
Pass more context from Sidekiq jobs to Logster
 2014-07-18 10:24:51 +10:00
riking
12cb682548 Start passing more context to Discourse.handle_exception 2014-07-17 14:11:56 -07:00
riking
19b757b058 FEATURE: Hide deleted posts by default for staff 2014-07-17 10:40:15 -07:00
Robin Ward
f06f8abedd Merge pull request #2537 from ligthyear/group-member-management-on-user 
Improved Group Member Management on User Administration
 2014-07-17 11:00:05 -04:00
Sam
bfb37054e8 Badge Grouping work in progress 2014-07-17 16:11:10 +10:00
Sam
189b1c729a FEATURE: query param for topic state 2014-07-17 09:29:09 +10:00
Sam
9468ebeb2e CHANGE: Mini Profiler only enabled for developers in prd 2014-07-17 08:34:41 +10:00
Robin Ward
fb8dda7f42 FIX: We should use category_id instead of category_name to perform 
operations, now that the subcategory names are not unique.
 2014-07-16 15:40:35 -04:00
Régis Hanol
7dcf2a2c4f FEATURE: show the user's flagged/deleted posts 2014-07-16 21:04:55 +02:00
Neil Lalonde
939e8505a9 Remove hub username integration 2014-07-16 12:25:24 -04:00
Neil Lalonde
01a68f8cc7 Emails are case insensitive 2014-07-16 10:22:01 -04:00
Sam
e347eea629 FEATURE: show user what badges they have 2014-07-16 17:55:08 +10:00
Robin Ward
f2dd35ab08 Improve the unsubscribe to digest experience. Give a link in case it 
fails, provide a different message if you are logged in as a different
user, increase expiry to 2 months from 1 week.
 2014-07-15 17:20:59 -04:00
Robin Ward
e20a8e6dea FIX: Allow users to unsubscribe to digests while not logged in if 
`login_required` is set to true.
 2014-07-15 16:47:26 -04:00
Robin Ward
6d7531f690 Merge pull request #2542 from techAPJ/patch-1 
FEATURE: topic support in disposable invites
 2014-07-15 15:15:19 -04:00
Robin Ward
4f416bf6ce Check honeypot/challenge value on activation too 2014-07-15 14:07:35 -04:00
riking
915f60b0fc Don't redirect to login when activating account... 2014-07-15 10:50:28 -07:00
Arpit Jalan
8862a881f8 FEATURE: topic support in disposable invites 2014-07-15 23:11:06 +05:30
Sam
2d0def9940 FIX: First Quote badge bust 
Feature: track quoted posts
 2014-07-15 17:47:24 +10:00
Neil Lalonde
766196af87 FEATURE: add site setting allow_new_registrations which can be used to block all new account registrations 2014-07-14 15:42:22 -04:00
Robin Ward
cce7cf8c85 FEATURE: Require Javascript to activate an account via email link 2014-07-14 12:26:10 -04:00
Robin Ward
c12780eb2b Merge pull request #2538 from techAPJ/patch-1 
FEATURE: disposable invite tokens
 2014-07-14 12:13:44 -04:00
Arpit Jalan
575b5e3d13 FEATURE: disposable invite tokens 2014-07-14 21:30:46 +05:30
Sam
4a2cc269ab FIX: allow selection of no title 2014-07-14 18:07:07 +10:00
Sam
88469721b9 FEATURE: Allow admins to disable specific badges 2014-07-14 17:40:36 +10:00
Sam
6618358586 FIX: dupe protection is API only now 
make optional later on (was introduced for wordpress plugin)
 2014-07-14 15:59:58 +10:00
Benjamin Kampmann
ac3f1ba3d6 Improved Group Member Management on User Administration 
Allows for a quick and easy group membership management on the
user-administration page. Uses the select2 UI component to
autosuggest other groups, remove existing ones and lock in automatic
groups.
 2014-07-13 20:11:38 +02:00
riking
783454ebe1 Fix /p/post/user route not saving referrals 
Make user id optional for /p/id/uid
Add /posts/id/raw route for debugging failed post processing
 2014-07-11 14:44:07 -07:00
Sam
833c50c460 FEATURE: Read Faq badge 2014-07-11 17:32:29 +10:00
Neil Lalonde
e565ae2528 FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting 2014-07-10 12:58:41 -04:00
Sam
27f85e5451 FIX: allow for subdirectorys for cdn assets 2014-07-10 17:29:38 +10:00
Sam
6019e3f257 FIX: remove hardcoding from middleware stack so we can control it 2014-07-10 17:01:21 +10:00
Sam
5032c96486 FIX: disable x accl redirect for CDN assets 
We need to keep headers in tact
 2014-07-10 16:32:46 +10:00
Sam
2f8d139ec0 BUGFIX: incorrect ordering in category permissions 
FEATURE: UI for categories that we allow badges on
 2014-07-10 12:02:16 +10:00
Sam
9ee93aad5b FIX: letter avatars to live in uploads directory, add last modified 2014-07-08 17:20:27 +10:00
Sam
aca0aa8e56 FIX: missing last modified on avatars 2014-07-08 17:16:29 +10:00
Sam
efd6bf1490 FIX: set last modified date on CDN assets 2014-07-08 14:48:20 +10:00
Régis Hanol
59b5ba7c0f BUGFIX: IP lookup wasn't working when using HTTPS 
REFACTOR: the ip locator into a ip-lookup component
 2014-07-07 22:18:18 +02:00
Neil Lalonde
5bcfb6ee38 FIX: don't show 'About category' topics on the 404 page 2014-07-04 16:18:17 -04:00
Régis Hanol
609d1e05cd FEATURE: optimize the hell out of letter avatars 2014-07-04 13:27:17 +02:00
riking
0d4163e0a2 FEATURE: Nice error handling page 2014-07-03 07:52:14 -07:00
Sam
5a28609afc FIX: listable badges need more logic 2014-07-03 20:34:26 +10:00
Sam
6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Sam
db34b534e6 Merge pull request #2494 from techAPJ/bulk-invite-4 
FEATURE: support txt file to be uploaded for bulk invite
 2014-07-03 17:33:16 +10:00
Sam
9a9ad9bda8 FEATURE: Badge progress 
- Refactor model so it stores backfill query
- Implement autobiographer
- Remove sample badge
- Correct featured badges to only include a badge once
 2014-07-03 17:29:44 +10:00
Robin Ward
462dcadd01 FEATURE: Subcategory list on parent subcategory page. 2014-07-02 16:47:43 -04:00
Arpit Jalan
85ba55dc26 FEATURE: support txt file to be uploaded for bulk invite 2014-07-02 19:21:15 +05:30
Sam
5a0aed2bfa FIX: regression, forgot password broken 
also... mocks were invented by the devil
 2014-07-02 13:06:55 +10:00
Robin Ward
e22688a204 FEATURE: Can upload images to categories 2014-06-30 14:14:00 -04:00
Robin Ward
9000c358d1 REFACTOR: Use common path for RESTful DELETE action from upload image 
component
 2014-06-30 14:13:59 -04:00
Robin Ward
4088fba4f2 REFACTOR: Convert profile background uploader to be an ember component 2014-06-30 14:13:59 -04:00
Sam
90d7718103 add search filter 2014-06-30 17:18:08 +10:00
Vikhyat Korrapati
2e52f795ea Backend changes to support improved badge pages. 2014-06-28 01:24:00 +05:30
Régis Hanol
c0cd109e9d TRIVIAL: code formatting 2014-06-26 19:50:29 +02:00
Andrew Bezzub
386d1e231a move profile_background from User to UserProfile 2014-06-26 12:30:07 -04:00
Sam
39b5539ba8 BUGFIX: downcase slugs 2014-06-25 11:36:17 +10:00
Robin Ward
8a4e96645c FEATURE: Can click to expand hidden posts to see the good stuff! 2014-06-20 17:07:12 -04:00
riking
2d5f667160 Make ?preview-style make sense 
New behavior:
?preview-style=(sha) -- see that stylesheet
?preview-style= -- see the currently selected stylesheet
?preview-style=default -- see the default stylesheet ("rescue mode")
 2014-06-20 09:06:36 -07:00
Vikhyat Korrapati
41ecba1b77 Mark badge notification as read when the notification is clicked. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
e0fd1f6f5e Add ability to specify custom font awesome icon for badges. 2014-06-19 16:56:18 +05:30
Vikhyat Korrapati
67a2b2598d Cosmetic changes. 2014-06-19 16:56:18 +05:30
Robin Ward
42c7ad4670 FIX: build broke, also escaping issue on poster name 2014-06-18 17:47:31 -04:00
Robin Ward
60cb5ea6a9 FIX: If a user is deleted, don't break embedded comments for admins. 2014-06-18 17:39:36 -04:00
Neil Lalonde
ad2bd11d6e Add a way to get user based on sso external id 2014-06-18 14:40:25 -04:00
Régis Hanol
00117c18c3 FEATURE: dismissable banner topic 2014-06-18 20:05:19 +02:00
Régis Hanol
30611c343c ensures only one banner topic at all time 2014-06-18 20:05:18 +02:00
Régis Hanol
5238a95efb add make/remove banner topic actions 2014-06-18 20:05:18 +02:00
Sam
9007d96466 Merge pull request #2425 from vikhyat/read-notifications-silently 
Allow reading notifications without marking them as read
 2014-06-18 08:09:07 +10:00
Vikhyat Korrapati
9b89b1466f Allow reading notifications without marking them as read. 2014-06-17 23:34:04 +05:30
Sam
56dcd00570 BUGFIX: trust_level_0 group not including trust_level_1 
BUGFIX: manual trust level change not adding user to groups
BUGFIX: system not in correct trust level groups
 2014-06-17 10:52:02 +10:00
riking
6e698315d6 Allow all /my URLs 
Previously, URLs like /my/activity/posts were denied. This change allows those URLs.
 2014-06-14 10:58:20 -07:00
Sam
76166567fb Use the cheap Defer queue as opposed to sidekiq for view tracking. 2014-06-12 11:29:29 +10:00
Sam
8c7363bdd5 BUGFIX: not clearing blue notifications correctly when you have a PM 2014-06-12 10:50:41 +10:00
Régis Hanol
0781531e3c Merge pull request #2415 from techAPJ/bulk-invite-users-5 
FEATURE: Bulk Invite
 2014-06-10 19:11:11 +02:00
Neil Lalonde
c61462662b Add ability to run validation on site settings. notification_email and other email address settings are now validated. 2014-06-09 16:59:20 -04:00
Arpit Jalan
727184641e FEATURE: Bulk Invite 2014-06-09 01:43:39 +05:30
Sam Saffron
d97ceb1d72 FEATURE: log_out endpoint for admins 2014-06-06 13:02:52 +10:00
Benjamin Kampmann
6b3d5c7348 add min_posts, max_posts to filter the topic list queries 
superseeds #2412
 2014-06-05 15:30:24 +02:00
Sam
f1a28d62a3 FEATURE: support registration of custom html by plugins 2014-06-05 11:39:33 +10:00
Régis Hanol
0df666277d BUGFIXES: properly deal with bookmarks and deleted posts 
BUGFIX: removing a bookmark from the activity feed was busted for deleted posts
BUGFIX: delete associated user actions when deleting a post
 2014-06-04 17:41:11 +02:00
Sam
9e9c41ac52 FEATURE: admins can clear screend emails if needed 2014-06-02 16:53:00 +10:00
Sam
7312ee699b BUGFIX: allow static assets (avatars) for sites that require login 2014-06-02 13:13:06 +10:00
Sam
91b6459f2b BUGFIX: allow users to pick no avatar 2014-05-30 14:45:55 +10:00
Sam
fa6f22dd39 Move letter avatars out of upload system 
FIX: S3 issues around system avatars
FIX: reduced backup file size
 2014-05-30 14:45:55 +10:00
Sam
fe594f5d1e Merge pull request #2372 from vikhyat/badge-system 
Multiple grant badges
 2014-05-30 10:18:00 +10:00
Catrin
772a304fc2 dropdown on categorypage 2014-05-29 18:18:27 -04:00
Sam
5adc486cef BUGFIX: missing avatars in topic map 
Cleanup uneeded column
 2014-05-29 14:59:14 +10:00
Sam
50a0c1a751 BUGFIX: fix redirect, correct multisite 2014-05-28 00:15:09 +10:00
Sam
0c86d9ed9e BUGFIX: proper multisite support for origin pull CDNs 2014-05-27 23:13:42 +10:00
Sam
18bdc4e63e Add DoS protection to action 2014-05-27 22:29:27 +10:00
Sam Saffron
252e93d0f2 BUGFIX: support CDN for avatars 
Correct broken spec
Implement S3 support
 2014-05-27 14:40:46 +10:00
Sam
504cfcff96 Fix specs for avatars 
Implement avatar picker
Correct avatar related jobs
 2014-05-27 10:08:03 +10:00
Sam
6c1c8be794 Work in progress, keeping avatars locally 
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
 2014-05-27 10:08:03 +10:00
Robin Ward
b1d2aba0f3 Clean up notifications if a user can't see a topic 2014-05-26 13:26:46 -04:00
Sam
7fbf162666 Logster update 
cleans up a bunch of messed up context stuff with multisite
improves backtraces
adds request params
 2014-05-25 13:54:52 +10:00
Neil Lalonde
742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Robin Ward
6dd1880f1f FIX: More safety when displaying link counts on blogs 2014-05-20 15:20:33 -04:00
riking
41332ab7ad Allow anonymous to see raw posts 2014-05-19 23:33:27 -07:00
Sam
c1776fa1ae Merge pull request #2360 from vikhyat/badge-system 
Badge system updates
 2014-05-20 08:24:26 +10:00
Vikhyat Korrapati
4de700b49b Change badge user list limit to 96 so that it is divisible by 8. 2014-05-19 10:32:59 +05:30
Sam
832a730e36 BUGFIX: re-enable CDN js debugging in a robust way 
May be disabled if needed via site setting
 2014-05-19 08:46:28 +10:00
Neil Lalonde
27cbc06563 Add fixed_category_positions site setting to handle whether categories are ordered by specified positions or by activity. 2014-05-16 11:33:52 -04:00
Neil Lalonde
c4d3aa3d47 Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline. 2014-05-14 10:18:12 -04:00
Régis Hanol
3fde28e108 BUGFIX: correctly auto-select /top time range when filtering on a category 2014-05-14 11:49:50 +02:00
Sam
ca4c72e648 BUGFIX: 500 error on some invalid uploads 2014-05-14 10:51:09 +10:00
Neil Lalonde
6e0eb89697 Don't show suspended users in autocomplete fields unless you are staff 2014-05-13 11:44:15 -04:00
Wojciech Zawistowski
960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Régis Hanol
fca6738212 BUGFIX: could not see the revisions of a post in a deleted topic 2014-05-12 16:30:10 +02:00
Régis Hanol
cf40851905 BUGFIX: 404 on /users/:user/private-messages 2014-05-12 12:02:32 +02:00
Régis Hanol
bc3de84ebf FEATURE: remove bookmark button in activity feed 2014-05-12 09:33:26 +02:00
Sam
97ae43126b BUGFIX: 500 error on missing category 2014-05-12 15:50:31 +10:00
Sam
f8b7f0d73f FEATURE: logster env tab, log current user 2014-05-12 15:28:23 +10:00
Robin Ward
6cd3796c39 FIX: Blog counts stopped working with additional security checks 2014-05-09 16:26:14 -04:00
Sam
084ec87850 FEATURE: admins can invite users to groups via the web UI 2014-05-09 18:22:36 +10:00
Sam
3f07c1d0a1 Backend support for group invites 2014-05-09 18:22:35 +10:00
Sam
4025591a1d Merge pull request #2307 from alxndr/latest-topics-rss-title-tweak 
change title in Latest Topics RSS feed title
 2014-05-08 09:21:06 +10:00
Sam
a2e2d0e886 Merge pull request #2316 from mutiny/refactor-where-first 
Refactor `where(...).first` to `find_by(...)`
 2014-05-08 09:10:45 +10:00
Régis Hanol
21e8ae0eca BUGFIX: the /top page now shows the first non-empty period 2014-05-07 19:04:39 +02:00
Neil Lalonde
63a1f87806 Use topic excerpts and category desriptions in meta description tags for crawlers 2014-05-07 11:21:37 -04:00
Louis Rose
1574485443 Perform the where(...).first to find_by(...) refactoring. 
This refactoring was automated using the command: bundle exec "ruby refactorings/where_dot_first_to_find_by/app.rb"
 2014-05-06 14:41:59 +01:00
Alexander
deb99e956e RSS title element is SiteSetting.title + translated filter description 2014-05-05 09:33:19 -07:00
Neil Lalonde
ce381860dc Order latest.rss by created_at, not updated_at 2014-05-02 11:51:16 -04:00
Alexander
43ed6979be feed titles get translations of "Topics" 2014-05-01 14:17:09 -07:00
Alexander
891a1c4279 feed titles now prefixed with SiteSetting.title 2014-05-01 09:37:13 -07:00
Régis Hanol
11af466737 FEATURE: add a specific flag reason when a post has been hidden 2014-04-30 16:58:01 +02:00
Robin Ward
f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
Neil Lalonde
f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Neil Lalonde
1da59e7e2e FIX: deactivated users shouldn't be able to log in 2014-04-28 13:46:28 -04:00
Vikhyat Korrapati
a8e2c5e616 Use PreloadStore for the badge pages. 2014-04-28 10:30:50 +05:30
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Régis Hanol
d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system 
Incrementally load users in the badge page
 2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
4e89b64e64 Load 100 users at a time for the badge page, with a button to load more. 2014-04-24 14:48:26 +05:30
Sam
05efc8df16 BUGFIX: likes would cause whole post to re-render 2014-04-24 12:42:04 +10:00
Robin Ward
e48cf06fc9 REFACTOR: Add urls for admin groups, make it more idiomatic ember 2014-04-23 15:15:46 -04:00
Robin Ward
af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Régis Hanol
64b8f2f759 TRIVIAL: remove puts statement (cc. @eviltrout) 2014-04-21 23:00:13 +02:00
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in 
user.
 2014-04-21 11:52:11 -04:00
Régis Hanol
756ea0178a Merge pull request #2276 from vikhyat/badge-system 
Badge system updates
 2014-04-18 11:46:19 +02:00
Vikhyat Korrapati
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
Régis Hanol
b2cb4b27a1 Merge pull request #2273 from paully21/development-branch 
Add blurb of post to search results via API
 2014-04-17 21:06:03 +02:00
Vikhyat Korrapati
843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Robin Ward
2eab288dc9 Port "Summarize Topic" to query-params-new 2014-04-17 10:46:33 -04:00
paully21
84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05:00
Sam
30e73104e4 Bump up to 200 for now, UI perf needs lots of work 2014-04-17 16:25:06 +10:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati
8f53b7a65b Detect arrays for serialization using respond_to?(:to_ary). 
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
 2014-04-16 20:48:09 +05:30
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Régis Hanol
9cd8476453 REFACTOR: use an options hash instead of multiple nil-able parameters 2014-04-15 17:17:10 +02:00
Régis Hanol
542d54e6bf BUGFIX: uploads to S3 2014-04-15 13:04:14 +02:00
Régis Hanol
2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02:00
Robin Ward
122f2a00cc Don't look for a JS format. IE11 seems to not request it even with a 
`<script>` tag.
 2014-04-14 12:16:08 -04:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Sam
b0dc9279ff Merge pull request #2203 from riking/change-owner 
Change post owner functionality
 2014-04-09 09:31:46 +10:00
riking
eb90315dfd Strip whitespace from site settings 2014-04-08 01:59:48 -07:00
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Sam
0372b81d11 FEATURE: allow moderators to globally pin topics 2014-04-07 16:38:51 +10:00
Régis Hanol
e7601db730 BUGFIX: ensured logged in wasn't listing all anonymous filters 2014-04-04 10:05:40 -07:00
Robin Ward
dbab628e16 Support for creating embedded topics via API 2014-04-03 14:42:44 -04:00
Robin Ward
10d0320532 FIX: Allow expanding posts when anonymous, add specs 2014-04-03 11:30:43 -04:00
Robin Ward
d1e7fa1c47 Minor tweaks to importing first posts 2014-04-02 15:54:21 -04:00
Robin Ward
558a06a117 Adds better reusable error message support. Added to fetching remote 
posts. /cc @riking
 2014-04-02 13:22:10 -04:00
Robin Ward
b250aa36a0 Remote fetching of blog contents 2014-04-02 10:26:46 -04:00
Robin Ward
50fb048b99 Interface for expanding OP contents 2014-04-02 10:26:46 -04:00
Sam
be06156629 SECURITY: when enabled_local_logins is false users could log in via API 
thanks @Nicholas Blanco
 2014-03-26 15:39:44 +11:00
Sam
3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Neil Lalonde
ea86cfd4ef FIX: categories with non-ascii names will have broken next page urls 2014-03-24 13:36:23 -04:00
Sam
1cd32ced33 FEATURE: update likes and flags live. 2014-03-24 13:22:03 +11:00
Robin Ward
539890afdf Let's not show tons of extra information about invites unless you're the 
person who invited them.
 2014-03-21 14:16:11 -04:00
Vikhyat Korrapati
dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati
0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati
50ce93a850 Use render_serialized for rendering instances in UserBadgeController. 2014-03-21 11:09:19 +05:30
Robin Ward
a4daafa026 Support trailing / when retrieving comment counts. 2014-03-20 15:22:49 -04:00
Sam
619fa50d4b BUGFIX: twitter auth asking for a password 2014-03-20 14:49:25 +11:00
Sam
fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Vikhyat Korrapati
9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Neil Lalonde
283dc7dd2d Trust level 4: add ability to edit any post and see edit history 2014-03-13 10:47:49 -04:00
Neil Lalonde
9ca516e58d Rename nickname to username in the code. Use new hub routes. (Old routes still exist as aliases for old Discourse instances.) 2014-03-12 12:39:36 -04:00
Robin Ward
dc1d6decf5 Support for removal of old backups automatically via a site setting 2014-03-12 12:24:35 -04:00
Régis Hanol
363fabd3e7 add tests for ListController.best_period_for 2014-03-12 12:58:41 +01:00
Robin Ward
2b0151afe9 BUGFIX: Editing a category would break categories for the current user 
session.
 2014-03-05 17:33:14 -05:00
Robin Ward
b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET 
request. We should report a failure then. They likely logged out or
in another tab or timed out.
 2014-03-05 12:12:53 -05:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds 
FEATURE: Profile Backgrounds
 2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds 
Shares a modified codebase with avatars called "user_image"
 2014-03-05 15:10:44 +01:00
Benjamin Kampmann
bf77c84095 BugFix: email-in on categories wasn't null-ed properly 
Causing a problem if two categories got saved with an empty string because the corresponding Database constraint on the index would complain about dublicate values
 2014-03-05 00:42:05 +01:00
Robin Ward
f9cd354a2c FEATURE: Button to reset new 2014-03-03 15:47:01 -05:00
Robin Ward
158487dfc2 FIX: Clean up next/prev rel links 2014-03-03 12:56:37 -05:00
Sam
172e517b31 Merge pull request #2012 from ligthyear/incoming-emails 
Advanced New-Topic via Email Feature
 2014-03-03 10:58:10 +11:00
Neil Lalonde
b40313559b FIX: moderators should not be able to see site setting changes in the staff action logs. Fixes #2027 2014-02-28 16:30:54 -05:00
Benjamin Kampmann
d32cb55837 Add public-inbox to Email-In-Feature 
- Adds the advanced option to accept email from non-users per category email-address
 - Adds tests covering the new feature
 - Adds UI to configure this feature in the frontend
 2014-02-28 16:53:58 +01:00
Benjamin Kampmann
37cea49459 Add Email-In-Per-Category 
- allow the configuration of an inbox-email-address per category
 - post emails to that email into that category instead of global

 - Adds UI for configuration
 - Adds Documentation for configuration
 - Adds Tests for new feature
 2014-02-28 16:53:58 +01:00
Régis Hanol
ca9f6e9137 BUGFIX: couldn't upload backup on OSX 
--B is not a valid df option on OSX
 2014-02-28 15:43:50 +01:00
Régis Hanol
70ca6171d1 BUGFIX: fix math & unit when checking disk space 2014-02-27 16:55:12 +01:00
Neil Lalonde
7322345039 FIX: when shown 403 error page and logging in, it will take you to the same page 2014-02-26 17:53:53 -05:00
Régis Hanol
043901ef46 FEATURE: warn the user when there is not enough space on disk to upload a backup 2014-02-26 19:38:06 +01:00
Sam
74a1145a0b BUGFIX: sso to respect must_approve_users 2014-02-26 10:27:39 +11:00
Sam
440435f023 FEATURE: SSO to handle return_path automatically 2014-02-26 09:58:30 +11:00
Neil Lalonde
b15e771d67 Oops, I meant 1 2014-02-25 12:19:22 -05:00
Neil Lalonde
7288bf1f31 Add previous page link for crawlers 2014-02-25 12:15:48 -05:00
Sam
6f31d3f0e5 FEATURE: single sign on support 
Added support for outsourcing auth to a different website, documentation on meta
 2014-02-25 14:31:03 +11:00
Robin Ward
3151f59bc9 REFACTOR: We don't cache the json for the Site model anymore, so let's 
rename and remove the methods leftover from that.
 2014-02-24 14:25:37 -05:00
Wojciech Zawistowski
227c0af20b Removes unnecessary instance vars. 2014-02-24 18:03:29 +01:00
Régis Hanol
68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00
Robin Ward
1aa27ade17 FEATURE: If you don't select any topics to "Dissmiss Read" it does all 
by filter.
 2014-02-21 15:18:45 -05:00
Robin Ward
a07e9f7e71 FEATURE: Bulk reset read status. 2014-02-21 15:18:45 -05:00
Robin Ward
7a07f14dfc FEATURE: Can select topics and hit Dismiss Read on the /unread filter 2014-02-21 15:18:45 -05:00
Neil Lalonde
9545e2e46e FIX: broken 404 page. don't bother showing current_usre stuff 2014-02-21 12:24:45 -05:00
Wojciech Zawistowski
ed311eb65a PostsController refactoring. 2014-02-21 17:12:43 +01:00
Robin Ward
d95887c57d CHANGE: We now include the _escaped_fragment_ support by default, but 
only if the crawler check fails. It is a fallback for non-google search
engines that support the Ajax crawling API.
 2014-02-20 17:02:26 -05:00
Robin Ward
c4b5455c21 REFACTOR: Rename GooglebotDetection to CrawlerDetection because we 
will likely whitelist more crawlers in the future.
 2014-02-20 16:07:02 -05:00
Wojciech Zawistowski
cfbeba84d2 Adds tests for PostsController#replies. 2014-02-20 17:38:13 +01:00
Régis Hanol
d443ddd43d Merge pull request #1922 from joallard/language-toggle 
Allow users to toggle interface language in their preferences
 2014-02-19 18:28:00 +01:00
Wojciech Zawistowski
5e8db5ce14 Adds specs for PostsController#by_number. 2014-02-19 17:41:17 +01:00
Neil Lalonde
7f6b2e5563 Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app. 2014-02-18 17:18:53 -05:00
Robin Ward
18e98851e3 Use lower case group names in URLs 2014-02-18 16:43:19 -05:00
Sam
43612e9fde Merge pull request #1971 from velesin/posts_controller_refactoring 
Refactors PostsController and adds unit tests.
 2014-02-19 08:34:40 +11:00
Robin Ward
f19b0b5fe0 Include members count on groups page. 2014-02-18 16:17:04 -05:00
Jonathan Allard
0592420e52 Add a site setting to allow users to toggle I18n.locale 
It is false by default.
 2014-02-18 14:54:00 -05:00
Jonathan Allard
c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Wojciech Zawistowski
5b9a4d3581 Refactors PostsController and adds unit tests. 2014-02-18 17:19:38 +01:00
lonehangman
739c9688ae Added endpoint for site JSON 
Removed unneeded code
 2014-02-17 15:16:53 +09:30
Neil Lalonde
d298e2e065 Detect Googlebot from user agent and use a different layout that doesn't load javascript 2014-02-15 17:54:34 -05:00
Régis Hanol
683bf8c0a4 FEATURE: add all email logs tab 2014-02-15 01:17:13 +01:00
Régis Hanol
3f3c9ca7cb FEATURE: add filters on email logs 2014-02-15 00:50:08 +01:00
Neil Lalonde
35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
Sam
177371fb69 do a full GC prior to getting stats 2014-02-14 16:10:26 +11:00
Sam
b75620973f FEATURE: memory stats route for diagnostics in admin 2014-02-14 15:45:12 +11:00
Régis Hanol
b89d328de2 display/preload the logs of the last/current operation 2014-02-13 13:31:14 -08:00
Régis Hanol
5725f02d9e allow full access to /admin/backups while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol
3be1b5569a backups controller & specs 2014-02-13 13:31:13 -08:00
Régis Hanol
8344f0d8fd remove old import/export code 2014-02-13 13:31:13 -08:00
Sam
c0686a6dc6 BUGFIX: regression, not handling nil count for recent report 2014-02-14 07:21:19 +11:00
Neil Lalonde
067b08c422 FIX: stupid mistake that broke flagging of posts 2014-02-13 15:10:02 -05:00
Neil Lalonde
8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
Sam
e8aa85d783 FEATURE: unread pms go in front of notification report 
also refactor fat controller
 2014-02-13 17:27:50 +11:00
Sam
4ff6780758 Merge pull request #1935 from eriko/remove_cas 
Remove cas
 2014-02-13 17:26:20 +11:00
Sam
5d7a33a799 BUGFIX: flag topic broke all liking on the sites 2014-02-13 12:56:31 +11:00
Robin Ward
a963dd9081 Support embeddable_host values that contain a HTTP/HTTPs protocol 2014-02-12 15:56:06 -05:00
Robin Ward
669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd 
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
 2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Erik Ordway
1167b5c4b5 I can see this on git hub but it is being missing by the test 2014-02-11 17:25:54 -08:00
Robin Ward
b035c050d2 Merge pull request #1920 from nickborromeo/list-controller 
Extract queries to keep logic in the Categories Model
 2014-02-11 15:48:20 -05:00
Sam
7ad00f426c FEATURE REMOVAL: persona login 
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
 2014-02-11 16:56:48 +11:00
Sam
820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
Robin Ward
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
Nick Borromeo
b51bebb200 Extract queries to keep logic in the Categories Model 
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.

This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.

 Please enter the commit message for your changes. Lines starting
 2014-02-08 14:10:48 -08:00
Neil Lalonde
e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
Robin Ward
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
Robin Ward
2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Robin Ward
3b1ef6ebc9 Work in progress: Groups Page 2014-02-07 10:44:51 -05:00
Robin Ward
de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward
a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Sam
93434be16d SECURITY: reduce moderator rights 
You can now hide particular categories from certain moderators
 2014-02-07 14:11:52 +11:00
Régis Hanol
58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol
6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create 
Whitelist :active param so that we can automatically create users that a...
 2014-02-06 09:56:00 +01:00
Robin Ward
aff16f372b FIX: Show a nicer error when a user tries to access a category they 
can't see.
 2014-02-05 15:33:52 -05:00
Robin Ward
1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Leonard Teo
c13aa8852b Whitelist :active param so that we can automatically create users that are active via API 2014-02-04 15:40:30 -05:00
Régis Hanol
4fb274fb9d BUGFIX: history link doesn't work on deleted posts 2014-02-04 20:05:50 +01:00
Régis Hanol
d2974c2a15 BUGFIX: proper handling of top_menu_items 2014-02-03 16:08:00 +01:00
Vikhyat Korrapati
daa14cda40 ignore exclude_category from the menu if we are trying to view the category. 2014-01-31 22:35:19 +05:30
Régis Hanol
ae401f0dc7 BUGFIX: JSON requests don't exclude categories from filters 2014-01-31 14:36:00 +01:00
Robin Ward
b315a5c28f Delegate bulk operations to a TopicsBulkAction object. 2014-01-30 11:44:29 -05:00
Robin Ward
0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Neil Lalonde
74f1c553e3 FIX: 1868 Security: Dangerous Send 2014-01-27 13:05:51 -05:00
Neil Lalonde
90e195b2e7 More work on trust level 3 requirements page 2014-01-24 11:56:46 -05:00
slainer68
748e1e0748 Allow using the API when Login required site setting is on. 2014-01-24 14:02:49 +01:00
Neil Lalonde
da825451d0 Invite link can't be used to log in after you set a password or sign in with 3rd party 2014-01-21 16:56:41 -05:00
Régis Hanol
8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Régis Hanol
e31789327e fix the specs 2014-01-18 19:27:25 +01:00
Régis Hanol
129617b415 Lots of bugfixes 
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
 2014-01-18 19:27:25 +01:00
Régis Hanol
c1a66b70bb BUGFIX: use previous_visit_at instead of last_seen_at to determine the best period to display in the top summary 2014-01-16 01:36:32 +01:00
Régis Hanol
462c6d81f5 BUGFIX: exclude categories from the top view 2014-01-16 00:49:58 +01:00
Régis Hanol
a177732d28 FEATURE: top page should not be infinite. Limite them to 200 topics by default 2014-01-15 22:12:53 +01:00
Régis Hanol
0b2ead2248 rename topics_per_period_in_summary settings to topics_per_period_in_top_summary 2014-01-15 22:12:47 +01:00
Régis Hanol
ed87a589ca BUGFIX: only show the best period for logged-in users 2014-01-15 21:45:28 +01:00
Régis Hanol
3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Robin Ward
bcc7f3aba4 Support embedded link counts via data-* attribute 2014-01-13 13:37:55 -05:00
Robin Ward
488319a5d1 FIX: Don't store incoming links on embed 2014-01-13 12:58:53 -05:00
Robin Ward
af3edfd5eb FEATURE: Show Reply count on blog index page when embedding 2014-01-13 12:47:41 -05:00
Sam
2c75e15049 FEATURE: query param for closed / archived / open 
?status=closed for closed topics
?status=open for open topics
?status=archived for archived topics
 2014-01-13 14:40:21 +11:00
Sam
2b64118df1 Merge pull request #1782 from ligthyear/group-mention 
Allow groups to be used as aliases for user mentions
 2014-01-12 14:36:45 -08:00
Robin Ward
852d110f35 Test email is now synchronous and ignores sidekiq queue. 2014-01-09 15:25:25 -05:00
Neil Lalonde
259295d865 Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year. 2014-01-09 11:55:04 -05:00
Neil Lalonde
e7975f25b8 Remove remaining code for two-column categories page 2014-01-07 18:13:49 -05:00
Benjamin Kampmann
c743a985a4 Allow groups to be used as aliases for user mention 
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
 2014-01-08 02:36:24 +11:00
Régis Hanol
8d73b7f94d BUGFIX: hide sensitive site settings 2014-01-06 13:03:53 +01:00
Sam
eeb83adf71 BUGFIX: staff can now edit delted posts 
fixes #1343

This was way easier than mucking with the UI
 2014-01-06 18:12:51 +11:00
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 c9ea89bdd3, reversing
changes made to 9ed49888fc.
 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
Einar Jonsson
84987cd835 Extracted nickname registration into a private controller method 2013-08-23 09:46:33 +00:00
Neil Lalonde
86012ac579 Fix a case when the wrong topic is loaded because the slug starts with a number 2013-08-22 16:23:46 -04:00
Sam
d7596840e5 only staff should be able to see bookmarks and favs of other users 
ensure that when they click on them they see the correct topics (topics for user they are looking at, not current user)
 2013-08-22 09:18:54 +10:00
Neil Lalonde
47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -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
Neil Lalonde
3abeb5f793 Staff action logs can be filtered to changes of one site setting 2013-08-20 13:50:51 -04:00
Sam
df2b0b47bd Merge pull request #1360 from michaelkirk/feature/oauth2 
not recording Oauth2 user email
 2013-08-19 14:57:05 -07:00
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Michael Kirk
9e8d8870f5 fixed: record Oauth2 user email 2013-08-19 11:21:27 -07: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
Michael Kirk
4af8a9102e Authenticate with Discourse via OAuth2 
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
 2013-08-17 21:45:20 -07:00
Régis Hanol
ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde
b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Neil Lalonde
293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Sam
11dca1fd92 make code climate a bit happier 2013-08-06 06:25:44 +10:00
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Robin Ward
aec929b184 Screw it, don't choose columns. 2013-08-14 12:26:31 -04:00
Robin Ward
a05ffafd4c FIX: Direct link to Avatar 2013-08-14 12:22:44 -04:00
Robin Ward
479ca86713 FIX: Don't select columns if we don't have to. 2013-08-14 12:18:54 -04:00
Robin Ward
6793cba4ae FIX: Displaying actions 2013-08-14 12:04:35 -04:00
Régis Hanol
4866f4d8f5 FIX: N+1 query for avatars 2013-08-14 15:25:05 +02:00
Régis Hanol
3524b90d6a FIX: avatars in quotes/oneboxes 
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
 2013-08-14 12:20:05 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02: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
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
33bddbff85 Use Ember.ListView for staff action logs page 2013-08-09 10:06:58 -04:00
Neil Lalonde
0d44313a4b Use Ember.ListView for blocked emails list 2013-08-09 10:06:58 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00