IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 13:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,245 Commits 1,012 Branches 579 Tags
bf951689e8a3c58c0c37c8f08a6fbe56bae56979
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward bf951689e8 FIX: Don't allow moving a category with children underneath another 
category (creating grandchildren)
 2014-02-03 15:09:35 -05:00
Robin Ward b9989dd24b Updates onebox 2014-02-03 12:16:42 -05:00
Robin Ward 9606ae5dcb FIX: search context was missing when searching inside a category 2014-02-03 11:38:11 -05:00
Robin Ward ea9ff108c5 Move updating title count to the view, to ensure the topic list is 
visible when it happens.
 2014-02-03 10:46:19 -05:00
Robin Ward 0fca760126 FIX: Jump to bottom was broken by the /last path. 2014-01-31 17:55:40 -05:00
Robin Ward 3deb055110 Update onebox gem 2014-01-31 17:34:15 -05:00
Robin Ward 704f1bf80b Merge pull request #1889 from et/remove-invalid-comment 
Remove invalid comment.
 2014-01-31 14:26:37 -08:00
Robin Ward 45f19dbbf6 Merge pull request #1891 from codedinc/better-pill 
Improve bluepill sample config
 2014-01-31 14:25:57 -08:00
Robin Ward fc36a87e72 FIX: Invalid ruby code for universal google analytics 2014-01-30 15:45:24 -05:00
Robin Ward f5019be477 Support for a /last route to go to the last post in a topic. 2014-01-30 15:24:04 -05:00
Robin Ward 2acb517f44 Revert "Merge pull request #1878 from balinterdi/patch-2" 
This reverts commit bfddc5a191, reversing
changes made to 8f1e754bf2.
 2014-01-30 14:32:41 -05:00
Robin Ward bfddc5a191 Merge pull request #1878 from balinterdi/patch-2 
Simplify usage of unbound i18n helper
 2014-01-30 10:46:21 -08:00
Robin Ward 8f1e754bf2 Merge pull request #1883 from velesin/ember_integration_tests_jshint_fix 
Modifies JSHint config to enable new Ember e2e tests syntax
 2014-01-30 10:45:17 -08:00
Robin Ward b4fef88412 Merge pull request #1884 from velesin/search_controller_refactoring 
refactors Discourse.SearchController
 2014-01-30 10:44:53 -08:00
Robin Ward 6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward e9664d5cfa Merge pull request #1885 from schmatz/master 
Fixed 'devloper' typo in quickstart config file
 2014-01-30 09:27:19 -08:00
Robin Ward 7564d9a20c Server side implementation for bulk editing categories 2014-01-30 11:44:29 -05:00
Robin Ward b315a5c28f Delegate bulk operations to a TopicsBulkAction object. 2014-01-30 11:44:29 -05:00
Robin Ward 0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward 6ee266c7ee Modal for performing a bulk operation 2014-01-30 11:44:29 -05:00
Robin Ward 1696cde2ff Toggle button for bulk selection of topics 2014-01-30 11:44:29 -05:00
Robin Ward 30abc6b291 Appropriate Onebox style 2014-01-29 14:14:07 -05:00
Robin Ward e453bfa073 Work in progress: Swap out onebox code for onebox gem 2014-01-29 14:14:07 -05:00
Robin Ward 9117470f27 REMOVE: discourse_poll has not worked for over a year now. Let's 
remove it.
 2014-01-29 12:00:21 -05:00
Robin Ward 2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Robin Ward 42117c684f Remove console from .jshintrc. If we need our app to log, use 
`Ember.Logger` instead.
 2014-01-28 17:13:34 -05:00
Robin Ward 4626519cdc Use an itemController for topic lists. This will make bulk operations 
easier.
 2014-01-28 15:12:26 -05:00
Robin Ward 52ff68f74f REFACTOR: Change didInsertElement to on('didInsertElement') 2014-01-28 14:49:08 -05:00
Robin Ward 359a866458 Merge pull request #1865 from vikhyat/less-than-sanitization 
Fix sanitization of smileys like <_< and <3.
 2014-01-27 12:34:44 -08:00
Robin Ward 88e1fadd0f Merge pull request #1863 from ecuk/analytics 
Google Universal Analytics
 2014-01-27 12:33:17 -08:00
Robin Ward e4c0fd7636 Merge pull request #1858 from shicholas/patch-1 
Updated with tips for Postgres93.app
 2014-01-27 12:26:41 -08:00
Robin Ward 701cf4a9b8 FIX: Scroll to top on categories view, too. 2014-01-27 15:20:08 -05:00
Robin Ward 1609950781 FIX: Missing module name 2014-01-27 15:11:51 -05:00
Robin Ward 964dddf92d FIX: Hidden icon was missing 2014-01-24 14:29:41 -05:00
Robin Ward 938361322b Merge pull request #1859 from nragaz/mac-os-x-setup 
Update the OS X development documentation
 2014-01-24 07:45:04 -08:00
