Commit Graph

78 Commits

Author SHA1 Message Date
Sam 6acc31c837 move dbs into git ignored area 2013-11-06 11:44:29 +11:00
Sam 0327f6e02a fix Rails 4 multisite so connection handlers don't keep spinning up new pools 2013-11-06 11:44:29 +11:00
Sam dee38dad9d we don't need this backport 2013-11-06 11:44:29 +11:00
Sam 3bdd2eeeba fix multisite to work with rails 4 2013-11-05 11:11:34 +11:00
Robin Ward 5e69b277ea FIX: emoticon 💩 wasn't working :) 2013-11-04 11:47:23 -05:00
Régis Hanol a65a063a96 fix run-qunit 2013-11-02 00:22:25 +01:00
Régis Hanol b56b11d96a add qunit to autospec 2013-11-01 23:57:50 +01:00
Robin Ward 5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Robin Ward 26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks
are enabled.
2013-10-28 12:44:10 -04:00
Robin Ward e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Sam ff957a7b37 rails 4 deprecation fixes 2013-10-24 13:02:25 +11:00
Robin Ward 97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Robin Ward b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Robin Ward e527cbf884 FIX: Link reference-style text without a url 2013-10-21 14:16:49 -04:00
Sam 38a33a8c1b work in progress sortable categories 2013-10-21 15:25:20 +11:00
Robin Ward 8d016092cd FIX: Heading with style 2013-10-16 10:39:06 -04:00
Robin Ward f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Robin Ward 5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-15 10:53:11 -04:00
Robin Ward d55dc3dd99 Allow `:p` to show a tongue as well as `:P` 2013-10-11 17:06:18 -04:00
Robin Ward af931f0444 Reverting the Sanitizer commit in case we have to do something urgent
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
2013-10-11 16:44:26 -04:00
Robin Ward 9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-11 16:25:40 -04:00
Robin Ward 9e815dbef9 FIX: Blockquote issue 2013-10-01 16:45:45 -04:00
Robin Ward be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Sam 691377b5af remove patches that have been upstreamed
clean up rails4 checks so they are consistent
2013-09-12 15:39:02 +10:00
Robin Ward 808225f43a FIX: missing comma 2013-09-04 10:57:31 -04:00
Kane York c4ecfad78a Add "nose" faces to the translations table
as per http://meta.discourse.org/t/use-more-standard-smiley-codes-instead-of-smile/1822/44
2013-08-30 22:50:31 -07:00
Robin Ward eb5830f3b0 FIX: Make `getURL` available to plugins while they are starting up in a similar load order
to the client app.
2013-08-29 13:11:12 -04:00
Robin Ward 522c60c81a FIX: Error loading up V8 due to Discourse not being present 2013-08-28 18:28:25 -04:00
Robin Ward eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Robin Ward af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -04:00
Robin Ward 08762f5666 Merge pull request #1369 from voisintotoro/voisintotoro-branch
PNG Files optimization
2013-08-24 08:32:15 -07:00
Robin Ward 9ca0b0fe96 FIX: Emoticons were parsing twice sometimes. 2013-08-23 22:56:00 -04:00
voisintotoro 1983da14c3 PNG Files optimization 2013-08-22 14:00:25 +02:00
Robin Ward 7f69a58439 Replace Markdown parser. 2013-08-21 10:10:57 -04:00
Sam a7eea65d53 se onebox could exception out 2013-08-15 21:16:37 +10:00
Neil Lalonde 0d44313a4b Use Ember.ListView for blocked emails list 2013-08-09 10:06:58 -04:00
Sam 1132c10074 support server side js and arbitrary assets
proper chaining for emoji so other hooks can be called
2013-08-01 17:35:31 +10:00
Neil Lalonde 2a388e14e3 Add rake task multisite:rollback 2013-07-31 15:17:52 -04:00
Sam e7e00601c6 ok, we now dual boot rails 4 and rails 3 ... to run in rails 4 mode: RAILS4=1 bundle exec thin start 2013-07-21 10:56:48 +10:00
Navin d1d07cc01d Copy over images from latest gemoji
And update list of emojis
2013-07-17 10:17:59 +02:00
Régis Hanol 924c5d65cb wrapped I18n.lookup to inject the "js" namespace 2013-07-09 02:10:55 +02:00
Robin Ward 82c21868f3 Moved JSHint into Qunit suite. It's much harder to forget about now! 2013-06-21 14:07:11 -04:00
Robin Ward f0ebca51cc Moved Formatter, KeyValueStore and Onebox jasmine tests to QUnit. 2013-06-18 17:23:00 -04:00
Robin Ward 60fce196c7 More Qunit tests including a CLI runner 2013-06-18 13:44:20 -04:00
Robin Ward 66f5a3f6f6 FIX: Emoji sizes in emails should be done by the EmailStyler 2013-06-13 12:15:05 -04:00
Sam c1f6169b48 hidden and deleted state in user stream 2013-06-12 11:14:08 +10:00
Régis Hanol 4db87e4972 added untested discourse_imgur plugin
tried to keep as much logic/data from the original source code
2013-06-11 22:44:06 +02:00
Sam fa8a84f20c removed sugar.js, port functionality to moment and underscore.js
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
Sam ceddb6e0da fix bug where non-multisite environment would run out of connections 2013-05-20 00:23:10 +10:00
Sam bae2d252fa message bus extracted, wanted to make sure the tests run regularly, so the new repo has travis enabled.
new home is https://github.com/SamSaffron/message_bus

implemented group support over there with testing fixes
2013-05-16 15:03:16 +10:00