Commit Graph

2096 Commits

Author SHA1 Message Date
Hannah Wolfe
381b03ab96 Merge pull request #2589 from jaswilli/userprofile
Set input field types to match expected input values
2014-04-14 20:56:50 +01:00
Jason Williams
d3237488ca Set input field types to match expected input values
ref #2588
- Change name field in User Profile to be type text
- Change website field in User Profile to be type url
2014-04-14 16:18:17 +00:00
Hannah Wolfe
0806c3188e Merge pull request #2586 from jaswilli/issue-2273
Added functional tests for admin content screen
2014-04-13 16:09:10 +01:00
Jason Williams
7f8bc50ea8 Added functional tests for admin content screen
issue #2273
- test draft/page/published label
- test green add new post button
- test status and author in preview header
- test edit post button
- test delete modal
2014-04-12 20:56:53 +00:00
Hannah Wolfe
9560b6a526 Merge pull request #2578 from schneidmaster/fix-1702
Ensure libraries are present when running phantom.js test
2014-04-11 10:14:29 +01:00
Zach Schneider
58bc5cba63 Fix issues with bower assets in tests
- Ensure that there are no spaces in path so `bower install` succeeds
- Ensure that shell:bower is executed before tests are run

Fixes #1702
2014-04-10 16:45:28 -04:00
Hannah Wolfe
37d13d3fbc Merge pull request #2574 from LazyChild/issue-2573
OSX shortcut fix.
2014-04-09 15:25:53 +01:00
Renyu Liu
0fbe42d593 OSX shortcut fix.
closes #2573
- separate different shortcuts by OS detection in markdownEditor.js
2014-04-09 09:31:38 +08:00
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
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
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
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
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
4afba3808b Update README & Contributing with details of stable branch 2014-04-01 00:22:04 +01: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
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
Hannah Wolfe
1fbe4d0be7 Merge pull request #2497 from sebgie/issue#2492
Fix delete button
2014-03-24 18:47:25 +00:00
Sebastian Gierlinger
a3aba2d504 Deduplicate upper-/lowercase tags for posts
server side check for #2478
- added check for duplicate tags in post model
2014-03-24 19:08:06 +01:00
Hannah Wolfe
41d127d5b1 Merge pull request #2489 from ErisDS/user-msgs
Update some server side errors/warnings
2014-03-24 17:58:11 +00:00
Hannah Wolfe
eb35771bd3 Merge pull request #2495 from halfdan/2478-tag-duplicate
Prevent adding duplicate tags with different casing
2014-03-24 17:50:52 +00:00