Commit Graph

22068 Commits

Author SHA1 Message Date
Guo Xiang Tan f5bf6256a9 Merge pull request #4732 from nbianca/typo
Fixed typo.
2017-03-02 06:02:43 +08:00
Sam c79b146283 FEATURE: make list controller a bit more extensible 2017-03-01 16:41:09 -05:00
Sam f0b79cf54b FEATURE: Add outlet for messages nave extension 2017-03-01 16:41:09 -05:00
Bianca Nenciu 2c22a7f78b Fixed typo. 2017-03-01 23:02:29 +02:00
Neil Lalonde d848916357 FEATURE: Greek language support, thanks to Vasilis Vlachokyriakos 2017-03-01 15:52:55 -05:00
Sam 7895b71817 move to use let, missed a spot 2017-03-01 15:15:36 -05: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
Sam ca951f2cf2 FIX: render custom tag extensions even when tags disabled 2017-03-01 13:38:44 -05:00
Sam 89bd538742 add callback priority to tags html 2017-03-01 12:56:45 -05:00
Blake Erickson 0b81a93020 Merge pull request #4718 from oblakeerickson/email_discourse_backups
FEATURE: further restrict downloading of backups
2017-03-01 08:57:44 -07:00
Sam 8c8de1c2d4 FEATURE: addUserMenuGlyph extensibility point 2017-03-01 10:32:01 -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
Régis Hanol b20b568039 FIX: allow for empty translated strings 2017-03-01 11:30:44 +01:00
Arpit Jalan e27b1b98d1 FIX: handle new user when logging name change 2017-03-01 13:43:57 +05:30
Arpit Jalan ddcd060552 Update Translations 2017-03-01 11:03:44 +05:30
Guo Xiang Tan 112ca20c96 Merge pull request #4675 from tgxworld/fix_polls_forever_broken_if_approval_required
FIX: Polls permanently broken if post requires approval.
2017-03-01 12:56:03 +08:00
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
Sam f918951d42 FEATURE: clean up tags extensibility
centralizes all logic for topic tag rendering and provides API for extension
2017-02-28 17:08:43 -05: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
Robin Ward e863d66e33 FIX: Back button was broken after clicking flags in hamburger 2017-02-28 13:53:48 -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 352f98d084 use named param in tag_topic_by_names 2017-02-28 12:08:06 -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
Sam ffd8fa7481 FEATURE: move_to_inbox and archive_message events 2017-02-28 09:56:41 -05:00
Régis Hanol 3f5d8b8000 make eslint happy 2017-02-28 10:33:16 +01:00
Régis Hanol 5738253998 FIX: locale fallback with pluralized strings 2017-02-28 10:02:29 +01:00
Guo Xiang Tan 54577db8a4 Don't assign variable when not required to do so. 2017-02-28 14:14:57 +08: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
Régis Hanol 41c850f31d fix pull_translation script 2017-02-27 22:48:50 +01:00
Sam 49a0f16ce4 Merge pull request #4723 from mcwumbly/fix-import-scripts
FIX: Import scripts were failing to load onebox sanitize config
2017-02-27 16:18:29 -05: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
Robin Ward b2b7f4d905 FIX: Query parameters were not being cleared when changing filtering. 2017-02-27 15:49:14 -05:00
Neil Lalonde cfedbad0e9 FIX: hamburger shouldn't show subcategories if show_subcategory_list is enabled on the parent 2017-02-27 15:34:07 -05:00
Arpit Jalan 5a48cea395 FIX: correct path for LocaleFileWalker 2017-02-28 01:42:55 +05:30
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 f7d413bb1b Merge pull request #4727 from techAPJ/log-name-changes
FEATURE: log all username and name changes
2017-02-28 00:53:00 +05:30
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
Arpit Jalan cba51e1c38 FEATURE: new site setting for max logins per ip per hour/minute 2017-02-27 16:58:03 +05:30
Guo Xiang Tan 0e8c849572 UX: "See more" on not found page should redirect to /top. 2017-02-27 13:33:19 +08:00
Guo Xiang Tan 0675f9f838 Merge pull request #4684 from tgxworld/fix_reset_context_when_context_type_changes
Fix reset context when context type changes
2017-02-27 12:24:44 +08:00
Guo Xiang Tan ac37bd3dbc FIX: Search menu results does not refresh when search context is changed. 2017-02-27 12:23:41 +08:00
Guo Xiang Tan d2b83a9682 Merge pull request #4720 from rizka10/patch-3
Fix a minor typo on a mailer template
2017-02-27 11:51:38 +08:00
Guo Xiang Tan 2fc0b35765 Merge pull request #4722 from oblakeerickson/typo_routes_file
FIX: typo in a routes.rb comment
2017-02-27 11:51:13 +08:00