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
9,512 Commits 1,018 Branches 579 Tags
d56d7866ff65dccdcb278dd3bcf45ecd2bb06c27
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward 62ef81d895 FIX: Don't scroll to top if there's an anchor present. 2014-07-16 18:14:39 -04:00
Robin Ward d9c2b316b6 FIX: Resolver should try with slashes instead of periods too 2014-07-16 17:38:14 -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
Robin Ward 71c67c43a1 ES6: User activity views 2014-07-16 13:19:47 -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
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
Robin Ward d6589d4c53 FIX: Cooking issue with paragraphs in a list 2014-07-15 16:42:14 -04:00
Robin Ward 6406102815 Merge pull request #2545 from techAPJ/patch-1 
FIX: Instead of silently failing, assign alternative username when provi...
 2014-07-15 16:00:06 -04:00
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
Robin Ward 844edb31e7 Merge pull request #2544 from riking/activation 
Don't redirect to login when activating account...
 2014-07-15 13:53:26 -04:00
Robin Ward 18661fac79 Merge pull request #2543 from riking/discourse-script 
Strip path from restore filenames
 2014-07-15 13:30:42 -04:00
Robin Ward 3368e23fe4 ES6: Preferences views 2014-07-15 12:36:57 -04:00
Robin Ward dd6fd7fa39 FIX: Don't put iframes in emails where they are sanitized out. Replace 
them with links.
 2014-07-14 16:41:37 -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
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
Robin Ward 186ce78cb5 FIX: BBCode sanitization and tests 2014-07-14 11:24:25 -04:00
Robin Ward fc20332c0f Lift all oneboxes out of <p> tags. 2014-07-04 16:09:51 -04:00
Robin Ward 2e0832fa71 TWEAK: Add the category description beside the logo, if present. 2014-07-04 15:35:02 -04:00
Robin Ward 914f0c3512 FIX: Don't surround oneboxes by paragraphs 2014-07-04 15:12:30 -04:00
Robin Ward 7ab98bb0e7 FIX: Missing formatting for oneboxes in preview 2014-07-04 14:15:07 -04:00
Robin Ward a64b954fca Merge pull request #2507 from techAPJ/invite-patch-1 
REFACTOR: move all conditions to guardian
 2014-07-04 13:52:57 -04:00
Robin Ward 43b997c1ce TRIVIAL: Santiize some extra attributes from images 2014-07-04 13:22:48 -04:00
Robin Ward 689afbfb7a FIX: Try to match a selected element in a combo box, even if it 
has a value of 0.
 2014-07-04 13:11:43 -04:00
Robin Ward 4237099db3 ES6: More modal views 2014-07-04 11:50:40 -04:00
Robin Ward abf6ffcaa0 Merge pull request #2504 from riking/patch-2 
Pretty sure anons can't open the composer
 2014-07-04 10:11:03 -04:00
Robin Ward fc1ce96dbb FIX: Change the approach to sanitization. Includes a more detailed API 
for allowing classes and attributes for only certain tag names.
 2014-07-03 16:55:36 -04:00
Robin Ward 4f09317cb3 ES6: A bunch of modal views 2014-07-03 12:39:14 -04:00
Robin Ward e5059137d0 TRIVIAL: Remove log statement 2014-07-03 11:32:10 -04:00
Robin Ward f247ea89b0 TWEAK: Show subcategory name even if there is a logo 2014-07-03 11:31:42 -04:00
Robin Ward 7ac4372427 Merge pull request #2455 from riking/error-route 
Fancy error page for topic lists
 2014-07-03 10:53:19 -04:00
Robin Ward 554e5c8482 XSS: Escape the custom title (admin only) when displaying group titles. 2014-07-02 19:55:52 -04:00
Robin Ward 334becd0ed SECURITY: Upgrade Rails to latest version 2014-07-02 16:55:18 -04:00
Robin Ward 462dcadd01 FEATURE: Subcategory list on parent subcategory page. 2014-07-02 16:47:43 -04:00
Robin Ward 4592916026 ES6: Convert route builders to initializer 
Remove deprecated `Discourse.addInitializer`
 2014-07-02 16:47:43 -04:00
