Commit Graph

5498 Commits

Author SHA1 Message Date
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
Robin Ward a00cfbc6bf Merge pull request #2553 from techAPJ/patch-1
FIX: refresh invite list after sending invite manually
2014-07-17 10:20:40 -04:00
Sam de7e6a9545 Feature: allow mods to cut pinned topic excerpts 2014-07-17 21:32:37 +10:00
Arpit Jalan 2451779011 FIX: refresh invite list after sending invite manually 2014-07-17 13:53:30 +05:30
Sam bfb37054e8 Badge Grouping work in progress 2014-07-17 16:11:10 +10:00
Sam 91cd4f2d66 SECURITY: improve escaping protection 2014-07-17 16:11:10 +10:00
Sam c12a131fb4 SECURITY: sanitizer allowing invalid attributes 2014-07-17 16:11:09 +10:00
Sam e8ca1a2469 FEATURE: allow overriding badge names
FEATURE: allow html in badge description
2014-07-17 16:11:09 +10:00
Jeff Atwood e9e4ec0e52 Merge pull request #2551 from awesomerobot/master
fixing the topic-body at 690px wide, leaving gutter flexible
2014-07-16 20:06:25 -07:00
Kris Aubuchon 38a6b5439d fixing the topic-body at 690px wide, leaving gutter flexible 2014-07-16 22:32:49 -04:00
Sam d56d7866ff FIX invite redeem more robust 2014-07-17 09:38:16 +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
Sam 19d1a9c96b Merge pull request #2549 from techAPJ/patch-3
FIX: If the invite with topic id already exists, redirect user to home p...
2014-07-17 08:18:27 +10:00
Robin Ward 62ef81d895 FIX: Don't scroll to top if there's an anchor present. 2014-07-16 18:14:39 -04:00
Neil Lalonde 4c867c5796 FIX: don't send repeated notifications that there are pending users who need to be approved to moderators who haven't read the previous notification 2014-07-16 17:53:51 -04:00
Arpit Jalan c14a35f173 FIX: If the invite with topic id already exists, redirect user to home page instead 2014-07-17 03:10:38 +05:30
Robin Ward d9c2b316b6 FIX: Resolver should try with slashes instead of periods too 2014-07-16 17:38:14 -04:00
Régis Hanol f43293a7bc FEATURE: replace 'deleted by' with the trashcan glyph 2014-07-16 22:38:39 +02:00
Neil Lalonde 5c70d878a7 FEATURE: show a reason why a category can't be deleted 2014-07-16 15:43:51 -04: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
Jeff Atwood 612dcb5805 we can't resize images on desktop, very dangerous 2014-07-16 12:23:54 -07:00
Régis Hanol 7dcf2a2c4f FEATURE: show the user's flagged/deleted posts 2014-07-16 21:04:55 +02:00
Robin Ward 71c67c43a1 ES6: User activity views 2014-07-16 13:19:47 -04: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 0c8025d513 FIX: post number is just adding noise 2014-07-16 18:23:29 +10:00
Sam e347eea629 FEATURE: show user what badges they have 2014-07-16 17:55:08 +10:00
Sam 5ad519e2bc Rename Read Faq, Read Guidelines 2014-07-16 17:55:08 +10:00
Jeff Atwood 4f3f61121a Merge pull request #2547 from awesomerobot/master
fitting images in posts without violating max width/height
2014-07-15 23:22:26 -07:00
Sam 59c399c50a FIX: count distinct badges for totals. 2014-07-16 16:21:46 +10:00
Kris Aubuchon 89167be99a fitting images in posts without violating max width/height 2014-07-16 01:01:03 -04:00
Neil Lalonde 823061a2cf FIX: handle enter key with a better way on site setting string inputs 2014-07-15 17:32:45 -04: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
Neil Lalonde 82bdef2047 FIX: escape input of forgot password form before rendering it back to you 2014-07-15 17:19:28 -04:00
Sam 7dade2cd99 excludes self from quoted 2014-07-16 06:56:24 +10: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
Arpit Jalan a1112347d4 FIX: Instead of silently failing, assign alternative username when provided username is invalid in disposable invite 2014-07-16 01:19:48 +05:30
Robin Ward c6df00a5cc FIX: You shouldn't be able to add a parent to `Uncategorized` 2014-07-15 15:19:39 -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 c037371be1 FIX: Don't link to web sites for TL0 2014-07-15 14:46:12 -04:00
Robin Ward 4f416bf6ce Check honeypot/challenge value on activation too 2014-07-15 14:07:35 -04:00
Jeff Atwood 3eb0afe29b add bit of spacing to 404 page 2014-07-15 10:56:58 -07: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
Robin Ward 3368e23fe4 ES6: Preferences views 2014-07-15 12:36:57 -04:00
Benjamin Kampmann 67d127ec5c make jshint happy: missing semicolon 2014-07-15 17:12:03 +02:00
Benjamin Kampmann 518207aa90 move ajax into models 2014-07-15 16:11:39 +02:00
Régis Hanol a9342dbf92 SECURITY: fix XSS in link's href 2014-07-15 16:11:37 +02:00
Benjamin Kampmann 5025e97712 move available groups loader into router 2014-07-15 15:48:02 +02:00
Benjamin Kampmann 2435961b58 use computed 2014-07-15 15:43:53 +02:00
Benjamin Kampmann 6710637904 renamed 2014-07-15 15:35:16 +02:00
Régis Hanol 09924da60b Merge pull request #2540 from codetaylor/master
BUGFIX: exception validating 'data-' attributes
2014-07-15 10:41:45 +02:00
Sam 2d0def9940 FIX: First Quote badge bust
Feature: track quoted posts
2014-07-15 17:47:24 +10:00
Sam 4c25fedf70 FEATURE: Reader badge
Read a every post in a topic that if 50 posts or longer
2014-07-15 15:16:41 +10:00
Sam 45ca83328d Annotate 2014-07-15 11:29:44 +10:00
Jason Taylor df2c259836 BUGFIX: exception validating 'data-' attributes 2014-07-14 17:43:38 -07:00
Jeff Atwood 6412958d1e make Send Test Email easier to see 2014-07-14 13:58:06 -07: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 ac3827f700 FIX: Combobox wasn't matching selected value properly with value of 0 2014-07-14 15:15:30 -04:00
Robin Ward 1886ffaff2 FIX: Work with phpBB import style links with ellipsis 2014-07-14 14:27:17 -04:00
Neil Lalonde 42dcb77d93 FEATURE: add site setting leader_links_no_follow to control whether users with trust level 3 or higher have nofollow on their links 2014-07-14 13:34:29 -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
Robin Ward 186ce78cb5 FIX: BBCode sanitization and tests 2014-07-14 11:24:25 -04:00
Régis Hanol 49eaaddba8 Merge pull request #2539 from iamntz/patch-1
Added type=email on register field
2014-07-14 15:23:34 +02:00
Sam 4a2cc269ab FIX: allow selection of no title 2014-07-14 18:07:07 +10:00
Jeff Atwood 192e286b15 FIX: user about me editor too wide on mobile 2014-07-14 00:53:04 -07:00
Sam 88469721b9 FEATURE: Allow admins to disable specific badges 2014-07-14 17:40:36 +10:00
Jeff Atwood 49dbded250 remove title_sanitize setting 2014-07-14 00:18:02 -07:00
Ionut Staicu 36d810a420 Added some style to email fields 2014-07-14 09:50:13 +03:00
Ionut Staicu a0ca4c8583 Email field should be type=email 2014-07-14 09:49:05 +03: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
Sam 5477325376 FIX: should use "script" to allow cdn 2014-07-14 08:47:06 +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
Jeff Atwood 0c513241a3 no more black topic status glyphs on cat page 2014-07-13 02:45:50 -07:00
Jeff Atwood 504e971bda fix PM participant alignment on mobile 2014-07-12 22:17:54 -07:00
Jeff Atwood f378004a41 embedded quote colors were wrong, THANKS OBAMA 2014-07-12 01:31:26 -07:00
Jeff Atwood fe95597ce8 very minor mobile layout tweaks 2014-07-12 01:04:25 -07:00
Jeff Atwood b8d9781739 minor mobile topic list tweaks 2014-07-12 00:44:01 -07:00
Jeff Atwood 0068ac9124 fix mobile layout of /faq /tos /privacy 2014-07-12 00:04:22 -07:00
Kris Aubuchon 8da4046d79 minor alignment fixes on badge page w/description 2014-07-12 00:36:01 -04:00
Kris Aubuchon 9398504332 fixing appearance of horizontal scrollbar on topic list at about 996px wide 2014-07-12 00:12:50 -04:00
Régis Hanol edba5c631f FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-12 01:59:43 +02:00
Régis Hanol b526cdc55c Revert "FEATURE: reject accounts created with an email address similar to a known spammer email"
This reverts commit 39be48a441.

