Commit Graph

5588 Commits

Author SHA1 Message Date
Sam a34037b26c FIX: typo 2014-07-24 18:38:27 +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 469e74316b FIX: don't show broken button 2014-07-24 18:28:23 +10:00
Jeff Atwood dc96cf6d4c Merge pull request #2578 from awesomerobot/master
minor alignment fix on embedded posts
2014-07-23 22:15:39 -07:00
Kris Aubuchon b43e4b05c2 minor alignment fix 2014-07-23 23:45:30 -04:00
Sam 526da15b9e Improve badge UI add links to badge descriptions 2014-07-24 12:21:24 +10:00
Robin Ward c8a0bf35c5 FIX: Navigating to a user's admin page would not populate
`availableGroups`
2014-07-23 16:54:04 -04:00
Robin Ward 27f786e06a FEATURE: Show user popup when clicking on an @mention in a post. 2014-07-23 16:10:29 -04:00
Robin Ward 04c6733ae7 FIX: If a deprecated view can't be found, look for a component 2014-07-23 16:10:29 -04:00
Robin Ward 06512685ab FEATURE: If there is a category scope and `show_subcategory_list` is set, only
show the local categories in the dropdown instead of all categories.
2014-07-23 13:10:06 -04:00
Neil Lalonde b4ad70d767 FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds 2014-07-23 12:32:12 -04:00
Robin Ward b29b94046c Merge pull request #2569 from lreeves/group-selector-datasource-finder
Move finder logic out of the group-selector component
2014-07-23 11:28:29 -04:00
Robin Ward 0a0d32efb4 TRIVIAL: Rename `map` to `idMap` because `map` means something for
enumerables.
2014-07-23 11:11:13 -04:00
Robin Ward 1a7eacc70a Merge pull request #2568 from lebek/optimize-category-lookup
Optimize Finding a Category by Id
2014-07-23 11:06:54 -04:00
Robin Ward 016927d5b9 Merge pull request #2566 from minasmart/master
Enumerate deferred scripts with a sprockets helper
2014-07-23 11:00:38 -04:00
Régis Hanol b9bd2ddda6 Revert "FIX: hidden helper class is important" 2014-07-23 12:25:09 +02:00
Régis Hanol 4201a58a13 Merge pull request #2573 from fantasticfears/patch-5
FIX: hidden helper class is important
2014-07-23 10:08:20 +02:00
Jeff Atwood 1b733ff936 missed a spot for more /!\ 2014-07-22 21:34:19 -07:00
Jeff Atwood fc1fa2d104 Caps Lock clearly needs more exclamation sign 2014-07-22 21:15:54 -07:00
Erick Guan f2cd2f1d3c FIX: hidden helper class is important 2014-07-23 11:50:59 +08:00
Peter Le Bek f63e6e6dab Optimize Category find-by-id by using a hash. 2014-07-22 23:49:49 -04:00
Kris Aubuchon fff0f82bfb fixing wmd-editor button background 2014-07-22 22:38:15 -04:00
Sam 0f9678fe49 FIX: faster update of all badges
Introduced badge triggers, introduced concept of badge that happens due to a post but has the post hidden