Robin Ward 1f829c4e70 WIP: New site setting to show subcategory list on category list 2014-07-01 17:12:03 -04:00
Robin Ward 37ed5a3001 FEATURE: Show logos on the categories page, if present 2014-07-01 16:25:22 -04:00
Robin Ward f62b05c985 FIX: Apply category class when inside a topic of that category 2014-07-01 16:06:48 -04:00
Robin Ward c94cf78291 CSS: Alignment of category buttons for admins 2014-07-01 16:06:48 -04:00
Robin Ward 7a739eb373 FIX: Don't lose background class while navigating from /latest to 
`/new`
 2014-07-01 16:06:47 -04:00
Robin Ward 288bb5588f Use different approach for background image 2014-07-01 13:40:09 -04:00
Robin Ward d9e583af1a FEATURE: Add new site setting to restrict how many times you can click on an 
invite to "passthrough" as logged in, with a default of 0 hours. Also changes
default invite expiry from 7 days to 1.
 2014-07-01 12:52:52 -04:00
Robin Ward bad5938cdd ES6: All list views 2014-07-01 12:02:06 -04:00
Robin Ward de17c693fc Merge pull request #2487 from toolness/patch-2 
Update DEVELOPER-ADVANCED.md with Sidekiq info
 2014-07-01 11:28:47 -04:00
Robin Ward 366b9dae5c Merge pull request #2488 from toolness/patch-3 
Add imagemagick to basic setup apt-get install.
 2014-07-01 11:28:00 -04:00
Robin Ward 9c48f8f154 FIX: Don't surround <aside> with <p> as that is malformed HTML. 2014-06-30 18:11:22 -04:00
Robin Ward 0f52f26587 TWEAK: Don't show subcategory topic definitions when viewing a category list. 2014-06-30 15:22:40 -04:00
Robin Ward 952426d358 FEATURE: Uploaded images to categories are shown when browsing 2014-06-30 14:14:00 -04:00
Robin Ward e22688a204 FEATURE: Can upload images to categories 2014-06-30 14:14:00 -04:00
Robin Ward 9000c358d1 REFACTOR: Use common path for RESTful DELETE action from upload image 
component
 2014-06-30 14:13:59 -04:00
Robin Ward 3cbb32cc20 REFACTOR: uploading avatar should share code with upload component 2014-06-30 14:13:59 -04:00
Robin Ward 4088fba4f2 REFACTOR: Convert profile background uploader to be an ember component 2014-06-30 14:13:59 -04:00
Robin Ward 386a45aab7 Merge pull request #2479 from vikhyat/badge-system 
Badge system updates
 2014-06-27 15:09:04 -04:00
Robin Ward 380bfd0819 Merge pull request #2478 from riking/patch-email 
Fix email code & tests
 2014-06-27 15:07:46 -04:00
Robin Ward 07d1be9104 Update onebox gem for more support, minor openssl bug 2014-06-27 12:20:35 -04:00
Robin Ward 85747137ef FIX: Put in admin title when browsing admin section 2014-06-27 11:58:46 -04:00
Robin Ward c6e08deee2 Merge pull request #2477 from ligthyear/fix-outlet-double-render 
Fix Plugin-Outlets: remove block from views so Ember doesn't complain
 2014-06-27 10:26:11 -04:00
Robin Ward 0289e60a25 Merge pull request #2476 from techAPJ/suppress-invite-search 
FIX: show search filter only when invites are greater than or equal to ten
 2014-06-26 15:02:24 -04:00
Robin Ward 6907739a0b Merge pull request #2474 from techAPJ/add-topic-id-to-bulk-invite 
FEATURE: Add topic invitation support to Bulk Invite
 2014-06-26 13:30:30 -04:00
Robin Ward 07cb3aff97 We shouldn't have to redeclare tab panels in the category edit menu 2014-06-26 12:30:07 -04:00
Robin Ward 2f710142f0 Use partials for category modal sections, components for pills 2014-06-25 16:12:35 -04:00
Robin Ward 983f4829f0 Merge pull request #2470 from techAPJ/refactor-bulk-invite 
FEATURE: Add groups support to Bulk Invite
 2014-06-25 16:08:06 -04:00
Robin Ward b21496e3fb ES6: Convert search views 2014-06-25 14:03:41 -04:00
Robin Ward 2e378e9980 Merge pull request #2469 from awesomerobot/master 
horizontal scroll on search dropdown be gone!
 2014-06-25 12:21:41 -04:00
Robin Ward 7f6bace7c5 FIX: In IE9 *shudder* the path will be incorrect and reloading the 
latest posts will fail.
 2014-06-25 12:09:47 -04:00