Conflicts:
	spec/models/screened_email_spec.rb
2014-07-12 01:01:37 +02:00
Kris Aubuchon 1ef4a12a9d fixing onebox image width bug 2014-07-11 18:04:32 -04: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
Neil Lalonde d45c50f4bb Merge pull request #2529 from riking/email
Two light commits for email
2014-07-11 16:30:58 -04:00
Jeff Atwood 314f154def line up modal nav pills better 2014-07-11 13:28:51 -07:00
riking 07d8d5ed75 Change default email_in minimum trust to 2
Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
2014-07-11 12:35:59 -07:00
Neil Lalonde d13dbaaa36 FEATURE: enter key in site setting input saves it 2014-07-11 14:44:30 -04:00
Régis Hanol 46218c7a3a BUGFIX: multiple sub/sup 2014-07-11 15:27:42 +02:00
Régis Hanol 39be48a441 FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-11 15:09:46 +02:00
Sam c113c36db7 correct badge query 2014-07-11 17:35:34 +10:00
Sam 833c50c460 FEATURE: Read Faq badge 2014-07-11 17:32:29 +10:00
Sam 89fc989adb FEATURE: First Quote badge 2014-07-11 14:17:43 +10:00
Jeff Atwood ed3bebfebe switch /faq to /guidelines in a bunch of places 2014-07-10 15:30:58 -07:00
Jeff Atwood cf61ef7138 category-list-item only used in mobile layout 2014-07-10 13:28:53 -07:00
Jeff Atwood eeeb374ec9 remove word "subcategories" from mobile cat page 2014-07-10 13:08:39 -07:00
Jeff Atwood 91af347dfa remove legacy category "footer" styles 2014-07-10 13:02:15 -07:00
Neil Lalonde 09959d315a Merge pull request #2525 from eyalev/rtl-support
Add RTL support.
2014-07-10 14:25:16 -04: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
Eyal Levin d7139555e5 Add RTL support. 2014-07-10 19:36:19 +03:00
Kris Aubuchon 5aaaa9b915 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2014-07-10 11:45:25 -04:00
Kris Aubuchon f20a5e2c30 adding some topic layout flexibility 2014-07-10 11:40:31 -04:00
Jeff Atwood 61e87a1bbc make sure /top looks OK on mobile 2014-07-10 00:57:30 -07:00
Jeff Atwood d053ad07fb we don't want danger color on mobile category 2014-07-10 00:47:25 -07:00
Jeff Atwood 4215b6347c quick temporary fix for wrapping right gutter 2014-07-10 00:43:41 -07: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
Arpit Jalan 2f6c984c8c Improve invite email copy 2014-07-10 10:57:40 +05:30
Jeff Atwood 95282a4c6d add badge glyph to edit button 2014-07-09 22:01:03 -07:00
Arpit Jalan 8395da5bd0 FIX: include topic title and domain name in topic invite mail 2014-07-10 10:05:28 +05:30
Sam c5d3db9148 FIX: there is no trust_level_5 2014-07-10 12:17:13 +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 928848c0a8 FEATURE: First Link badge 2014-07-10 12:02:16 +10:00
Jeff Atwood 97979c1a32 Merge pull request #2522 from awesomerobot/master
adapting the layout to fit more viewports
2014-07-09 17:28:32 -07:00
Sam d54c28adc1 FIX: better whitelisting 2014-07-10 09:59:54 +10:00
Kris Aubuchon 291459bb91 first steps to making discourse more responsive 2014-07-09 19:56:35 -04:00
Sam 9828a268b9 Fix: whitelist regex for bbcode too wide 2014-07-10 09:17:04 +10:00
Régis Hanol a52c80e2a8 FEATURE: automatic image orientation fix 2014-07-09 23:59:57 +02:00
Régis Hanol ef44b6218d FEATURE: better mobile upload experience (upload the picture right away) 2014-07-09 22:40:22 +02:00
Arpit Jalan 223bbc3da3 FEATURE: include topic context in topic invite 2014-07-09 21:23:20 +05:30
Régis Hanol 6b45b635f8 FIX: properly whitelist <code> classes needed for syntax highlighting 2014-07-09 16:27:47 +02:00
Sam 9ffcbfca98 FIX: disable whitelist temporarily
more complete fix to follow
2014-07-09 22:13:27 +10:00
Sam 21bc20169e FIX: stop stacking, stuff was upgraded dialogs 2014-07-09 16:43:54 +10:00
Sam 0d281d9de6 FIX: Firefox chucks exceptions on localStorage with cookies disabled 2014-07-09 16:15:52 +10:00
Sam 9c14385a86 FEATURE: explain which badges can be titles 2014-07-09 16:03:53 +10:00
Sam 8fcc019ff8 FIX: only allow badge title selection if it exists 2014-07-09 15:31:49 +10:00
Sam e32e96dabb FEATURE: new badges
- Pay it forward renamed to first like
- First flag
- First share
2014-07-09 12:17:39 +10:00
Jeff Atwood 1ee3cf8c1d fix some minor 404 search page issues 2014-07-08 15:57:41 -07:00
Jeff Atwood 92d42a43fd remove unnecessary quote spacing on expand replies 2014-07-08 14:56:10 -07:00
Neil Lalonde e84e72dfcd Merge pull request #2520 from techAPJ/fix_invite_search
FIX: selectively disappear invite search box
2014-07-08 17:55:10 -04:00
Jeff Atwood aff6e4c5eb spacing can't be asymmetric 2014-07-08 14:47:58 -07:00
Jeff Atwood 5fee34a0fb bit more margin spacing on topic summary links 2014-07-08 14:45:49 -07:00
Neil Lalonde df8b25d2f5 FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago 2014-07-08 17:39:49 -04:00
Arpit Jalan eea3884e14 FIX: selectively disappear invite search box 2014-07-09 03:03:08 +05:30
Neil Lalonde 04e5c59598 Merge pull request #2519 from techAPJ/fix_invite_search
FIX: don't hide invite search box while filtering
2014-07-08 16:14:50 -04:00
Jeff Atwood 1e7a9a24db add glyph to sign in button on topic private page 2014-07-08 11:48:09 -07:00
Régis Hanol 7658b72556 BUGFIX: S3 backups failed when using a region
TRIVIAL: updated fog gem to latest version (1.22.1)
BUGFIX: fixed algorithm used to remove old backups
2014-07-08 20:46:08 +02:00
Arpit Jalan e53651972d FIX: don't hide invite search box while filtering 2014-07-08 23:59:12 +05:30
Jeff Atwood ba06a6b0d2 didn't need to move gutter watermark up 2014-07-08 11:17:24 -07:00
Jeff Atwood 719ec0801d add hellip; to Show Full Post 2014-07-08 10:55:15 -07: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
Jeff Atwood 059c0ff5e1 only dim the post actions, not the Replies badge 2014-07-07 23:39:21 -07:00
Jeff Atwood 2f27a7f182 another show summary as btn-primary 2014-07-07 22:41:41 -07:00
Jeff Atwood 349c0bd7af make show summary a btn-primary 2014-07-07 22:17:38 -07:00