Commit Graph

5887 Commits

Author SHA1 Message Date
Hannah Wolfe
57ae36ab21 Merge pull request #6341 from kevinansfield/fix-mixed-content-on-team-page
Move user/cover image files used in admin team area into the client folder
2016-01-21 09:46:00 +00:00
Hannah Wolfe
c549914ae8 Merge pull request #6316 from halfdan/5606-subdir
Make regex for subfolder deduplication more restrictive
2016-01-20 20:09:29 +00:00
Hannah Wolfe
727591bceb Merge pull request #6367 from AntuanKhanna/patch-1
Fix comment about node version changes
2016-01-20 18:52:17 +00:00
Sebastian Gierlinger
a0d1372c94 Merge pull request #6363 from ErisDS/dep-updates
Dependency Updates
2016-01-20 16:09:20 +01:00
Hannah Wolfe
0e1a7669cd Merge pull request #6366 from kevinansfield/ember-2-3
deps: ember@2.3.0
2016-01-20 15:09:12 +00:00
Kevin Ansfield
929f9e89b2 deps: ember@2.3.0
no issue
- predominantly a bugfix and performance related release
- https://github.com/emberjs/ember.js/releases/tag/v2.3.0
- http://emberjs.com/blog/2016/01/15/ember-2-3-released.html
- some deprecations are introduced around the use of injected `container` objects, these are from `ember-simple-auth` and should be rectified with an up-coming release
2016-01-20 13:16:15 +00:00
Antuan Khanna
3e9bfe8497 Fix comment about node version changes 2016-01-20 13:38:15 +02:00
Hannah Wolfe
25d90822c3 Merge pull request #6364 from kevinansfield/deps-mirage
deps: ember-cli-mirage@0.1.11
2016-01-20 08:53:57 +00:00
Hannah Wolfe
7234cb7931 Merge pull request #6329 from kevinansfield/ember-data-2-3
deps: ember-data@2.3.2
2016-01-20 08:52:27 +00:00
Hannah Wolfe
8743c12379 Merge pull request #6354 from jtwebman/fix_sqlite_test_performance
Fix slow running tests when using Sqlite3.
2016-01-19 16:38:57 +00:00
Hannah Wolfe
1b5b6cf6e3 Merge pull request #6314 from halfdan/6287-import
Only import tables defined in core/server/data/schema.js
2016-01-19 15:22:24 +00:00
Kevin Ansfield
4f80d97d02 deps: ember-cli-mirage@0.1.11
no issue
- contains bugfixes for a couple of issues that we luckily haven't run into yet but likely will as we expand acceptance testing
2016-01-19 14:41:54 +00:00
Kevin Ansfield
f401d6f3e5 deps: ember-data@2.3.2
no issue
- updates ember-data dependency and switches to direct es6 module import instead of destructuring assignment
- fixes issue with `authenticationFailed` action being called before transitions have finished
2016-01-19 14:36:39 +00:00
Kevin Ansfield
580234c37a Merge pull request #6356 from acburdine/inject-usage
cleanup usage of Ember.inject
2016-01-19 13:20:33 +00:00
Austin Burdine
250e7a3b8b cleanup usage of Ember.inject 2016-01-19 07:03:27 -06:00
Kevin Ansfield
366b6d71e0 Merge pull request #6243 from acburdine/ember-ajax
deps: ember-ajax@0.7.1
2016-01-19 12:48:21 +00:00
Hannah Wolfe
d363fa134f deps: validator@4.5.0 2016-01-19 11:30:32 +00:00
Hannah Wolfe
76c8a59ee6 deps: semver@5.1.0 2016-01-19 11:30:32 +00:00
Hannah Wolfe
a4a3af80a2 deps: rss@1.2.1 2016-01-19 11:30:32 +00:00
Hannah Wolfe
245c1270cb deps: request@2.67.0 2016-01-19 11:30:31 +00:00
Hannah Wolfe
05b94fa981 deps: passport@0.3.2 2016-01-19 11:30:31 +00:00
Hannah Wolfe
60fce4c854 deps: oauth2orize@1.2.0 2016-01-19 11:30:31 +00:00
Hannah Wolfe
8248978ace deps: node-uuid@1.4.7 2016-01-19 11:30:31 +00:00
Hannah Wolfe
9268fce1e0 deps: moment@2.11.1 2016-01-19 11:30:30 +00:00
Hannah Wolfe
6018c1e787 deps: jsonpath@0.2.2 2016-01-19 11:30:30 +00:00
Hannah Wolfe
28c7f550c0 deps: html-to-text@1.5.1 2016-01-19 11:30:06 +00:00
Hannah Wolfe
4fa937b4d6 deps: fs-extra@0.26.4 2016-01-19 11:28:53 +00:00
Hannah Wolfe
7e268b44f6 deps: extract-zip@1.4.1 2016-01-19 11:28:52 +00:00
Hannah Wolfe
63311bd9dd deps: busyboy@0.2.12 2016-01-19 11:28:52 +00:00
Hannah Wolfe
e48701536d deps: body-parser@1.14.2 2016-01-19 11:28:52 +00:00
Austin Burdine
022bf364c2 deps: ember-ajax@0.7.1 2016-01-18 09:37:14 -06:00
Kevin Ansfield
5ab0710da3 Merge pull request #6353 from kevinkucharczyk/loading-image-switching-tags
Clear images in gh-uploader when navigating between items
2016-01-18 10:13:38 +00:00
Kevin Ansfield
61b7ac9917 Merge pull request #6350 from acburdine/ember-2.2.1
Update Ember to 2.2.1
2016-01-17 13:18:49 +00:00
JT Turner
12e3ca3ef9 Fix slow running tests when using Sqlite3.
closes #6355
Updated testing config to set a few settings on sqlite.
2016-01-16 17:24:15 -08:00
Kevin P. Kucharczyk
41a18c9262 Clear images in gh-uploader when navigating between items
closes #6198
- clear img src in gh-uploader when navigating to item with image
- always reset uploader component when new image is not empty
2016-01-16 21:54:02 +01:00
Kevin Ansfield
9fda1dc5ba Merge pull request #6348 from zinyando/adapter-fix
Make sure super in buildURL passes all arguments
2016-01-16 18:40:41 +00:00
Austin Burdine
beed0dbf6f deps: ember@2.2.1 2016-01-16 10:35:56 -06:00
zinyando
6659ecc6b6 Make sure super in buildURL passes all arguments 2016-01-15 19:13:36 +02:00
Kevin Ansfield
4b6d743c0f Merge pull request #6322 from acburdine/slug-generator
Make the slug generator a service
2016-01-15 16:23:05 +00:00
Austin Burdine
4862a9051c refactor slug-generator object into a service
refs #6243
2016-01-15 09:43:17 -06:00
Kevin Ansfield
da0a0c559b Move user/cover image files used in admin team area into the client folder
no issue
- fixes potential "mixed content" warnings if non-admin urls are redirected
2016-01-14 16:26:48 +00:00
Sebastian Gierlinger
749bd29e12 Merge pull request #6337 from halfdan/6332-i18n-startup
Revert i18n in startup-check
2016-01-14 10:05:25 +01:00
John O'Nolan
1c3354c51a Update SECURITY.md
Durr
2016-01-13 18:22:09 +02:00
Kevin Ansfield
5dba4fab5c Merge pull request #6331 from novaugust/draft_preview_notification
Add Preview link to draft saved notification
2016-01-13 14:27:52 +00:00
Fabian Becker
eef37acc49 Revert i18n in startup-check
- Removes preinstall dependencies
- Reintroduce old plain english strings
- Remove translations for startup check

closes #6332
2016-01-13 14:46:51 +01:00
Matt Enlow
c349394563 Add Preview link to draft saved notification
Closes #6330
- also change notifications to open with `target=_blank`
2016-01-13 06:44:51 -07:00
Sebastian Gierlinger
cb72792bb7 Merge pull request #6212 from kevinansfield/isolate-editor
Isolate all markdown editor behaviour into `gh-editor` component
2016-01-13 14:41:33 +01:00
Sebastian Gierlinger
b70e9d0979 Merge pull request #6333 from kevinansfield/fix-configjs-ignore
Improve config.js handling in .gitignore
2016-01-13 13:12:01 +01:00
Kevin Ansfield
ead352dd83 Isolate all markdown editor behaviour into gh-editor component
no issue
- move all existing markdown editor behaviour out of the editor controller and isolate it into a single component that can be swapped out
- split the `register/remove` functions of the `shortcuts-route` out into a separate `shortcuts` mixin
2016-01-13 12:01:31 +00:00
Sebastian Gierlinger
a92e047025 Merge pull request #6334 from kevinansfield/deps-ember-mocha
deps: ember-cli-mocha & ember-mocha
2016-01-13 13:00:46 +01:00