IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
12,000 Commits 1,018 Branches 579 Tags
3f67ace40dcdd3a46ffb749e59a503d1463fa9ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward 953ac7de8f Merge pull request #2993 from techAPJ/patch-4 
Return a promise instead of triggering bootbox in model
 2014-11-21 15:20:50 -05:00
Robin Ward 4f377b28e8 Merge pull request #2994 from techAPJ/patch-5 
sort screened IPs by match_count
 2014-11-21 15:13:01 -05:00
Robin Ward 727e87b78f Merge pull request #2992 from techAPJ/patch-4 
FEATURE: export screened IPs list in a CSV file
 2014-11-21 14:35:36 -05:00
Robin Ward dd1ebb535b FIX: Could not download exported data on some sites 2014-11-20 14:02:10 -05:00
Robin Ward 5f4e4de02a FIX: Make user_id uniqueness check pending. It still seems to check 
but the test fails. cc @SamSaffron
 2014-11-20 13:42:37 -05:00
Robin Ward 87cd5dbcb7 Merge pull request #2985 from techAPJ/patch-3 
remove /download from csv file url
 2014-11-19 14:10:34 -05:00
Robin Ward bb5be561f3 Merge pull request #2982 from techAPJ/patch-2 
FEATURE: show exact error for test email
 2014-11-19 12:30:32 -05:00
Robin Ward d912cf727f Merge pull request #2980 from eriko/patch-1 
set indent_style to valid value
 2014-11-18 15:00:05 -05:00
Robin Ward f73aa444ee FIX: GroupedView bug with latest Ember build 2014-11-17 20:26:21 -05:00
Robin Ward 0b0cee4e07 Merge pull request #2969 from cpradio/pr-add-category-to-group-posts 
FEATURE: Add category to Group Post Listing
 2014-11-17 16:02:15 -05:00
Robin Ward 72cd2f284b FIX: Try a different way of removing use strict from Ember 1.7.1 2014-11-17 15:31:30 -05:00
Robin Ward 7b7567f8e6 FIX: Remove use strict from ember build to get around iOS bugs 2014-11-17 14:42:21 -05:00
Robin Ward 5e62461f5a Merge pull request #2975 from techAPJ/patch-3 
Update Translations
 2014-11-17 12:34:40 -05:00
Robin Ward cc097a3baa SECURITY: Update Rails to 4.1.8 2014-11-17 12:21:00 -05:00
Robin Ward ac245ede43 UX: Fixes for group view 2014-11-14 14:28:46 -05:00
Robin Ward 9cd3708b63 Instead of using a "discoveryLoading" action, return true so it can 
bubble up itself.
 2014-11-14 13:33:55 -05:00
Robin Ward 1d1978086c FIX: Improve use of loading spinners on discovery routes 2014-11-14 12:28:20 -05:00
Robin Ward 3829add90b Merge pull request #2963 from cpradio/pr-pin-unpin-topic-kb-shortcut 
FEATURE: Added Pin/Unpin Keyboard Shortcut
 2014-11-14 11:14:35 -05:00
Robin Ward cb25d0c0fb Tweak HTML to include active class on the li on the site settings 
route
 2014-11-14 11:10:55 -05:00
Robin Ward 54c4d200a6 Upgrade to latest onebox. 2014-11-14 11:01:19 -05:00
Robin Ward a710ff08ad Missing Loading Route 2014-11-13 17:35:46 -05:00
Robin Ward 9520cc0613 FIX: Inconsistent loading of user profiel page (expanded/unexpanded top 
area)
 2014-11-13 16:30:58 -05:00
Robin Ward 0d12ed2231 UX: More spinner upgrades 2014-11-13 15:40:28 -05:00
Robin Ward 074fa81182 UX: Proper loading spinner on create account 2014-11-13 13:50:19 -05:00
Robin Ward 61109a43d2 UX: Use new spinner when logging in 2014-11-13 13:43:54 -05:00
Robin Ward 7b50244e98 UX: Use new loading spinner when uploading an image 2014-11-13 12:55:47 -05:00
Robin Ward 03bc91f204 Unify loading-spinner helper, add conditional support via component 2014-11-12 15:11:20 -05:00
Robin Ward 02abcd03fb UX: Position loading spinner properly on user pages 2014-11-12 13:57:59 -05:00
Robin Ward 4090ed226a FIX: Don't use a process cache in development mode 2014-11-12 13:51:16 -05:00
Robin Ward fb241a4351 UX: Use loading spinner on notifications 2014-11-12 13:37:51 -05:00
Robin Ward e26e5312d7 FIX: Couldn't click on avatar on private message list 2014-11-12 11:53:07 -05:00
Robin Ward 824c0b0f87 FIX: Remove grouped-each helper. GroupedView is deprecated in Ember 
1.9
 2014-11-11 15:58:47 -05:00
