Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,184 Commits 182 Branches 500 Tags 1 GiB
Commit Graph

3604 Commits

Author SHA1 Message Date
Arpit Jalan 848120c098 FEATURE: RSS feed for top page period filters 2017-03-13 15:23:46 +05:30
Guo Xiang Tan 4d4a1a1552 Add scope for human users. 2017-03-11 14:25:09 +08:00
Sam 6ebddc42d1 FIX: include children categories when searching a category 2017-03-10 15:58:47 -05:00
Neil Lalonde 402ddb810c FIX: email customizations now apply to both html and text parts 2017-03-10 14:08:03 -05:00
Sam bc1a6ccb90 Merge pull request #4741 from tgxworld/allow_bookmark_removal 
FIX: Allow user to remove bookmark from posts as long as bookmark is …
 2017-03-10 12:49:20 -05:00
Arpit Jalan f7e7ca3937 FEATURE: anonymized site statistics 2017-03-10 18:50:26 +05:30
Guo Xiang Tan 9cc79363e0 Merge pull request #4744 from tgxworld/feature_seen_unseen_search 
FEATURE: Search can be scoped to posts that the current user has seen…
 2017-03-09 07:11:19 +08:00
Régis Hanol 23b06d2895 FIX: should not try to send digest to users who reached the bounce threshold 2017-03-08 19:19:11 +01:00
Guo Xiang Tan c623951306 FEATURE: Search can be scoped to posts that the current user has seen/unseen. 
https://meta.discourse.org/t/advanced-search-posts-that-i-have-seen/57966
 2017-03-09 01:01:33 +08:00
Arpit Jalan 801b5838e1 FIX: do not show faq/guidelines page to anonymous users for private forums 2017-03-08 16:00:49 +05:30
Régis Hanol cf8bc4483f FIX: always send critical emails even when bounce score threshold has been reached 2017-03-08 10:06:16 +01:00
Arpit Jalan 090236b15b FIX: do not show about page to anonymous users for private forums 2017-03-08 13:15:44 +05:30
Guo Xiang Tan 689dd16be0 FIX: Allow user to remove bookmark from posts as long as bookmark is present. 
https://meta.discourse.org/t/bookmark-issue-when-access-to-topic-is-lost-pms/51993
 2017-03-08 13:53:49 +08:00
Régis Hanol ee9d621d9c FIX: surround the FROM alias with " in order to support the @ character 2017-03-07 23:37:21 +01:00
Sam 99f4d5082b FIX: Improve token rotation and increase logging 
- avoid access denied on bad cookie, instead just nuke it
- avoid marking a token unseen for first minute post rotation
- log path in user auth token logs
 2017-03-07 13:27:43 -05:00
Neil Lalonde 0661cebbcf fix intermittent failing spec 2017-03-07 11:59:05 -05:00
Neil Lalonde d95e4102c1 FIX: tags created in secured categories should not be forbidden outside those categories 2017-03-07 11:46:46 -05:00
Robin Ward dad57fa033 FIX: More errors with non-ascii URLs 2017-03-07 11:21:41 -05:00
Guo Xiang Tan d1e587c10a Merge pull request #4737 from oblakeerickson/approve_invited_user 
FIX: approve invited user
 2017-03-07 21:14:34 +08:00
Régis Hanol 0abe433495 Merge pull request #4736 from techAPJ/group-bulk-add 
FIX: grant trust level when bulk adding users to group
 2017-03-06 12:43:26 +01:00
Guo Xiang Tan 7d82a53dfe FIX: `Group#name` is case insensitive. 2017-03-06 17:24:03 +08:00
Arpit Jalan d5bcc70e9c FIX: grant trust level when bulk adding users to group 2017-03-06 14:39:53 +05:30
Guo Xiang Tan 66b5f97743 Merge pull request #4739 from tgxworld/fix_cant_recover_a_topic_that_belongs_to_a_deleted_user 
Fix cant recover a topic that belongs to a deleted user
 2017-03-06 15:12:54 +08:00
Guo Xiang Tan 8aea3caf00 FIX: Ensure that we only move posts that belong to the original topic. 2017-03-06 15:04:10 +08:00
Guo Xiang Tan 477eb0591e FIX: Posts in a deleted topic couldn't be moved. 
https://meta.discourse.org/t/moving-posts-to-new-topic/58436/4
 2017-03-06 14:56:20 +08:00
Guo Xiang Tan a28704bcee FIX: Can't recover a post when its user has been deleted. 
https://meta.discourse.org/t/moving-posts-to-new-topic/58436
 2017-03-06 14:29:06 +08:00
