Commit Graph

4334 Commits

Author SHA1 Message Date
Hannah Wolfe
edc98602d3 Merge pull request #4724 from jaswilli/http-api
Fix up HTTP API handler
2014-12-29 18:39:26 +00:00
John O'Nolan
e62ce6c5cb Removed double link, moved contributing ref.
- Contributing ref link was being gratuitously double-linked to, nixed that.
- Changed grammar which is ambiguous between US/UK colloquialism.
- Moved contributing/troubleshooting reference to "installing from git" heading rather than "quickstart" subheading
- Standardised 2-linebreaks between Markdown headings
2014-12-29 17:48:06 +02:00
Jason Williams
3a29393163 Revert punctuation change in README.md 2014-12-29 09:41:17 -06:00
Jason Williams
344f383dda Update README.md 2014-12-29 09:31:13 -06:00
Jason Williams
3725b5e738 Merge pull request #4730 from sdtsui/patch-1
readme.md edit
2014-12-29 09:28:16 -06:00
Daniel Tsui
8e833cb024 readme.md edit
-missing comma
-use of "a" preceding an acronym with phonetic vowel
2014-12-29 03:21:52 -08:00
Jason Williams
b0a16d3e70 Merge pull request #4728 from rwjblue/remove-unused-view
Remove PostSettingsMenuView.
2014-12-28 21:31:46 -06:00
Robert Jackson
eb2d940e11
Remove PostSettingsMenuView.
It seems that the properties this sets up (`datePlaceholder` and
`publishedAt`) are unused throughout the project.
2014-12-28 22:14:02 -05:00
Jason Williams
c3630f5255 Merge pull request #4727 from rwjblue/fix-template-html
Fix invalid HTML in templates.
2014-12-28 17:18:31 -06:00
Robert Jackson
fc18a38215
Fix invalid HTML in templates.
HTMLBars (coming soon in Ember 1.10) validatest templates during
compilation. This PR fixes errors identified.
2014-12-28 18:01:05 -05:00
Hannah Wolfe
75e081dbf0 Merge pull request #4721 from jaswilli/adapters
Make embedded-relation-adapter the default
2014-12-28 15:53:59 +00:00
Jason Williams
f6736049c3 Fix up HTTP API handler
No Issue
- Add Location header for tags.
- Ensure Location header has trailing slash.
- Remove unnecessary promises/async.
2014-12-28 05:27:29 +00:00
Jason Williams
3f3544a3bb Make embedded-relation-adapter the default
No Issue
- Generalize embedded-relation-adapter so it can be used for both fetching
  and saving records.
- Change Adapter inheritance hierarchy to
  RESTAdapter => BaseAdapter => EmbeddedRelationAdapter. ApplicationAdapter
  now extends EmbeddedRelationAdapter.
- Cleanup or remove adapters that existed just to extend directly
  from EmbeddedRelationAdapter.
2014-12-28 00:28:36 +00:00
Hannah Wolfe
5b23a3d957 Merge pull request #4720 from jaswilli/modal-error
Use an explicit action name in action helper
2014-12-27 19:13:53 +00:00
Hannah Wolfe
cce0d72870 Merge pull request #4716 from jaswilli/deps
Update dependencies
2014-12-26 17:17:38 +00:00
Jason Williams
07bf54224a Merge pull request #4666 from felixrieseberg/iss4651
Trigger Change Event before Login
2014-12-26 11:13:18 -06:00
Jason Williams
26b7102451 Use an explicit action name in action helper
No Issue
- Clicking on the body of a modal dialog causes an
  unhandled exception in the console.  Add an explicit
  action name to the helper.
2014-12-26 16:01:50 +00:00
Hannah Wolfe
4c218c29ca Merge pull request #4717 from jaswilli/about-task
Fail buildAboutPage task on error
2014-12-26 11:42:55 +00:00
Hannah Wolfe
555bf97a9d Merge pull request #4718 from jaswilli/about-tests
Adjust about page tests
2014-12-26 11:42:29 +00:00
Jason Williams
730e7ebcfa Adjust about page tests
No Issue
- Wait for list item element to appear before starting tests
  to make sure template partial has been rendered.
- Remove test for 20 list items as it's possible that there
  could be fewer than 20 contributors for during the window.
  Instead just test to make sure the list has at least one item.
2014-12-25 17:35:11 +00:00
Jason Williams
8af41b8aee Fail buildAboutPage task on error
No Issue
- If buildAboutPage encounters a problem, fail the task so
  the entire test suite doesn't run only to fail because the
  template partial is missing.
- Cleaned up task.
2014-12-25 16:50:52 +00:00
Jason Williams
ddaf19c5c5 Merge pull request #4715 from ErisDS/test-task
grunt test task - easily run single test files
2014-12-25 08:42:21 -06:00
Jason Williams
d59f873aec Update dependencies
No Issue
- bluebird@2.4.2
- body-parser@1.10.0
- busboy@0.2.9
- connect-slashes@1.3.0 (remove base path option which is no
  longer needed)