Delta badge grant happens once a minute, backed by redis
2014-07-23 11:46:07 +10:00
Sam 007310c4a2 Wire up triggers 2014-07-23 11:43:17 +10:00
Sam b9a7d945c3 Improve badge grouping UI
Start work on triggers
2014-07-23 11:43:17 +10:00
Sam 375f0815b6 Merge pull request #2571 from awesomerobot/master
fixing lingering gutter width issues
2014-07-23 10:42:25 +10:00
Kris Aubuchon ef2a5def3c fixing lingering gutter width issues 2014-07-22 20:33:21 -04:00
lreeves 9c2f4b55ac This moves the finder logic out of the component 2014-07-22 20:30:30 -04:00
M Smart 0d9e2b5df5 Move the scripts helper into a better place. 2014-07-22 20:14:57 -04:00
Neil Lalonde f5cba39c89 FIX: Typo in method name for triggering 2014-07-22 19:56:41 -04:00
M Smart ec280913b2 Enumerate deferred scripts with a sprockets helper 2014-07-22 19:46:43 -04:00
Neil Lalonde 6f749b9765 FIX: move duplicated scss to common file 2014-07-22 16:42:19 -04:00
Jeff Atwood 8fc80cb922 Merge pull request #2564 from awesomerobot/master
a few mobile admin enhancements
2014-07-22 13:38:05 -07:00
Kris Aubuchon 52334ddda0 a few mobile admin enhancements 2014-07-22 16:30:32 -04:00
Robin Ward 7c0e723464 TWEAK: If `show_subcategory_list` is enabled, hide subcategories from
the site map.
2014-07-22 16:27:33 -04:00
Robin Ward c004ad1d51 Merge pull request #2563 from techAPJ/patch-2
FEATURE: group name is required for private topic invite
2014-07-22 14:44:26 -04:00
Arpit Jalan d0024f738b further optimize computed property 2014-07-23 00:08:54 +05:30
Arpit Jalan e7e823129e FEATURE: group name is required for private topic invite 2014-07-23 00:03:15 +05:30
Neil Lalonde 386b6213a5 FEATURE: warn when caps lock is on during password input 2014-07-22 13:53:58 -04:00
Robin Ward fd3ceae1d6 ES6: Enable compatibility layer for routes 2014-07-22 12:09:29 -04:00
Jeff Atwood c712b0f4b8 add dimmed style to base for flagged/hidden posts 2014-07-21 23:52:26 -07:00
Kris Aubuchon 49605b1f2f embdedded post alignment, minor fix 2014-07-21 23:58:26 -04:00
Kris Aubuchon 90db5147a3 removing 100% image width from embedded posts 2014-07-21 21:00:43 -04:00
Robin Ward 4d354cff7e FIX: Clicking an avatar in an expanded post should show the user
expansion popup.
2014-07-21 18:05:24 -04:00
Robin Ward 0175ba000f FIX: Limit the `maxLength` of the title text fields to the site setting
for the maximum length.
2014-07-21 14:30:23 -04:00
Robin Ward eafde36228 FIX: If a site has no logo, don't show a broken image in the digest. 2014-07-21 14:18:32 -04:00
Robin Ward bddd7f5ea3 FIX: Stop endless loading at the bottom of a user's stream. 2014-07-21 14:13:17 -04:00
Robin Ward d9e5c2317f FIX: If a topic title edit fails, revert to previous title. 2014-07-21 13:39:23 -04:00
Robin Ward 0f23456259 FIX: Instead of patching markdown-js, fix the issue in Discourse. 2014-07-21 13:09:57 -04:00
Robin Ward 90e2f1893c ES6: Start converting routes 2014-07-21 12:00:58 -04:00
Robin Ward 59c3ca7e7b PLUGIN: New API for decorating a post with jQuery 2014-07-21 11:38:38 -04:00
Régis Hanol 9c2a7f0fd1 BUGFIX: cancelling an upload should hide cancel button 2014-07-21 11:14:01 +02:00
Jeff Atwood dc8039d70b normalize mobile reply button styles 2014-07-20 02:50:58 -07:00
Jeff Atwood 76ebe40b15 clean up mobile topic buttons styles a bit more 2014-07-20 02:36:26 -07:00
Jeff Atwood e7031859ef dropped a } 2014-07-20 02:20:26 -07:00
Jeff Atwood 43afae495f remove some redundant mobile styles 2014-07-20 02:12:35 -07:00
Jeff Atwood f4b5338c79 move .has-like out of .read-icon block 2014-07-20 01:39:02 -07:00
Jeff Atwood 80e6a826e4 mobile cleanup: .last-read, .has-like 2014-07-20 01:24:45 -07:00
Jeff Atwood 23d6fd68e5 simplify mobile category page 2014-07-20 01:02:59 -07:00
Jeff Atwood 8781f7855e bad reply-where-modal styles caused mobile issues 2014-07-20 00:34:43 -07:00
Jeff Atwood 391edfd907 missing space in footer on mobile 2014-07-20 00:22:01 -07:00
Jeff Atwood 1c4e3c4a96 mobile category layout fixes 2014-07-19 23:54:57 -07:00
Jeff Atwood 3bbeede07e Merge pull request #2557 from awesomerobot/master
removing 100% width on non-lightboxed images
2014-07-18 17:25:00 -07:00
Kris Aubuchon 9da806d2fa removing 100% width on non-lightboxed images 2014-07-18 20:06:41 -04:00
Robin Ward da717c55d7 FEATURE: Like button should act like a toggle and stay there once you've
clicked it.
2014-07-18 17:01:27 -04:00
Robin Ward 3aa8d8efa1 FIX: Acting and undoing repeatedly was broken 2014-07-18 16:17:11 -04:00
Robin Ward ffa84d9bb4 If you rename a category, also rename the category definition topic. 2014-07-18 13:59:54 -04:00
Robin Ward 75f6b43e62 ES6: Discourse.ContainerView 2014-07-18 12:20:07 -04:00
Robin Ward a73b22b96f ES6: Modals converted 2014-07-18 12:20:07 -04:00
Régis Hanol c7330ed73f BUGFIX: errors when post-processing 'data images' 2014-07-18 17:54:18 +02:00
Sam 8f36d3367f Merge pull request #2556 from riking/topic_error
Don't show Try Again for access errors on topics
2014-07-18 17:18:22 +10:00
Sam ed6766ccad FEATURE: push Reader up to 100 2014-07-18 15:57:03 +10:00
Sam 4feedecce4 BUGFIX: orphan badge groupings 2014-07-18 15:55:42 +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
riking 349003ee5e Don't show Try Again for access errors on topics 2014-07-17 17:50:37 -07:00
Sam b522f6116f FIX: strip out some more undo/redo stuff 2014-07-18 10:32:55 +10:00
Sam da26aae41e FIX: somehow button is not set 2014-07-18 10:31:02 +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 d90404e830 Change 'code' to 'message' 2014-07-17 15:19:58 -07:00
riking 12cb682548 Start passing more context to Discourse.handle_exception 2014-07-17 14:11:56 -07:00
Robin Ward 6d3efc9a58 TRIVIAL: Added "has-logo" and "no-logo" classes for styling categories 2014-07-17 15:57:17 -04:00
Robin Ward 38619b5a31 UX: Improve the interface for selecting a subcategory in a dropdown 2014-07-17 15:51:00 -04:00
Robin Ward 98907c0e81 FIX: Category counts were incorrect when the names were duplicates. 2014-07-17 14:54:04 -04:00
Robin Ward 5ccb656b62 Don't trigger `replaceState` until scrolling stops. 2014-07-17 14:34:56 -04:00
Robin Ward 61fd64c99d ES6: Many modal views 2014-07-17 13:43:22 -04:00
Robin Ward 3265360ff7 Merge pull request #2546 from riking/hide_deleted
Hide deleted posts by default for staff
2014-07-17 13:40:58 -04:00
riking 19b757b058 FEATURE: Hide deleted posts by default for staff 2014-07-17 10:40:15 -07:00
riking c8d322d1be Include the email subject line in rejection messages
This change has a tradeoff.
It increases our backscatter vulnerability - the subject could have spammy content - but it's extremely valuable to the user to know exactly which message was rejected.
If you sent two at the same time, and only one was rejected, you would have no way of knowing which worked and which to resend without going to the website (which is what email-in is trying to avoid, kinda).
2014-07-17 10:25:53 -07:00
riking 73ceeda1f9 Stop unnecessarily suppressing settings for uncategorized
Fix migration for emailing into uncategorized
2014-07-17 10:25:52 -07:00
Robin Ward ede8f22971 Use the header background color for a site in the digest email. 2014-07-17 12:31:37 -04: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
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