Commit Graph

2279 Commits

Author SHA1 Message Date
Hannah Wolfe
f47af4661d Merge pull request #2512 from surgesoft/issue-2443 2014-04-07 15:59:37 +01:00
Hannah Wolfe
609be5eb26 Removing test-api from Gruntfile.js
closes #2443
2014-04-07 15:53:13 +01:00
surgesoft
e89e38dd4b Refactor the API route tests to use supertest
close #2443
- Refactor API tests from `/core/test/functional/api` to
  `/core/test/functional/routes/api`, using supertest instead of request
- Remove `core/test/functional/api` folder
2014-04-07 15:40:20 +01:00
Hannah Wolfe
0bf2a5ada0 Merge pull request #2566 from jaswilli/fix/issue-2563
Build correct path on image upload when config has custom content path
2014-04-07 15:31:28 +01:00
Hannah Wolfe
694c787ea3 Merge pull request #2552 from hschaeidt/master
in some cases the git protocol cannot be processed
2014-04-07 15:10:35 +01:00
John O'Nolan
639303e763 Merge pull request #2561 from t3chnoboy/master
Use SVG version of travis build status badge
2014-04-07 15:27:04 +02:00
Hannah Wolfe
bf44380dd7 Merge pull request #2564 from hswolff/ember-upgrade
Update Ember to 1.5.0 and Ember resolver and handlebars to 1.3.0
2014-04-07 14:19:40 +01:00
Jason Williams
e3056990cd Build correct path on image upload when config has custom content path
closes #2563
- build path relative to imagesPath (which contains the custom content path)
  instead of appRoot
- added test for custom content path
- added logic to tests for Windows url building to handle cases where Windows
  functionality is being tested on a unix operating system
2014-04-07 05:01:39 +00:00
Hannah Wolfe
68fe40442b Merge pull request #2545 from joeljfischer/minify-jquery
[WIP] Ghost footer outputs minified jquery
2014-04-06 23:15:48 +01:00
Hannah Wolfe
50c7d3597a Merge pull request #2532 from szelpe/ember-reset-2412
Created ResetController.
2014-04-06 23:08:48 +01:00
Hannah Wolfe
d4389c580d Merge pull request #2546 from hswolff/ember-modals
Creates Ember Modal infastructure
2014-04-06 22:36:47 +01:00
Harry Wolff
5be07d17b2 Update Ember to 1.5.0 and Ember resolver and handlebars to 1.3.0
no related issue
2014-04-06 15:57:49 -04:00
Hannah Wolfe
605d59304c Merge pull request #2558 from sebgie/build-fix
Remove second PUT request on image save
2014-04-06 20:43:12 +01:00
Hannah Wolfe
9e358fb922 Merge pull request #2517 from novaugust/theme_error
Fixed check for a theme's custom error.hbs
2014-04-06 19:22:29 +01:00
Harry Wolff
fa9bddb208 Creates Ember Modal infastructure
resolves #2416

This is a pretty large commit but what it's adding are pretty fundamental to the admin app.

- Creates top level actions on the ApplicationRoute for opening and closing modals.  This allows sending the 'openModal' action from any template to open a modal.

- Every modal template lives in 'templates/modals/{{modalName}}'

- Each modal can have a backing controller of the same name that can provide additional control for that modal.  Those controllers reside in 'controllers/modals/{{modalName}}'

- Created the ModalDialog component which is where all the logic for the component resides.  It's not at 100% parity with the existing Ghost modal system but it has the foundation for further fleshing out.  It currently accepts parameters for styling how the modal should appear, which previously was defined in JS files in the Backbone admin.

- This creates the 'delete all posts', 'delete this post', 'markdown', and 'upload' modal.  Some are in more stages of completion than others, but I wanted to just get the foundation in place as fast as possible.