Robin Ward 8493f4ad27 Merge pull request #1860 from ecuk/embed-category 
Add site setting for category of topics created by embedding
 2014-01-24 07:40:10 -08:00
Robin Ward e3a151d66a FIX: Show category text color in oneboxes 2014-01-23 13:35:29 -05:00
Robin Ward c9cca78ab2 FIX: Show "Begin Discussion" button when there are 0 replies 2014-01-23 12:59:10 -05:00
Robin Ward 6ec1f93c05 Merge pull request #1855 from chrishunt/update-favcount 
Bump favcount.js to v1.5.0
 2014-01-23 09:46:14 -08:00
Robin Ward 03779697e7 FIX: Could navigate back to "Preferences" from "Change Email" 2014-01-23 11:39:02 -05:00
Robin Ward 7b20079d85 FIX: Allow Favcount to be used with CORS. I've submitted this upstream 
too:

https://github.com/chrishunt/favcount/pull/8
 2014-01-23 11:07:10 -05:00
Robin Ward 97dd560d84 Allow CORS on .ico files. Should help with Favcount.js 2014-01-23 10:41:22 -05:00
Robin Ward 659b95178a FIX: Removed Rails.logger. Sigh. 2014-01-22 17:09:57 -05:00
Robin Ward 2d15c82b26 FIX: Digest styling for oneboxes 2014-01-22 15:30:44 -05:00
Robin Ward 39c6e48aa5 FEATURE: Return only the first paragraph of text in HTML digests, unless 
there is only one post. In that case return everything. Remove
dependency on 'html_truncator'
 2014-01-22 12:37:37 -05:00
Robin Ward 502b4730c8 FIX: Don't show uncategorized badges in digest emails 2014-01-22 11:27:57 -05:00
Robin Ward 745cd0f4e9 FIX: Removes console.log 2014-01-22 11:07:19 -05:00
Robin Ward 194081ca47 FIX: Hidden posts were not being displayed with the correct messaging. 2014-01-21 17:23:03 -05:00
Robin Ward e2c361f353 FIX: Indented code blocks followed by <blockquote> weren't working. 2014-01-21 16:18:20 -05:00
Robin Ward d867fb62e4 FIX: Upstream markdown-js fix for quotes inside lists. 2014-01-21 14:34:53 -05:00
Robin Ward 7fb1b4dded FIX: Can do multiple :) emojis on one line 2014-01-21 13:33:19 -05:00
Robin Ward a524194a46 FIX: Bugged up Components vs. Views. My original error was using 
`templateName` instead of `layoutName` in an `Em.Component`. This fixes
that and backs out other "fixes"
 2014-01-21 13:08:47 -05:00
Robin Ward 3c3449aa1b Revert "New API for replacing elements in the final JsonML. Also changes spoiler" 
This reverts commit 6b9b2d3d6a.

We have come up with a better solution that does not involve HTML
parsing.
 2014-01-21 12:04:58 -05:00
Robin Ward 564a7e505e FIX: Deprecation warning on bindAttr 2014-01-21 11:06:18 -05:00
Robin Ward 0a8432645d FIX: Updated Markdown-js to include my latest FIX from upstream: 
https://github.com/evilstreak/markdown-js/pull/164
 2014-01-21 11:05:17 -05:00
Robin Ward 2684f20ada Merge pull request #1841 from CiderCooler/master 
Clarify commands around rvm
 2014-01-21 07:07:20 -08:00
Robin Ward 839c6f0aa8 Merge pull request #1850 from Supermathie/sysadmin-docs 
Finally merge in @kpfleming's suggestions in #1430
 2014-01-21 07:05:47 -08:00
Robin Ward 1fe95f044a Merge pull request #1849 from vikhyat/fix-pm-invite 
Fix inviting others to private messages.
 2014-01-21 07:05:15 -08:00
Robin Ward 8c32f22ae0 FIX: Adding components to a ContainerView doesn't set the context 
properly.
 2014-01-20 17:13:36 -05:00
Robin Ward 963793549c FIX: Remove failing ruby tests. The same thing is tested in JS and 
passes due to the ability to create a document fragment.
 2014-01-20 15:28:46 -05:00
Robin Ward 6b9b2d3d6a New API for replacing elements in the final JsonML. Also changes spoiler 
tag handling to be more robust with repsect to HTML content.
 2014-01-20 15:15:50 -05:00
Robin Ward 4981525047 REFACTOR: Fixes poor class hierarchy for listing topics 
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
 2014-01-18 19:26:24 +01:00