Robin Ward 873277ae5f Add loading route support to admin flags 2014-11-11 15:48:13 -05:00
Robin Ward dc4da6b013 UX: Don't delay spinner on topic lists or clicking home 2014-11-11 14:58:00 -05:00
Robin Ward 2431ca5e25 Whitelist more loading routes, remove unneeded user loading route. 2014-11-11 14:37:53 -05:00
Robin Ward 4d4734ef2f Refactored loading routes for users/badges 2014-11-11 14:17:19 -05:00
Robin Ward af71326a9c FIX: Missing styling for embedded reply 2014-11-11 11:17:39 -05:00
Robin Ward c89064f7c0 Merge pull request #2901 from JKillian/patch-1 
Add additional fields that indicate reply
 2014-11-10 15:44:14 -05:00
Robin Ward f414020be8 FIX: New topics were not showing in suggested 2014-11-10 15:20:01 -05:00
Robin Ward a6b1be81b1 Upgrade to Ember 1.7.1 + group patch 2014-11-10 14:49:02 -05:00
Robin Ward c32df362d4 Add loading template for routes that return promises 2014-11-10 13:07:49 -05:00
Robin Ward e1d26736b2 FIX: Missing tab delegation 2014-11-10 12:04:16 -05:00
Robin Ward 9f127d8183 UX: Focus on the user card when it's rendered 2014-11-10 11:31:28 -05:00
Robin Ward bfa5835025 Merge pull request #2957 from techAPJ/patch-1 
add user title in exported csv
 2014-11-10 10:11:24 -05:00
Robin Ward 0777efe74d FIX: 1000 was a crazy threshold for showing categories at the bottom of 
digests
 2014-11-07 17:16:52 -05:00
Robin Ward bfe2021859 UX: In digest email lists of topics, show striped version of category 
badge
 2014-11-07 17:00:09 -05:00
Robin Ward 872cfff49b FIX: Shouldn't overwrite styles in emails that we explicitly set, like category 
colors.
 2014-11-07 16:42:57 -05:00
Robin Ward 5defaca197 FIX: Don't use auto sizes for very small images (emoticons) 2014-11-07 16:09:16 -05:00
Robin Ward 8199c3b440 Don't add the g flag 2014-11-07 12:09:45 -05:00
Robin Ward 0044a99000 Don't raise an error for global regexps; warn the plugin author instead. 2014-11-07 12:04:44 -05:00
Robin Ward 564e7a988c Merge pull request #2848 from riking/whitelist-api 
Improve Markdown.whiteListTag, code dialect
 2014-11-07 11:33:37 -05:00
Robin Ward d6ff1630a8 Merge pull request #2898 from kellec/remove_focus_link_href 
Remove href attribute from tab link to prevent duplicate event on enter.
 2014-11-07 11:01:06 -05:00
Robin Ward 6f7cf8599f Merge pull request #2949 from fantasticfears/master 
css tweak - expanding some room for zh_CN
 2014-11-07 10:55:55 -05:00
Robin Ward 40900e59d1 Merge pull request #2955 from riking/include_raw_2 
FEATURE: ?include_raw parameter for /t/id/posts.json
 2014-11-07 10:50:15 -05:00
Robin Ward 76f68e23e8 FIX: Strip the word "SECURITY" from the output too 2014-11-06 16:05:13 -05:00
Robin Ward 9e55215c71 FIX: Include security in release notes 2014-11-06 16:02:26 -05:00
Robin Ward 1333378f39 FIX: Don't include reverts in release notes 2014-11-06 16:02:26 -05:00
Robin Ward 3b699daec3 UX: Fix some weird margins/padding when zoomed in on user profiles 2014-11-06 11:31:06 -05:00
Robin Ward b328d47628 FIX: fa- check was incorrect on user card 2014-11-05 15:19:08 -05:00
Robin Ward a0e92ef57a FIX: PageTracker was not sending the proper page title through at all 
times.
 2014-11-05 15:15:58 -05:00
Robin Ward 2d9187cd9d Admin controls to select a date range for reports 2014-11-05 14:46:44 -05:00
Robin Ward e79c1c23d9 Show CSV groups on user profile 2014-11-05 14:05:16 -05:00
Robin Ward 068d22e9b3 Add API support for querying admin reports by date range 2014-11-05 13:11:37 -05:00
Robin Ward fde5e739c9 Work in progress (up till about?) 2014-11-05 12:39:25 -05:00
Robin Ward acfd99ebf2 FIX: Use proper HTML for spinner rather than handlebars 2014-11-05 12:04:35 -05:00
Robin Ward ea0c6df839 FIX: Only look for fa- at the beginning of the field. Allows urls with 
that combination in it. Thanks @riking
 2014-11-05 11:52:22 -05:00
