Rashid Khan 822ef96a7e Merge remote-tracking branch 'upstream/master'

2013-09-17 14:03:21 -07:00

..

components

Merge remote-tracking branch 'upstream/master'

2013-09-17 14:03:21 -07:00

controllers

Merged Pull Request #484

2013-09-13 13:52:13 -07:00

dashboards

Merge remote-tracking branch 'upstream/master'

2013-09-13 14:32:30 -07:00

directives

Merged Pull Request #484

2013-09-13 13:52:13 -07:00

filters

Merged Pull Request #484

2013-09-13 13:52:13 -07:00

panels

Merge remote-tracking branch 'upstream/master'

2013-09-17 14:03:21 -07:00

partials

Added 'add' button on row editor panel list

2013-09-17 09:41:24 -07:00

services

Cache bust json files

2013-09-17 09:56:12 -07:00

app.js

Previous fix did not work when jQuery was inlined into app.js because RequireJS was under the impression that it had already init-ed jQuery and didn't call the init function. This new strategy just allows jQuery to be jQuery and has app.js include the extensions (components/extend-jquery.js) before the app boots.

2013-09-14 17:59:09 -07:00