Robin Ward 8c29ed870e Non-staff users may not delete their posts in archived topics. 2014-01-17 17:42:12 -05:00
Robin Ward 55397361be Update ember-cloaking to remove dependency on I18n 2014-01-17 16:56:24 -05:00
Robin Ward 3bbe595d10 Merge pull request #1826 from nporteschaikin/patch-1 
Delegate :username rather than using a class method.
 2014-01-17 13:54:11 -08:00
Robin Ward cf04026b15 Merge pull request #1836 from nitper/patch-2 
fix for nil session in mobile_detection.rb
 2014-01-17 13:50:32 -08:00
Robin Ward f47e8e12dd FIX #1831: Dates were unbound on the profile page. 2014-01-17 16:24:45 -05:00
Robin Ward 6131829df0 rename date to unboundDate because it is unbound. 2014-01-17 15:23:51 -05:00
Robin Ward bc2993b458 FIX: Incorrect comment, thanks @ZogStrIP 2014-01-17 14:05:31 -05:00
Robin Ward f4c57130dc Renames unboundDate to rawDate because date is current unbound. 2014-01-17 13:56:26 -05:00
Robin Ward 18e719b0af In development mode, if an avatar is missing just serve up a placeholder 2014-01-17 11:47:23 -05:00
Robin Ward 0c0833d6b9 FIXES #1833, thanks @stefanpenner 2014-01-17 10:44:42 -05:00
Robin Ward c82279b9bd FIX: When embedded, don't show button at the top unless there are more than 10 posts. 2014-01-14 16:06:04 -05:00
Robin Ward 9097368038 FIX: Incorrect string match 2014-01-14 15:38:12 -05:00
Robin Ward 71aed34e64 FIX: Allow click tracking to work with different origins 2014-01-14 15:20:46 -05:00
Robin Ward 4f6283ba56 FIX: Accept HTTPS or HTTP urls on redirect 2014-01-14 15:02:05 -05:00
Robin Ward b617468098 FIX: currentPath was not changing when transitioning to the same path. 
Added a new hook to allow other kinds of analytics.
 2014-01-13 15:30:56 -05:00
Robin Ward 819ac61eb9 Let's put the "5 replies" back at the top of a comments section 2014-01-13 14:15:48 -05:00
Robin Ward bcc7f3aba4 Support embedded link counts via data-* attribute 2014-01-13 13:37:55 -05:00
Robin Ward 488319a5d1 FIX: Don't store incoming links on embed 2014-01-13 12:58:53 -05:00
Robin Ward af3edfd5eb FEATURE: Show Reply count on blog index page when embedding 2014-01-13 12:47:41 -05:00
Robin Ward 55918e6835 Adjustments to embedded content 2014-01-13 10:59:46 -05:00
Robin Ward 06435db4d7 Merge pull request #1821 from YesThatAllen/patch-1 
Clean up Mac OS how-to, add troubleshooting step
 2014-01-13 06:53:55 -08:00
Robin Ward d16b4487d5 Applied markdown-js fixes from upstream 2014-01-10 13:04:15 -05:00
Robin Ward 1aee217a61 FIX: sidekiq 100% CPU usage due to ice_cube 2014-01-10 11:43:51 -05:00
Robin Ward a37acd39a0 FIX: Scroll issue on Firefox when approaching the top post 2014-01-10 11:03:48 -05:00
Robin Ward ca26d6d0d6 FIX: Uncaught promise on link click; fixes broken build 2014-01-09 16:31:26 -05:00
Robin Ward af9b7bfee2 Add support for lists to readability topic importing. 2014-01-09 15:49:38 -05:00
Robin Ward 852d110f35 Test email is now synchronous and ignores sidekiq queue. 2014-01-09 15:25:25 -05:00
Robin Ward 2ee3859c08 New hook for after the application route has activated 2014-01-09 14:28:42 -05:00
Robin Ward 456a213904 FIX: Broken qunit test 2014-01-09 13:48:58 -05:00
Robin Ward b28a8e262f FIX: Categories are ordered by topic_count. 2014-01-09 13:05:32 -05:00
Robin Ward 339b5942bb Default should be to poll every 5 mins 2014-01-08 15:05:18 -05:00
Robin Ward b268ea8363 Improved Embedded templates slightly. 2014-01-07 15:48:39 -05:00
Robin Ward 14ec64a36a Give a better error message from the server if you've been replying too much. 2014-01-06 11:10:37 -05:00
Robin Ward 3bba75b052 FIX: Email preview with no date caused a server error 2014-01-06 10:18:37 -05:00
Robin Ward 25caec0e62 Change text at the bottom of embedded comments to be (x more replies) 2014-01-03 14:55:37 -05:00
Robin Ward c762e3c4b1 Support for scrolling to another post in the iframe; more complicated than you'd think! 2014-01-03 14:45:59 -05:00
Robin Ward 59ea1c3c2c Embedded: Change bottom link to last post, show deleted posts correctly. 2014-01-03 13:08:52 -05:00
Robin Ward 1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00