Commit Graph

373 Commits

Author SHA1 Message Date
Sam ab20d0aa10 HACK: work around https://github.com/mishoo/UglifyJS2/issues/328 2014-05-29 11:54:23 +10:00
Neil Lalonde ec5580c075 FIX: typo in vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_CN.yml 2014-05-28 14:12:45 -04:00
Robin Ward 2164a25258 Merge pull request #2333 from rhacker/select2
feature: use select2 instead of chosen
2014-05-28 11:42:40 -04:00
Sam 50a0c1a751 BUGFIX: fix redirect, correct multisite 2014-05-28 00:15:09 +10:00
Sam 0c86d9ed9e BUGFIX: proper multisite support for origin pull CDNs 2014-05-27 23:13:42 +10:00
Sam 7fbf162666 Logster update
cleans up a bunch of messed up context stuff with multisite
improves backtraces
adds request params
2014-05-25 13:54:52 +10:00
Arpit Jalan f8255f4443 Update translations 2014-05-22 22:28:47 +05:30
Sam fad868c78f Bump hashes on various files
Upgrade jquery


I made this commit cause my JS debugging CDN support added a header and
wanted we bump cache everywhere
2014-05-15 15:52:09 +10:00
Neil Lalonde f111e4ba56 Update translations 2014-05-14 12:37:00 -04:00
nXqd 0b6ebdac8a feature: use select2 instead of chosen 2014-05-14 08:01:08 +00:00
Sam ca4c72e648 BUGFIX: 500 error on some invalid uploads 2014-05-14 10:51:09 +10:00
Robin Ward 773cf60224 FIX: Missing close paren 2014-05-08 16:04:48 -04:00
Robin Ward a4e30e8f93 Proof of concept: Load controller via ES6 module in Discourse 2014-05-08 11:35:33 -04:00
Sam dddb2e19fc Rails 4.1 API change 2014-05-08 15:22:02 +10:00
Sam a2e2d0e886 Merge pull request #2316 from mutiny/refactor-where-first
Refactor `where(...).first` to `find_by(...)`
2014-05-08 09:10:45 +10:00
Neil Lalonde 11c0eb8db3 Update translations 2014-05-07 10:33:41 -04:00
Louis Rose 1574485443 Perform the where(...).first to find_by(...) refactoring.
This refactoring was automated using the command: bundle exec "ruby refactorings/where_dot_first_to_find_by/app.rb"
2014-05-06 14:41:59 +01:00
Robin Ward fd153623bb Revert "Proof of concept: Load controller via ES6 module in Discourse"
This reverts commit 0327f469c1.
2014-05-05 13:58:57 -04:00
Robin Ward 0327f469c1 Proof of concept: Load controller via ES6 module in Discourse 2014-05-05 13:23:45 -04:00
Neil Lalonde cb2bcb89ff Update translations 2014-05-02 14:01:27 -04:00
Neil Lalonde 0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Neil Lalonde 69dee799e9 Add plugins/poll and discourse_imgur translation files to transifex 2014-04-24 10:53:03 -04:00
Robin Ward 91679c61d5 FIX: Markdown formatting error 2014-04-23 16:46:42 -04:00
Robin Ward 73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
Robin Ward 4da76aab96 FIX: Markdown javascript error with certain formatting. 2014-04-09 10:46:24 -04:00
Wojciech Zawistowski c0a11adbc5 Moves Markdown Editor from vendor to discourse. 2014-03-31 21:56:19 +02:00
Wojciech Zawistowski 297c25ca1f Synced editor scrolling PoC. 2014-03-31 20:57:45 +02:00
Robin Ward 7baa8ea0af FIX: Upwards scrolling. Updates ember-cloaking 2014-03-31 14:32:51 -04:00
Sam 3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Robin Ward 2842952a76 FIX: Update ember-cloaking. Should fix some vanishing posts 2014-03-21 14:30:03 -04:00
Robin Ward e8ee490778 Extract breaking up a string into a separate file, include it in
embedded view.
2014-03-20 14:34:51 -04:00
Robin Ward 38f2c778fb Update ember-cloaking for latest fixes/tweaks 2014-03-17 12:01:17 -04:00
Robin Ward 1b1c213c61 Remove ember-renderspeed JS file 2014-03-11 16:15:41 -04:00
Sam d60c7966eb PERF: remove jQuery.UI monkey patch 2014-03-10 09:50:23 +11:00
Régis Hanol f25bcc5067 couple of bugfixes identified while importing from VB 2014-03-07 10:44:04 +01:00
Régis Hanol 386b1589f2 Bump the JS test suite timeout to 2 minutes
So that it can run properly on my 3-year old MBA
2014-03-05 10:45:57 +01:00
Robin Ward 47357136dc BUGFIX: Fix issues if the DOM element is destroyed while the interval
is ongoing (in particular this was weird for Firefox)
2014-02-28 15:35:45 -05:00
Robin Ward 61ff04d68b Upgrade ember-cloaking to not trigger scroll events when the back button
is hit.
2014-02-28 15:35:45 -05:00
Régis Hanol 68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00
Robin Ward 7716d940a0 BUGFIX: Allow links to images with absolute URLs as well as parens 2014-02-20 15:24:03 -05:00
Régis Hanol 1f90f3044f BUGFIX: restore wasn't working when not using multisite in production 2014-02-20 18:42:17 +01:00
Régis Hanol 438f97d8b0 BUGFIX: backup/restore rake tasks weren't working 2014-02-19 15:25:31 +01:00
Stephan Kaag f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Robin Ward a555dc9f5e FIX: Incorrect post number following a link. Updated ember-cloaking. 2014-02-13 14:08:12 -05:00
Robert Jackson 7acef17a35 Update Ember for CVE-2014-0046. 2014-02-09 11:10:14 -05:00
Sam f27ffe3223 BUGFIX: scheduler was showing up empty in multisite 2014-02-07 08:37:02 +11:00
Neil Lalonde a72e7324ba Append browser-update div last in the dom to prevent googlebots from seeing it first 2014-02-06 10:48:15 -05:00
Neil Lalonde f1b4c26e8e Add Mediapartners and AdsBot to list of user agents for Googlebot in browser-update.js.erb 2014-02-04 16:04:51 -05:00
Régis Hanol 632cd44c2f Fixed some JSHint warnings 2014-02-03 11:33:14 +01:00
Régis Hanol 659589e563 BUGFIX: make_list should only look for lists 2014-02-03 11:31:02 +01: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
Chris Hunt 4e9cf2f26e Bump favcount.js to v1.5.0
We've already made the CORS changes in our copy of favcount, but we
should bump the version to match upstream.
2014-01-23 09:29:28 -08: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
Régis Hanol 7a82b65386 BUGFIX: restore Mousetrap's bindGlobal plugin
cleared deprecated warnings in admin_customize_view
2014-01-22 16:52:09 +01:00
Régis Hanol 9313f27a89 update mousetrap to latest 2014-01-22 10:17:37 +01:00
Robin Ward d867fb62e4 FIX: Upstream markdown-js fix for quotes inside lists. 2014-01-21 14:34:53 -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 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 55397361be Update ember-cloaking to remove dependency on I18n 2014-01-17 16:56:24 -05:00
Robin Ward d16b4487d5 Applied markdown-js fixes from upstream 2014-01-10 13:04:15 -05:00
Chris Hunt e5c02a8320 Update favcount.js to v1.4.0 2014-01-08 15:14:07 -08:00
Robin Ward ef2f202c06 Minor update to ember-renderspeed 2014-01-02 16:41:08 -05:00
Robin Ward 8a1593bfd2 Upgrade JSHint to master + my fix for `tokens.hasOwnProperty` 2013-12-30 14:19:00 -05:00
Robin Ward 7e984e369a Upgrade JSHint. Fixes linting issues. 2013-12-30 12:42:05 -05:00
Régis Hanol 567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Robin Ward 62f757da2c FIX: iOS height was incorrect when zoomed for cloaking 2013-12-23 16:18:00 -05:00
Robin Ward 4c93da01c3 Googlebot seems to parse Javascript and inserts our browser update message
into their search results. If our client is googlebot, don't tell them to
update their browser.
2013-12-23 15:13:09 -05:00
Neil Lalonde 1f0a59584b Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-18 14:47:22 -05:00
Régis Hanol 06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde 5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Neil Lalonde 2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Neil Lalonde ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Robin Ward e20d649dee FIX: Performance issue with `[\]` characters. 2013-12-09 12:54:10 -05:00
Robin Ward 64a3afe35a Only allow a recursive depth of 3 for markdown links. 2013-12-08 22:22:08 -05:00
Robin Ward 30a9d3676d Some sanity checks with event binding 2013-12-04 13:28:56 -05:00
Robin Ward 3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Sam a0b1c8ed66 fix gemspec 2013-12-04 09:54:00 +11:00
Robin Ward de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton.
- Change Scrolling slack based on Android / Touch / Desktop
2013-12-03 13:03:19 -05:00
Neil Lalonde eea7aea688 Android 2.2 and 2.3: show warning that the browser is not supported 2013-12-02 14:18:33 -05:00
Robin Ward 48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Robin Ward f8acffb73c Merge pull request #1692 from kasperpeulen/dollarfix
Allow dollar sign for inline dialects
2013-11-28 11:24:04 -08:00
Kasper Peulen af2d854be5 Also added the caret symbol, for completeness. In this way all ascii symbols are allowed. 2013-11-28 00:00:02 +01:00
Neil Lalonde 1793b6840a Oops, remove console.log 2013-11-27 14:16:28 -05:00
Robin Ward 40f86829f7 Post Cloaking:
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.

* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
  are visible in the current browser viewport.

* There's been a lot of refactoring to ensure the relationship between the post views and the topic
  controller is sane.

* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
  focused on an element even if stuff is loading before it in the DOM that would normally push it
  down.
2013-11-27 12:53:32 -05:00
Neil Lalonde 8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
Kasper Peulen a7cb139238 support dollar sign in inline dialects
In this way it is possible to use the dollar ($) sign as a startpoint for an inline dialect.
2013-11-23 23:15:40 +01:00
Régis Hanol 60d97b8fc2 fix the build 2013-11-21 19:45:35 +01:00
Robin Ward 0bab3f9b4e Revert "Revert "FIX: Markdown bug", breaks build"
This reverts commit 08ad5d479e.
2013-11-20 11:53:06 -05:00
Sam 8278fdb9dd relocate emoji plugin, stop pre-compiling assets 2013-11-20 14:38:21 +11:00
Sam 08ad5d479e Revert "FIX: Markdown bug", breaks build
This reverts commit 4a32cddf80.
2013-11-20 10:41:21 +11:00
Robin Ward 4a32cddf80 FIX: Markdown bug 2013-11-19 16:23:04 -05:00
Robin Ward e25cf580d6 You miss one little `return` statement and @nlalonde crashes the composer :) 2013-11-12 11:48:30 -05:00
Robin Ward 965a0a91a2 FIX: Unloading categories page failed in some circumstances; update to latest Ember. 2013-11-08 14:09:27 -05:00
Robin Ward 127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
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
Sam 4d2c28e8b2 added setting to flush redis if you feel like doing so in dev 2013-05-03 09:56:10 +10:00
Michael Brown 132ee8a8e2 message_bus: support ps on FreeBSD 2013-05-01 14:29:57 -04:00
Sam 3b784b50cc correct base url in emoji so I can close bug 2013-05-01 11:16:13 +10:00
Sam cfc62dadff speed up tests
add the ability to find the first notify private message
2013-04-22 17:45:03 +10:00
Robin Ward e783891f31 Fix emoticons: Was not upgraded to use promises 2013-04-09 10:59:27 -04:00
Sam 0c6cb2805a gem updates, stop sourcing some stuff from github
uglifier v2
2013-04-08 09:42:39 +10:00
Sam 1aa96db594 there is a theoretical issue here 2013-04-03 16:47:33 +11:00
Karan Misra 5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
nverba 68e3f5228f Basic Heroku integration 2013-03-13 19:07:49 +00:00
Sam 1c8eef7dbd added basic passenger support, no long polling but functions
clean up initializers so they are ordered properly
2013-03-11 05:33:20 -07:00
Kuba Brecka bdeef4696f messagebus diagnostics process path on Mac OS 2013-03-08 16:46:23 +01:00
Robin Ward cf09e200a5 Moved Markdown out of Discourse.Utilities -> Discourse.Markdown 2013-03-05 14:56:43 -05:00
Bryson Holland 50cd44df2d Saved ~46KB through image optimization. 2013-02-28 10:58:12 -05:00
Gosha Arinich cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
Sam Saffron 82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
Sam Saffron b9698e8d2f fix loading message am message bus stuff 2013-02-18 19:37:12 +11:00
Sam Saffron cb0e53e701 more work in progress, message bus diags 2013-02-18 15:27:44 +11:00
Sam Saffron c95e1b644c fix tests 2013-02-16 12:26:10 +11:00
Sam Saffron ff0d58e4ee message bus work in progress 2013-02-16 12:14:52 +11:00
Sam Saffron eb188c57e8 started work on message bus diags 2013-02-15 19:23:40 +11:00
Dan Neumann afb83c1108 cleaned up discourse_plugin 2013-02-12 22:45:10 -06:00
Sam Saffron 99526c33da emoji should not be coupled into the core
avatars were being counted and should not have been for basic users
2013-02-12 18:43:48 +11:00
Sam Saffron bdba0a78c4 scaffolding for message bus diags 2013-02-12 18:01:38 +11:00
Sam Saffron edaa7643c5 add prefix so keys stop clashing 2013-02-08 22:09:09 +11:00
Sam Saffron d3f911cc4c Revert "Something here is messed up Revert "message bus fixes and diagnostics""
This reverts commit f3c6144e3b.
2013-02-08 22:03:45 +11:00
Sam Saffron f3c6144e3b Something here is messed up Revert "message bus fixes and diagnostics"
This reverts commit 36d1aafe1e.
2013-02-08 21:39:38 +11:00
Sam Saffron 36d1aafe1e message bus fixes and diagnostics 2013-02-08 19:13:36 +11:00
Robin Ward 21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00