OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,965 Commits 179 Branches 1,654 Tags 486 MiB
47bfd046bb
Commit Graph

1965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Mitasch
47bfd046bb Add admin prototype 
issue #2270

- from https://github.com/manuelmitasch/ghost-admin-ember-demo
- Not working properly: added ic-ajax mock in app.js but promise not resolving => loading route always active
 2014-03-07 14:01:26 +00:00
Hannah Wolfe
4be10448a0 Adding missing loader.js 2014-03-07 10:14:40 +00:00
Hannah Wolfe
31f41822e0 Merge branch 'master' into ember 
Conflicts:
	.gitignore
	Gruntfile.js
	bower.json
	core/client/assets/lib/showdown/extensions/ghostdown.js
	core/client/assets/vendor/showdown/extensions/ghostdown.js
	core/client/router.js
	core/clientold/assets/vendor/chart.min.js
	core/clientold/assets/vendor/codemirror/addon/mode/overlay.js
	core/clientold/assets/vendor/codemirror/codemirror.js
	core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js
	core/clientold/assets/vendor/codemirror/mode/gfm/index.html
	core/clientold/assets/vendor/codemirror/mode/gfm/test.js
	core/clientold/assets/vendor/codemirror/mode/markdown/index.html
	core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js
	core/clientold/assets/vendor/codemirror/mode/markdown/test.js
	core/clientold/assets/vendor/countable.js
	core/clientold/assets/vendor/fastclick.js
	core/clientold/assets/vendor/icheck/jquery.icheck.min.js
	core/clientold/assets/vendor/jquery.hammer.min.js
	core/clientold/assets/vendor/nprogress.js
	core/clientold/assets/vendor/packery.pkgd.min.js
	core/clientold/assets/vendor/showdown/extensions/ghostdown.js
	core/clientold/assets/vendor/showdown/showdown.js
	core/clientold/assets/vendor/validator-client.js
	core/test/unit/client_ghostdown_spec.js
	core/test/unit/client_showdown_int_spec.js
 2014-03-05 23:10:44 +00: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
Fabian Becker
cd74b0e232 Switch to bower for client assets. 
fixes #2272
- Remove libraries from shared/vendor
- Remove libraries from client/assets/vendor
- Add bower to package.json and postinstall
- Add bower.json with dependencies
- Add scripts from bower_components to concat/uglify
- Fix tests
- Serve jquery from /ghost/built/theme/
 2014-03-04 20:09:26 +00:00
Hannah Wolfe
c3865dbb9c Merge pull request #2278 from halfdan/jshint-es6 
Replace JSLint with JSHint.
 2014-03-04 19:26:15 +00:00
Fabian Becker
1a9e91f120 Replace JSLint with JSHint. 
closes #2277
- Added ES6 linting to core/client/
- Fix typeof array comparison
 2014-03-04 15:47:39 +00:00
Fabian Becker
f6021210c6 Add test for tag.hbs template. 
refs #2321
 2014-03-04 13:06:22 +00:00
Hannah Wolfe
c4bf3052e1 Merge pull request #2292 from jgable/requireTree 
Refactor require-tree to not share messages and export parsePackageJson
 2014-03-04 12:20:32 +00:00
Hannah Wolfe
13fa84a8bf Merge pull request #2317 from shashankmehta/settings-rendering-issue 
Prevent settings page from rendering same page twice
 2014-03-04 12:06:25 +00:00
Hannah Wolfe
a11acff4fd Merge pull request #2329 from stenehall/master 
Fix for #2328 - Added check for tag for title
 2014-03-04 12:02:09 +00:00
Johan Stenehall
825ba4fb82 Use tag as title on tag pages 
closes #2328
- added check for tag in coreHelpers.meta_title and use if set
- added test for correct title on tag pages

Rewritting to tag - blogtitle based on comments from PR
 2014-03-04 11:52:27 +01:00
polygonix
97daa2bdec Detect tag.hbs template in themes 
closes #2320
- changed detection from "tag" to "tag.hbs" in "frontend.js" contrroller
 2014-03-03 16:41:37 +11:00
Shashank Mehta
a92c8085c5 Shifts app UI behind config option 
Closes #2287
- adds helper for checking whether to show apps UI or not
- hides app UI from settings page
 2014-03-03 02:52:30 +05:30
Shashank Mehta
ab2656960a Prevent settings page from rendering same page twice 
Closes #2316
- There was a check to prevent rerendering of same content pane but it wasn't working
- Fixed the check for this
 2014-03-03 02:30:09 +05:30
Hannah Wolfe
383da31484 Merge pull request #2311 from stenehall/master 
Fixing typo in allowedSections for allowed pages under settings
 2014-03-02 17:26:16 +00:00