- This also creates the UploadModal component which is a subclass of the ModalDialog component.  The reason for this subclassing is that the UploadModal component directly accesses the DOM and when that occurs in Ember it should remain in a component definition.  It's ready for extending to reach parity.  Note: depending on needs the base ModalDialog class may need to be modified.
2014-04-06 12:45:19 -04:00
Dmitry Mazuro
9aa25ad723 Use SVG version of travis build status badge 2014-04-06 19:45:13 +03:00
Sebastian Gierlinger
9ceb4a6ab4 Remove second PUT request on image save
closes #2557
- replaced model.save() with model.set()
2014-04-06 17:46:04 +02:00
Fabian Becker
c2e416fc9d Implement filter context
closes #2559
- Added a new unit test for context based filters
- Accept new parameter `context` in doFilter
2014-04-06 15:43:11 +00:00
Joel Fischer
758f844b8b Ghost footer outputs minified jquery in production
Closes #2524

- Added minifying jquery in grunt prod task

- Add test coverage for altered jquery
2014-04-06 08:42:25 -04:00
Hannah Wolfe
395d7fd3e2 Merge pull request #2516 from novaugust/last_login
Added populate last login time per #2515
2014-04-05 19:50:36 +01:00
Hannah Wolfe
e86bb50e7a Merge pull request #2450 from jaswilli/issue-2273
Add functional tests for admin navigation bar and menus
2014-04-05 18:57:31 +01:00
Hendrik Schaeidt
9a2543118e in some cases the git protocol cannot be processed (port blocking or other reasons) with https it should work for everyone 2014-04-04 18:21:39 +02:00
Hannah Wolfe
c38c778dbc Merge pull request #2500 from ErisDS/issue-2442
[WIP] Server start refactor, route tests use ghost app
2014-04-04 13:21:28 +01:00
Hannah Wolfe
e6abe9bab7 Server start refactor, route tests use ghost app
closes #2442, issue #2182

- Server start refactored - messaging is just messaging, deferred resolves the httpserver so that the connection can be closed
- Updated travis config to set node env
- Updated example config to be less travis-specific
- Route tests updated to use this new functionality
- Grunt test-routes simplified
2014-04-04 12:45:18 +01:00
Hannah Wolfe
6f724c558b Merge pull request #2386 from manuelmitasch/add-bowerrc 2014-04-03 09:44:02 +01:00
Manuel Mitasch
91df4a9e1f Adding .bowerrc
If no .bowerrc file is found in the current folder it seems to lookup if one exists in parent folders. Thus, we need to use .bowerrc in order to avoid problems.
2014-04-03 09:43:47 +01:00
Hannah Wolfe
95a3006549 Merge pull request #2541 from rjackson/simplify-nested-list-active-view
Refactor navbar to eliminate nested {{link-to}}.
2014-04-02 11:22:10 +01:00
Robert Jackson
3a912bd89e Refactor navbar to eliminate nested {{link-to}}.
no related issue

