Commit Graph

1991 Commits

Author SHA1 Message Date
mattse
9ae0ddf54c Fixes race conditions in functional test introduced in PR#2395
fixes PR#2395
- in editor_test.js line 272, I wait until the post settings menu appears, and THEN also wait until the delete post button appears, rather than just waiting for the first condition, this can result in a race condition which has been seen.
- in editor_test.js line 229, I click on the tag, then wait until it disappears, rather than asserting the tag doesn't exist immediately.  This could potentially result in a race condition, but I have not seen it yet.
- in editr_test.js line 315, I click on the delete post button, and now wait for the modal container to appear before clicking the accept button.  This could result in a race condition, but I have not seen it yet.
2014-03-17 03:06:22 -04:00
Hannah Wolfe
a65d5bb282 Merge pull request #2407 from JohnONolan/no-bowerrc
Remove .bowerrc
2014-03-16 09:56:55 +00:00
John O'Nolan
deb6da5ed6 Remove .bowerrc
If there are no further comments or suggestions for #2386 then I think it would be good to get this in. Remove .bowerrc from base repo but allows it to still be used for people with specialised dev environments by adding to .gitignore
2014-03-16 09:06:56 +01:00
John O'Nolan
91ad372c36 Merge pull request #2402 from halfdan/watch-ghost-ui
Watch changes in Ghost-UI
2014-03-15 18:15:46 +01:00
Fabian Becker
c612ca2136 Watch changes in Ghost-UI
refs TryGhost/Ghost-UI#18
- Add bower_components/ghost-ui to grunt watch
2014-03-15 17:49:43 +01:00
Hannah Wolfe
2d4c6647b2 Merge pull request #2401 from JohnONolan/fix-modal
Get rid of old modal types
2014-03-15 16:16:17 +00:00
John O'Nolan
18be7a8999 Get rid of old modal types
Fixes TryGhost/Ghost-UI/issues/17
2014-03-15 17:12:49 +01:00
Hannah Wolfe
4907265019 Merge pull request #2394 from JohnONolan/ios-lol
Moar iOS mobile friendly fandango
2014-03-14 11:48:56 +00:00
Hannah Wolfe
caa729e86a Merge pull request #2395 from mattse/mattse#2273
Added functional tests for editor: tag editor, image uploads, post settings
2014-03-14 11:48:37 +00:00
Hannah Wolfe
7f1721d8f0 Merge pull request #2392 from mattse/issue#2273
Added functional test for uploading image/cover in settings
2014-03-14 11:47:51 +00:00
mattse
1d5a8ce718 Added functional tests for editor: tag editor, image uploads, post settings
references #2273
- test tag creation and tag deletion
- tests image uploader appears after typing `![]()` in editor
- tests image URL matches url inside `![](url)`
- tests all input elements of post settings menu
2014-03-14 03:11:26 -04:00
John O'Nolan
8ea0b8a5d1 Moar iOS mobile friendly fandango
* Minimalise up in this what http://visuellegedanken.de/2014-03-13/viewport-meta-tag-minimal-ui/
* Webapp capable all over the hello
* Consistent self-closing meta tags and shit

This needs to be merged into the ember branch. Probably.
2014-03-13 23:47:46 +01:00
John O'Nolan
b605f8b75a Update copyright 2014-03-13 22:43:05 +01:00
Hannah Wolfe
33c2b62bb6 Merge pull request #2393 from robgraeber/copyright-year
Updating copyright range
2014-03-13 21:36:30 +00:00
Hannah Wolfe
60e316581a Merge pull request #2370 from halfdan/2062-robots
Serve default robots.txt
2014-03-13 21:30:04 +00:00
Hannah Wolfe
d463b34ef5 Merge pull request #2341 from stenehall/tag_based_rss_feeds
Rss support for tags
2014-03-13 21:16:10 +00:00
Fabian Becker
c3417fe090 Serve default robots.txt
closes #2062
- Server robots.txt from theme if available
- Serve default robots.txt from /core/shared/ otherwise
- Added tests for default robots.txt
2014-03-13 21:31:41 +01:00
Rob Graeber
959c018fab Updating copyright range
Updating the copyright year to be a range. :-)
Otherwise the license wouldn't explicit cover the older versions you've made.
2014-03-13 09:46:24 -07:00
Johan Stenehall
4556e1df0a Rss support for tags
closes #2260
- added routes for /tag/:slug/rss and /tag/:slug/rss/:page
- added support for tag in the rss controller
- added route tests for each extra case
- fixing a tiny typo in some test descriptions
2014-03-13 00:12:41 +01:00
mattse
36d38e5c81 Added functional test for uploading image/cover in settings
references #2273
- added a test that clicks on both upload (image/cover) buttons and tests the same testing function on them since both modals are exactly the same
- the testing function checks for the '.js-drop-zone.image-uploader' selector, then clicks accept, and tests that a blank success notification appears
- shifted the test email test validation upwards so the ordering of tests matches the ordering of the UI elements
2014-03-12 17:41:59 -04:00
Hannah Wolfe
a806f3e097 Updating ghost-ui 2014-03-12 21:29:36 +00:00
Hannah Wolfe
94f54fe997 Merge pull request #2386 from manuelmitasch/add-bowerrc
Adding .bowerrc
2014-03-11 16:14:33 +00:00
Hannah Wolfe
41dc833f19 Merge pull request #2225 from hswolff/ghost-startup
Add promise to ghost startup process to allow
2014-03-11 15:52:06 +00:00
Manuel Mitasch
373c798b8d 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-03-11 16:50:29 +01:00
Harry Wolff
3e21940b18 Add promise to ghost startup process to allow
hooking into when ghost has finished loading