Robin Ward 39c2c958e6 ES6: ComposerView 2014-06-24 16:53:10 -04:00
Robin Ward 4b745612d8 FIX: Gaps weren't refreshing on refresh 2014-06-24 15:07:13 -04:00
Robin Ward ab94399ae4 Minor note about docker. 2014-06-24 14:40:47 -04:00
Robin Ward 3521fb97e4 FIX: More safety for going back while stuff is uncloaking 2014-06-24 13:50:45 -04:00
Robin Ward b43ea8bcd1 FIX: Upgrade ember-cloaking to avoid setProperties error 2014-06-24 12:13:48 -04:00
Robin Ward a7ad7f6a45 Remove some obscure HTML tags from sanitization 2014-06-24 11:03:45 -04:00
Robin Ward 240bd2d580 Merge pull request #2464 from awesomerobot/master 
moving topic-list styles to base, aligning badges in poster expansion
 2014-06-23 16:56:26 -04:00
Robin Ward f0b2ec4032 FIX: Support statuses as well as status for twitter URLs 2014-06-23 16:31:30 -04:00
Robin Ward 1527aeeef6 FIX: The constraint on parent categories wasn't working properly. 2014-06-23 16:14:51 -04:00
Robin Ward ff55a30dd7 FIX: <pre> blocks were adding too many new lines. 2014-06-23 15:21:07 -04:00
Robin Ward 68d323faaf FIX: Load order for non-ES6 2014-06-23 13:32:34 -04:00
Robin Ward 42d1fcbbc2 [code] should work just like other kinda of code formatting. 2014-06-23 13:19:27 -04:00
Robin Ward 07ae7435f2 ES6: Convert all button views 2014-06-23 12:37:38 -04:00
Robin Ward d9fb5c4468 TRIVIAL: Remove border thickness from handlebars template. Just do the 
color there.
 2014-06-23 11:44:23 -04:00
Robin Ward a188ba77dc FIX: Don't raise an exception when last_posted_at is nil 2014-06-23 11:38:27 -04:00
Robin Ward 449f81785f FIX: If there is no last_posted_at don't raise an exception 2014-06-23 11:38:27 -04:00
Robin Ward 823e32462d Merge pull request #2463 from awesomerobot/master 
changing the tracking dropdown highlight for consistency
 2014-06-23 11:27:46 -04:00
Robin Ward 9560257b91 Merge pull request #2460 from riking/site-settings 
Add regex validations for OAuth, UA, and S3 fields
 2014-06-23 10:35:16 -04:00
Robin Ward 8a4e96645c FEATURE: Can click to expand hidden posts to see the good stuff! 2014-06-20 17:07:12 -04:00
Robin Ward a2fec165d5 Disable editing of hidden posts within a timeframe from when the post 
was initially hidden.
 2014-06-20 15:38:03 -04:00
Robin Ward 3811efa5e2 Record when a post was hidden 2014-06-20 15:03:23 -04:00
Robin Ward 3ac688d763 ES6: A couple of views 2014-06-20 13:29:11 -04:00
Robin Ward 94de396b99 Merge pull request #2459 from riking/email 
DEBUG: Send all email processing errors to admins
 2014-06-20 12:52:50 -04:00
Robin Ward f027563447 Add group icon to restricted parent categories 2014-06-20 12:50:13 -04:00
Robin Ward 56096619c0 FIX: Use secondary category color for stripes when only showing the 
stripe.
 2014-06-20 12:46:42 -04:00
Robin Ward 8cbf3bd720 Merge pull request #2458 from riking/previews 
Make ?preview-style make sense
 2014-06-20 12:12:03 -04:00
Robin Ward 7ae4c4dedc COSMETIC: visual tweaks to the categories page 2014-06-19 17:11:45 -04:00
Robin Ward 9d82111813 TRIVIAL: Remove some output from qunit test suite. 2014-06-19 16:00:01 -04:00
Robin Ward f0da4bf632 We don't need an empty app-events file. 2014-06-19 15:28:42 -04:00
Robin Ward 49ae01ddea TWEAK: Don't focus on progress expansion on touch interfaces. 2014-06-19 15:19:49 -04:00
Robin Ward 51b99c6453 Merge pull request #2457 from awesomerobot/master 
handful of alignment fixes
 2014-06-19 14:18:10 -04:00