Robin Ward 6a424cf469 UX: Make the user card badge image larger. If present, make text have a 
smaller width to accomodate the larger image.
 2014-11-04 16:30:46 -05:00
Robin Ward a78048f3fb FIX: Filter user button shouldn't appear on card when there is already a filter 
active.
 2014-11-04 16:12:42 -05:00
Robin Ward c9eb809dad FIX: The text to users who signed up when approval was required was 
misleading.
 2014-11-04 15:48:03 -05:00
Robin Ward e8a750e27a FIX: Missing dates on user card 2014-11-04 15:22:55 -05:00
Robin Ward 74e2b8f674 FIX: User card @mentions looked pretty bad 2014-11-04 14:25:35 -05:00
Robin Ward 9161b8529f Broken tests, let's try popping in/out now to see how that works. 2014-11-04 13:46:35 -05:00
Robin Ward d4d282e919 UX: Let's try a fade in when the user card is shown 2014-11-04 13:26:33 -05:00
Robin Ward e96630c6f4 FIX: Malformed user card HTML 2014-11-04 13:13:45 -05:00
Robin Ward ac25a24b40 Missing i18n key 2014-11-04 13:08:32 -05:00
Robin Ward 9196642221 UX: Add title to user card image, shrink to avoid bleeding into text. 2014-11-04 13:01:41 -05:00
Robin Ward 7a8811882e UX: Remove icons, add black/white colors to attributes in user card 2014-11-04 12:53:02 -05:00
Robin Ward 1302a0a276 Allow Emoji to be overwritten. Show added Emoji in search. 2014-11-04 12:20:00 -05:00
Robin Ward f361adef44 Make plugin load order deterministic 2014-11-03 15:26:25 -05:00
Robin Ward 407f3abffb Simple API for registering custom emoji 2014-11-03 13:56:31 -05:00
Robin Ward bab4f48eeb FIX: Trim the profile text in the user card even if it has multiple lines. 2014-11-03 11:59:56 -05:00
Robin Ward 811b8f3281 FIX: On mobile you couldn't click on a post avatar 2014-10-31 17:34:45 -04:00
Robin Ward b5e9e9d6bd FIX: Enable word wrap for pre tags in embedded discourse on iOS 2014-10-30 16:14:40 -04:00
Robin Ward e66c53a4a7 Add /badges to robots.txt for now, we don't have a crawlable view so 
it's better to exclude it.
 2014-10-30 14:32:42 -04:00
Robin Ward 572842721d FIX: Better page titles for SEO 2014-10-30 14:26:56 -04:00
Robin Ward 78f5237ae9 UX: Add title to user card, if exists 2014-10-30 12:11:33 -04:00
Robin Ward 316f1bea04 SECURITY: Don't allow redirects with periods in case you don't control 
other tlds on the same domain.
 2014-10-30 11:31:44 -04:00
Robin Ward f58c0e1f22 Patch ember-cloaking to work in Ember 1.7 as well as 1.6 2014-10-29 14:21:05 -04:00
Robin Ward 40684ff7e6 FIX: queryParams and Em.set for later Ember versions (1.7+) 2014-10-29 13:58:05 -04:00
Robin Ward 7990d6ba2f Revert "FIX: Workaround for modal CSS bugs in IOS 8. Don't use a table to" 
This reverts commit edea7180f4.
 2014-10-29 12:43:19 -04:00
Robin Ward 44ff357e1c Remove unused view, use preferred dash format for filenames, add 
warnings when templates are missing
 2014-10-29 10:39:06 -04:00
Robin Ward daf7239d87 Lookup templates using the container 2014-10-29 10:32:57 -04:00
Robin Ward fe8d9642a0 Merge branch 'master' of github.com:discourse/discourse 2014-10-29 10:15:06 -04:00
Robin Ward e7b39be194 Merge pull request #2930 from techAPJ/patch-2 
optimize detecting avatar image logic
 2014-10-28 17:02:37 -04:00
Robin Ward 39bbab89cc Merge pull request #2928 from awesomerobot/master 
fixing the broken groups page
 2014-10-28 16:07:47 -04:00
Robin Ward 19d52c38de Merge pull request #2929 from techAPJ/patch-2 
FIX: letter avatars were not getting stripped from short emails
 2014-10-28 16:07:26 -04:00
Robin Ward f47ab30b04 Use a site setting for maximum summary results 2014-10-28 16:03:43 -04:00
Robin Ward 3eb020c466 Max out summary filter at 100 posts. 2014-10-28 15:58:04 -04:00
Robin Ward edea7180f4 FIX: Workaround for modal CSS bugs in IOS 8. Don't use a table to 
vertically centre, use a margin offset.
 2014-10-28 12:03:36 -04:00
Robin Ward a4363e033d REVERT commits for raw handlebars rendering. We need to create a 
separate branch and discuss issues of this approach.
 2014-10-28 10:56:04 -04:00