This is essentially setting up a binding from the `LinkView`'s `active`
status and whatever is set as `alternativeActive` in the `{{link-to}}`
(in our case the `activating-list-item` component.

Screenshots showing that the proper CSS classes are given:

![screenshot](http://monosnap.com/image/tzOH6n82rIVGNEFAUWVOLN52QuASQ4.png)

![screenshot](http://monosnap.com/image/5gmcwJcj0kgEXt8lnET4OKgIZ8KRpH.png)

![screenshot](http://monosnap.com/image/UCVNukTXLMNfVneLhzwVyhkrVlGSBt.png)
2014-04-01 22:36:16 -04:00
Hannah Wolfe
4afba3808b Update README & Contributing with details of stable branch 2014-04-01 00:22:04 +01:00
Peter Szel
dafda3907a Created ResetController.
closes #2412

- Updated the reset route to accept token parameter and hand it over to the controller.
- Added ResetController which handles the submit action and the button disabled state.
- Added reset action to the user model to handle ajax request.
- Updated reset template.
- Added fixtures to test reset API action.
- Fixed password variable names to camel cased style (e.g. newpassword -> newPassword).
2014-03-31 13:06:28 +02:00
Hannah Wolfe
397cd6c37c Merge pull request #2510 from szelpe/ember-forgotten-2411
Created ForgottenController
2014-03-31 10:37:06 +01:00
Szél Péter
303736c410 Created ForgottenController
closes #2411

- Added ForgottenController which handles the form submit event
- Modified the forgotten template
- Added Paths utility tool to get the root/subpath
- Added ajax fixture
2014-03-30 22:18:15 +02:00
Hannah Wolfe
878a2ba1ba Adding database to bug report template 2014-03-29 14:34:55 +00:00
Matt Enlow
345fe1a6d4 Fixed check for a theme's custom error.hbs:
Closes #2513
- Checks for property `error.hbs` on active theme
- Added unit test to ensure `error` view is rendered when activeTheme has
  a custom error template.
- Removed unused variable, `userErrorTemplatePath` from errorHandler
- Refactored errorHandler.`updateActiveTheme` to take one argument, the new active theme, and to then check if the active theme has an error.hbs
- Changed errorHandler unit test to use rewire for mocking config.
2014-03-29 08:19:51 -06:00
Hannah Wolfe
7e95b4d291 Merge pull request #2439 from sebgie/move-slug
Rename getSlug to slug
2014-03-28 17:12:55 +00:00
Hannah Wolfe
8ae55ff8cf Merge pull request #2519 from halfdan/tag-cache
Fixes tag cache test issues introduced in c6c4d5a8
2014-03-27 21:46:25 +00:00
Fabian Becker
4e664f0e1c Fixes tag cache test issues introduced in c6c4d5a8 2014-03-27 21:23:23 +01:00
Matt Enlow
f8d90f1cc6 Added populate last login time
closes #2515
- sets last_login when user is saved if user status changed to active
- added integration test in user Basic Operations
2014-03-27 12:29:43 -06:00
Hannah Wolfe
a458165cf0 Fixing showdown link to work without git 2014-03-26 18:33:17 +00:00
Hannah Wolfe
69d13b1e5a Version bump for 0.4.2 2014-03-26 14:01:56 +00:00
Hannah Wolfe
a737db4d7a Updating Ghost-UI to 0.1.3 2014-03-26 12:47:53 +00:00
Hannah Wolfe
c6c4d5a8a8 Cache invalidation for tag pages 2014-03-26 12:45:54 +00:00
Hannah Wolfe
13f9bffd98 Merge pull request #2508 from ErisDS/issue-2507
Error handling for require-tree
2014-03-26 07:54:54 +00:00
Hannah Wolfe
31fa3bab3a Error handling for require-tree
fixes #2507

- ideally we would create an apps directory if one isn't present, but we can deal with that in later versions
2014-03-25 22:38:48 +00:00
Hannah Wolfe
d50d3cd232 Bump version to 0.4.2-rc2 2014-03-25 13:40:49 +00:00
Hannah Wolfe
2f097ce906 Merge pull request #2498 from sebgie/duplicate-tags
Deduplicate upper-/lowercase tags for posts
2014-03-25 13:30:44 +00:00
Hannah Wolfe
678d8c8a9f Merge pull request #2502 from ErisDS/issue-2460
Ensure generateSlug gets transaction for tags
2014-03-25 12:08:20 +00:00
Hannah Wolfe
438cbab68e Ensure generateSlug gets transaction for tags
fixes #2460

- add transacting to tag saving
- add same to users while we're here
2014-03-25 11:14:17 +00:00
Hannah Wolfe
2af5e7260a Merge pull request #2481 from hswolff/ember-settings-user-updates
Create SettingsUserController
2014-03-24 20:21:21 +00:00
Hannah Wolfe
3ee6987aa9 Merge pull request #2496 from halfdan/more-tag-fuddling
Escape regex special characters in tag finder
2014-03-24 20:20:51 +00:00