- fs-extra@0.13.0
- glob@0.4.2
- passport@0.2.1
- passport-oauth2-client-password@0.1.2
- grunt-jscs@1.1.0
2014-12-25 00:22:45 +00:00
Jason Williams
2c66430dba Merge pull request #4690 from ErisDS/image-importer
Add support for importing images
2014-12-24 17:08:13 -06:00
Hannah Wolfe
13caeaa65e grunt test task - easily run single test files
no issue
- adds a new grunt test task, which takes a file option representing the path to the test file you want to run
E.g. grunt test --file=unit/config_spec.js OR grunt test --file=integration/import_spec.js
- can run any unit, integration or route task
- can easily be expanded to handle running other tests in future
2014-12-24 13:51:16 +00:00
Hannah Wolfe
98087f0244 Merge pull request #4708 from cobbspur/editors
Fixes navigation for Editors on small screen
2014-12-24 13:03:46 +00:00
Hannah Wolfe
97614940a7 Merge pull request #4712 from JohnONolan/fix-backbutton 2014-12-23 20:04:10 +00:00
John O'Nolan
c01b32c74f Fix settings back button implementation 2014-12-23 20:02:55 +00:00
Paul Davis
a8b30209be Merge pull request #4711 from JohnONolan/fix-tagmgmt
Fix tag mgmt display bugs
2014-12-23 12:22:54 +00:00
John O'Nolan
f3c6427b52 Merge pull request #4710 from PaulAdamDavis/modal-styling
Fix modal edge spacing
2014-12-23 14:15:54 +02:00
John O'Nolan
06b4b377a6 Fix tag mgmt display bugs
- Misaligned header due to back button being in the wrong place in the markup
- Corrected padding on tag delete button
- Updated tag settings input labels for consistency
2014-12-23 14:10:21 +02:00
Paul Adam Davis
7200b5ec40 Fix modal edge spacing
No issue

The transparent border surrounding modals was being cut off.
This fix uses padding instead of adjusting the left & right valued to create space.
2014-12-23 12:05:18 +00:00
cobbspur
050491a9d3 Fixes navigation for Editors on small screen
closes #4707

- Changes Back-link on settings users page to content for editors
2014-12-23 10:35:49 +00:00
Hannah Wolfe
d620f3a0d2 Merge pull request #4699 from jaswilli/issue-4683
Finish tag post count UI.  Misc tag related fixes
2014-12-22 20:15:25 +00:00
Jason Williams
fb2c5401a8 Merge pull request #4704 from cobbspur/tagsbutton
Fix back button on tag UI page
2014-12-22 12:07:48 -06:00
cobbspur
c98ee001be Fix back button on tag UI page
closes #4703

- previous link used absolute url which fails for subdirectories
2014-12-22 16:50:09 +00:00
Hannah Wolfe
a54b5c4af1 Merge pull request #4698 from jaswilli/tag-dup-slugs
Run tag add operations in sequence
2014-12-22 10:00:05 +00:00
Hannah Wolfe
7f4539e67e Merge pull request #4693 from cobbspur/metatags
Updated meta helpers to use tag meta data if present
2014-12-22 09:56:11 +00:00
Jason Williams
7176097e9d Finish tag post count UI. Misc tag related fixes
Issue #4683
- Finish setting up pagination in tag management page.
- Add post count warning to delete tag modal.  Fix styling.
- Make sure tag input menu is loading all tags.
- Only include saved tags in tag input suggestion list.
- Unload tag records from store when entering tag route so that
  we get accurate post count.
- Add a resetPagination action to pagination-controller-mixin for
  cases where we want to start fresh.
- Include tag.id when sending tag payload to API.
2014-12-22 02:17:18 +00:00
Jason Williams
15ebc5d5dc Merge pull request #4689 from ekulabuhov/4683_TagPostCountUI
Updated tag management UI with the post counts
2014-12-21 19:19:56 -06:00
Jason Williams
633cf1385a Run tag add operations in sequence
Closes #4697
- Run tag add operations in sequence instead of in parallel
  since generateSlug will hand out duplicate slugs until one of
  them is committed to the database.
- Add test.
- Misc cleanup of method parameter names and jshint hints.
2014-12-22 00:41:10 +00:00
Eugene Kulabuhov
f1da5f86b6 Updated tag management UI with the post counts
closes #4683
- added post count to 'delete tag' modal
- fixed lint errors
- preventing extra data to be sent to server
- adjustments suggested by @jaswilli
2014-12-22 00:26:52 +00:00
Jason Williams
a4bcc0220e Merge pull request #4696 from PaulAdamDavis/paginated-users-scroll
Fix broken user list paginated scrolling
2014-12-21 17:16:59 -06:00
Paul Adam Davis
a3e36fca8d Fix broken user list paginated scrolling
Closes #4695

- Adds a new class to the template and minor CSS to allow user list scroll events to work
2014-12-21 23:03:39 +00:00
cobbspur
32059812a9 Updated meta helpers to use tag meta data if present
No issue

- Tag Meta title and description override default response
- Tag Meta title present on all pages
- Tag Meta description available only on first page
 - Updates tests
2014-12-21 11:39:49 +00:00
Hannah Wolfe
ba3d4b3689 Add support for importing images
closes #4608, #4609

- image handler loads in any image files & figures out where they'll get stored
- image importer has a preprocessor which replaces image paths in
  pertinent spots of post, tag and user models
- image importer stores images, keeping the path where it makes sense
- basic test for the preprocessor
2014-12-21 01:58:35 +00:00
Jason Williams
b00279885f Merge pull request #4688 from ErisDS/migrate-test
Add tests to verify db version hasn't changed
2014-12-20 11:59:57 -06:00
Hannah Wolfe
48ac142c54 Merge pull request #4546 from PaulAdamDavis/url-preview-comp
Add a URL preview componant
2014-12-20 15:26:59 +00:00
Hannah Wolfe
7cdfd95098 Merge pull request #4686 from jaswilli/tag-api-post-count
Finish up post count support in tags API
2014-12-20 11:39:29 +00:00
Hannah Wolfe
c855198ace Add tests to verify db version hasn't changed
issue #4479

- these tests will need updating if ever the db schema (not inc validations), permissions fixtures or db
version ever changes
- the intention is that it is no longer possible to accidentally change permissions or the db schema without
knowing you need to update the db version and the values in this test file
2014-12-20 10:24:20 +00:00