Johan Stenehall
be8b9cf092 Fixing typo in allowedSections for allowed pages under settings 2014-03-02 12:46:03 +01:00
Hannah Wolfe
b84c8a4726 Merge pull request #2297 from javorszky/iss2296 
Update link to clean up history in contributing.md
 2014-03-01 10:17:47 +00:00
Hannah Wolfe
055237b8f2 Merge pull request #2295 from seanhellwig/issue2290 
Add plugin icons to Apps menu item in Ghost settings
 2014-03-01 10:11:42 +00:00
Sean Hellwig
561ea0edbb Add plugin icons to Apps menu item in Ghost settings 
closes #2290
- added css entry in settings.scss for to display plugin icon for apps menu item
- remove unused css entry for .plugins in settings.scss
 2014-03-01 01:13:19 -08:00
Gabor Javorszky
b461cc6138 Update link to clean up history in contributing.md 
Fixes #2296
Also replaces line endings, not sure why (tried with all the settings,
git would just not have it)
 2014-03-01 08:57:14 +00:00
Hannah Wolfe
708ba6f8b0 Merge pull request #2220 from sebgie/issue#1401 
Add validation from schema.js
 2014-02-28 23:04:04 +00:00
Hannah Wolfe
35ad5e6e5e Merge pull request #2280 from sebgie/api-cleanup 2014-02-28 22:50:59 +00:00
Sebastian Gierlinger
7155d95f9d Add JSON API tests & cleanup 
first 10 % of #2124
- added initial version of JSON API tests
- renamed error.errorCode to error.code
- renamed tags.all to tags.browse for consistency
 2014-02-28 22:26:03 +00:00
Hannah Wolfe
d996ff68e7 Merge pull request #2284 from sebgie/issue#1654 
Remove res.redirect from db.exportContent
 2014-02-28 21:30:58 +00:00
Hannah Wolfe
028d396185 Merge pull request #2266 from sebgie/issue#2244 
Fix problems from importing 0.4.0 file
 2014-02-28 21:20:42 +00:00
Jacob Gable
b4ea8bed61 Refactor require-tree to not share messages 
- Pass in messages to each method so they are not shared
- Export each method for calling individually
- Update reference to default export of require-tree
- Add default values for messages if not passed in
 2014-02-28 14:13:45 -06:00
Hannah Wolfe
ea7385abbc Merge pull request #2243 from hswolff/custom-page-templates 
Custom Page Templates
 2014-02-28 19:58:35 +00:00
Hannah Wolfe
daaf7a0e50 Merge pull request #2281 from taras/ember 
Merged into ember and added directory structure
 2014-02-28 19:28:24 +00:00
Hannah Wolfe
9fc0116dd8 Merge pull request #2247 from javorszky/iss2083 2014-02-28 14:15:59 +00:00
Gabor Javorszky
667888aeb3 Implements Initial lifecycle and App UI start 
Closes #2083

* Added hbs template for apps listing
* Added settings to read the activeApps
* Added viewcontrol to activate / deactivate apps
* Added API handler to store activeApps (by `name` in the `package.json` file)
* On button click it turns the button into "Working" and changes class to `button` (grey one)
* On success, rerenders the pane, adds success notification about apps being saved
* On error, rerenders the pane, adds error notification with error message

Missing:
* tests: couldn't figure out how to add mock apps with mock package.json data
* actually registering, etc, re #2140
* icon from the sidebar
 2014-02-28 14:06:36 +00:00
Hannah Wolfe
c64148f361 Merge pull request #2256 from caerphoto/1795-typography 
Add support for typographically-correct punctuation
 2014-02-28 10:49:06 +00:00
Andy
b49f10c33d Add support for typographically-correct punctuation 
Closes #1795
- Added typography.js Showdown extension
- Updated RSS test to support new typographic quotes
 2014-02-28 09:44:08 +00:00
Hannah Wolfe
36102d4f9f Merge pull request #2246 from knunery/issue#1432 
Fixes client side bio character counter.
 2014-02-27 16:02:13 +00:00
Hannah Wolfe
895180fbf0 Merge pull request #2252 from jondavidjohn/from-address-default 
Change fallback from address to webmaster@[blog.url]
 2014-02-27 15:56:46 +00:00
Sebastian Gierlinger
67611045e7 Remove res.redirect from db.exportContent 
closes #1654
- added frontend route /ghost/export/
- removed request handling from API
 2014-02-27 16:48:38 +01:00
Taras Mankovski
da396bd89c Added directory structure 2014-02-27 07:20:30 -05:00
Hannah Wolfe
5524787509 Merge pull request #2153 from halfdan/2115-has-block-helper 2014-02-27 11:37:01 +00:00