addresses item 9 in #2078
and makes progress on #2182

- has files that startup ghost return a promise
 that is resolved once ghost has finished loading
- moves getSocket into config file
- removes models.reset() as it's not used anywhere
- update functions in server startup
- remove unused version hash variable
2014-03-11 11:41:45 -04:00
Hannah Wolfe
6ec57d3173 Merge pull request #2318 from knunery/fix-2313
Blog post titles will now be properly escaped in rss (xml) feeds.
2014-03-11 15:12:53 +00:00
Hannah Wolfe
0916a96dee Merge pull request #2383 from JohnONolan/clean-markdowntips
Clean up markdown help modal
2014-03-10 22:41:23 +00:00
Kyle Nunery
c917c0f0eb Blog post titles will now be properly escaped in rss (xml) feeds (reopens #715)
Closes #2313
2014-03-10 11:45:34 -04:00
John O'Nolan
dd2a1dd639 Clean up markdown help modal
* Shorter, more user friendly.
* See #1463 - Not fixing in any way, just related.
2014-03-10 16:33:46 +01:00
Hannah Wolfe
c1ba89c120 Bower dependency cleanup
issue #2272

- handlebars version should match node (1.3.0)
- iCheck isn't used
2014-03-10 06:15:30 +00:00
Hannah Wolfe
c4d4f66a38 Cleanup more sass/ruby things 2014-03-09 22:19:59 +00:00
Hannah Wolfe
93f411cd55 Merge pull request #2369 from halfdan/bower_all_the_things
Replace SASS with assets from Ghost-UI
2014-03-09 21:59:54 +00:00
Fabian Becker
921ceb7be7 Replace SASS with assets from Ghost-UI
closes #2368
- Remove Ruby dependency (Gemfiles)
- Remove sass/fonts from core/client/assets/
- Add copy task to Gruntfile to copy over ghost-ui assets
- Install Ghost-UI via bower
- Changed .npmignore/.gitignore
- Remove grunt-contrib-sass dependency
- Remove mentions of Ruby in CONTRIBUTING.md
2014-03-09 22:50:37 +01:00
Hannah Wolfe
c356bbd075 Merge pull request #2342 from dsschnau/nocache404
Nocache404
2014-03-07 12:51:54 +00:00
Dan Schnau
b13db3a9d2 Do not cache 404 pages
closes #2334

- remove call to set cache-control in 404 response header
- update unit tests to expect this

Fix up unit tests
2014-03-06 20:06:07 -05:00
Hannah Wolfe
5473df191a Merge pull request #2345 from JohnONolan/emailfrom
Update system emails to come from ghost@blog.url
2014-03-06 21:40:36 +00:00
John O'Nolan
161afbf3c4 Update system emails to come from ghost@blog.url
Closes #2145
2014-03-06 12:03:00 +01:00
Hannah Wolfe
75caeb9341 Bower dependency order OCD 2014-03-05 20:55:11 +00:00
Hannah Wolfe
2c524c1d8e Merge pull request #2321 from polygonix/2320-detect-tag-hbs 2014-03-05 19:49:29 +00:00
Hannah Wolfe
8bfc37bd8e Fixing CodeMirror paths in GruntFile.js 2014-03-05 19:46:43 +00:00
Hannah Wolfe
6189864a22 Merge pull request #2307 from Gudahtt/static-page-validation
Change validation for posts 'page' attribute
2014-03-05 18:35:00 +00:00
Hannah Wolfe
7feafb4c5d Merge pull request #2335 from halfdan/bower-maeh
Remove unused libraries.
2014-03-05 12:28:03 +00:00
Fabian Becker
e5ead739a1 Remove unused libraries.
refs #2326
- Remove unused libraries from core/client/assets/vendor/
- Add folder to .gitignore
- bower install is now handled by grunt init
2014-03-05 10:20:56 +00:00
Polygonix
75ec29197b Merge pull request #1 from halfdan/add-test-tag
Add test for tag.hbs template.
2014-03-05 11:57:14 +11:00
Mark Stacey
65b0968f40 Change validation for posts 'page' attribute.
issue #2305
- changed validation for 'page' to expect '0' or '1', rather than 'true' or
  'false'
- Added a 'can change a post to static page' test
- Added a 'can change a static page to a post' test
2014-03-04 17:59:00 -03:30
Hannah Wolfe
6deb7616cf Merge pull request #2286 from jondavidjohn/validator-upgrade
Update validator to 3.4.0
2014-03-04 21:27:23 +00:00
Jonathan Johnson
e4bb6d08cc Update validator to 3.4.0
Closes #1379

- Convert to new api usage for both server-side and client-side
- Provide way require a negative response for boolean methods in
  default-settings.json
- Add field validation functional tests
  - Settings (General)
    - Title length validation
    - Description length validation
    - postsPerPage, numeric, min, max
  - Settings (User)
    - Bio Length validation
    - Location length validation
    - Url validation
  - Login
    - Email validation
  - Editor
    - Title required validation
2014-03-04 13:54:24 -07:00
Hannah Wolfe
8d3a54527b jsHint fixes
issue #2294

- bad merge order = broken tests
2014-03-04 20:32:04 +00:00
Hannah Wolfe
585ea121a4 Merge pull request #2294 from shashankmehta/apps-config
Shifts app UI behind config option
2014-03-04 20:21:13 +00:00
Hannah Wolfe
3dbf51e9a5 Merge pull request #2326 from halfdan/bower
Switch to bower for client assets.
2014-03-04 20:19:14 +00:00