Blake Erickson dbb3ddc7a6 FIX: approve invited user 
This commit fixes the case where invited users who typed in a password
would not be approved by default. Because we moved the user create logic
for an invited user there was a clash with the `save` in the user model
and the `save` in the invite_redeemer class.

- added approve logic into invite_redeemer class.
- added tests to verify that the user is approved
- added a check to see if must_approve_users is on
- added a check to see if the inviter is staff
- go ahead and approve the user if must_approve_users is off
- keep existing User.approve workflow if user exists
- improve if/else logic to remove duplicate code
- use `Time.zone.now`
 2017-03-05 06:58:23 -07:00
Sam c99f4260c0 Merge pull request #4729 from tgxworld/dont_mark_user_as_valid 
FIX: Don't mark user as `active` if verified email is different.
 2017-03-03 15:57:30 -05:00
Neil Lalonde 6aab8cb331 FEATURE: new category setting for whether to show latest topics or top topics by default 2017-03-03 11:30:44 -05:00
Guo Xiang Tan bcf634ca85 Merge pull request #4728 from nbianca/username-regex 
Add support for username regex.
 2017-03-03 22:59:23 +08:00
Bianca Nenciu 30909ec54e Add support for username regex. 2017-03-02 13:53:45 +02:00
Guo Xiang Tan 3d347fb9c4 FIX: Don't mark user as `active` if verified email is different. 2017-03-02 14:24:30 +08:00
Neil Lalonde 51d7dc4355 switch contents of embeddable_host_fabricator.rb and category_fabricator.rb 2017-03-01 15:13:31 -05:00
Neil Lalonde 262016604d FEATURE: each category can control how many topics to show on categories page 2017-03-01 15:12:57 -05:00
Blake Erickson 80858bae2c FEATURE: further restrict downloading of backups 
- send email to logged in admin when they press the "download" button
- show pop-up that email was sent
- create email template
- require a valid token to download backup
 2017-03-01 08:28:34 -07:00
Arpit Jalan e27b1b98d1 FIX: handle new user when logging name change 2017-03-01 13:43:57 +05:30
Guo Xiang Tan 107d6783a9 Remove use of stubs in tests. 2017-03-01 10:53:03 +08:00
Guo Xiang Tan 76dd6933d2 Revert "Revert "Revert "SECURITY: Ensure oAuth authenticated email is the same as created user's email.""" 
This reverts commit e6d75f6844.

This is why we should not be pushing directly to master.
 2017-03-01 10:16:59 +08:00
Robin Ward d27575176a Enforce a minimum amount of posters in a topic for `get_a_room` 2017-02-28 16:47:16 -05:00
Sam 122fb8025d FIX: last seen date erroneously updated when browser in background 
In some cases user may be "last seen" even though browser tab is in
the background or computer is locked
 2017-02-28 12:35:10 -05:00
Neil Lalonde 292dd8623c Merge pull request #4622 from dmacjam/master 
FEATURE: Append tags bulk action for topics
 2017-02-28 11:36:58 -05:00
Sam 3ac4709903 FIX: on initial token issue stop unmarking token as unseen 
prev and current are the same so we need special logic to bypass
 2017-02-28 10:38:22 -05:00
Guo Xiang Tan e6d75f6844 Revert "Revert "SECURITY: Ensure oAuth authenticated email is the same as created user's email."" 
This reverts commit 0e3def7d2b.
 2017-02-28 11:27:14 +08:00
Sam 1e980ad4e6 Merge pull request #4721 from oblakeerickson/sort_admin_users_api 
FEATURE: Add order logic to admin users controller
 2017-02-27 16:13:42 -05:00
Arpit Jalan 6661cebff8 FIX: do not log duplicate username changes 2017-02-28 01:32:00 +05:30
Neil Lalonde e634b37f9a FIX: from field of emails should be including email_site_title or site title settings 2017-02-27 14:23:07 -05:00
Arpit Jalan b32d3d66e5 FEATURE: log all username and name changes 2017-02-28 00:23:27 +05:30
Robin Ward 0e3def7d2b Revert "SECURITY: Ensure oAuth authenticated email is the same as created user's email." 
This reverts commit 1060239e2d.
 2017-02-27 13:19:26 -05:00
Robin Ward bf9626d031 FIX: Embedding was broken with non-english URLs and ports 2017-02-27 12:17:52 -05:00
Arpit Jalan 877957ae88 Merge pull request #4715 from techAPJ/login-per-ip 
FEATURE: new site setting for max logins per ip per hour/minute
 2017-02-27 18:24:53 +05:30