2064 Commits

Author SHA1 Message Date
Graham Campbell
ade85e24bd Merge branch '1.2' 2015-08-08 17:38:28 +01:00
Graham Campbell
324f8703ce Removed old docker files 2015-08-08 17:38:09 +01:00
Graham Campbell
9df14837b9 Updated phpunit 2015-08-08 17:37:25 +01:00
James Brooks
e3a3f97957 Condensed the readme further 2015-08-08 17:31:44 +01:00
James Brooks
fbfa62d087 Show y axis labels in metrics. Closes #824 2015-08-08 17:31:18 +01:00
James Brooks
88efff58cc Remove unused assignment 2015-08-08 17:17:05 +01:00
James Brooks
82a9dc9a4e Fix typo 2015-08-08 17:16:31 +01:00
James Brooks
4f0383b62b Condensed the readme further 2015-08-08 17:12:31 +01:00
James Brooks
73c80992ae Merge pull request #892 from cachethq/component-group-api
Component Group API
2015-08-08 15:37:49 +01:00
James Brooks
4b3ec45b03 Added component groups API. Closes #801 2015-08-08 15:36:48 +01:00
James Brooks
0a682a00f7 Show y axis labels in metrics. Closes #824 2015-08-08 14:56:05 +01:00
James Brooks
1c7fb1a434 Merge pull request #887 from cachethq/api-request-sort
Added the ability to sort and order API results
2015-08-08 12:58:11 +01:00
Graham Campbell
fcf0cd675a Merge branch '1.2' 2015-08-07 12:15:31 +01:00
Graham Campbell
02f069cdc1 Backport all readme changes 2015-08-07 12:14:38 +01:00
James Brooks
1779ac40c9 Added the ability to sort and order API results. Closes #756 2015-08-07 12:08:25 +01:00
Graham Campbell
32de1d512b Merge branch '1.2'
Conflicts:
	Dockerfile
	composer.lock
2015-08-07 12:07:46 +01:00
Graham Campbell
e8d3c013a1 Merge pull request #883 from cachethq/removals
Remove docker/homestead/vagrant stuff
2015-08-07 12:04:48 +01:00
Graham Campbell
85efb7d114 Updated lock file 2015-08-07 11:59:42 +01:00
Graham Campbell
11d77328dc Remove docker/homestead/vagrant stuff 2015-08-07 11:59:37 +01:00
Graham Campbell
c05e9d9867 Updated phpunit 2015-08-07 11:56:15 +01:00
Graham Campbell
b1eb57e573 Merge pull request #877 from cachethq/core-package
Added GrahamCampbell/Core for easier installs
2015-08-07 11:48:41 +01:00
Graham Campbell
3c4ccf00f1 Merge pull request #885 from cachethq/seeder-command
Created DemoSeederCommand to replace seeders
2015-08-07 11:48:23 +01:00
James Brooks
79f66fc090 Fix up the seeder command 2015-08-07 11:44:51 +01:00
James Brooks
a05496f7d0 Created DemoSeederCommand to replace seeders. Closes #884 2015-08-07 08:31:22 +01:00
Graham Campbell
55ffbd74d4 Merge branch '1.2'
Conflicts:
	composer.json
	composer.lock
2015-08-06 22:02:23 +01:00
Graham Campbell
f9f2e5c18a Bumped version 2015-08-06 21:51:31 +01:00
Graham Campbell
91ba722405 Merge branch '1.1'
Conflicts:
	composer.json
	composer.lock
	config/emoji.php
2015-08-06 20:11:20 +01:00
Graham Campbell
2ac9d3b23e Updated dependencies 2015-08-06 20:00:53 +01:00
Graham Campbell
848fb3b607 Rebuilt css 2015-08-06 20:00:38 +01:00
Graham Campbell
7d21a7682c Updated elixir 2015-08-06 20:00:31 +01:00
Graham Campbell
e3c38c7461 Updated emoji package 2015-08-06 20:00:22 +01:00
James Brooks
c5a0ded808 Added GrahamCampbell/Core for easier installs 2015-08-06 19:12:13 +01:00
James Brooks
3f2f5cd25b Dockerfile maintainer details. Closes #872 2015-08-06 19:09:35 +01:00
James Brooks
bbaa1fbfa6 Updated AltThree/Emoji for GITHUB_TOKEN usage 2015-08-06 18:56:00 +01:00
James Brooks
0e83999f7d Order the $routeMiddleware values 2015-08-06 14:29:13 +01:00
James Brooks
3c07529693 Pulled out the routes for RSS and Atom feeds into their own file 2015-08-06 14:27:44 +01:00
James Brooks
669fb4857a Addons are now listed in the documentation 2015-08-06 14:23:58 +01:00
James Brooks
4693faa64f Removed installation docs to links to docs.cachethq.io 2015-08-06 14:19:12 +01:00
James Brooks
0802da8e01 Update comment so it makes more sense 2015-08-06 14:06:27 +01:00
James Brooks
f839bc06f5 Renamed AdminRoutes to DashboardRoutes 2015-08-06 14:05:40 +01:00
James Brooks
bba4cf8cce Put a space after the suffix 2015-08-06 13:59:15 +01:00
James Brooks
701f947c33 Better example of metrics. 2015-08-06 13:57:07 +01:00
James Brooks
36b36925c9 Merge pull request #875 from cachethq/admin-delete-users
Added the ability for admins to delete users. Closes #791
2015-08-06 13:48:43 +01:00
James Brooks
76d3692d9e Added the ability for admins to delete users. Closes #791 2015-08-06 13:48:23 +01:00
James Brooks
3f7f4e7624 Fix docblocks 2015-08-06 11:44:01 +01:00
James Brooks
e76ecd493e Merge pull request #873 from cachethq/controllers
Remove AbstractController from remaining and rename BaseController to Controller
2015-08-06 07:07:16 +01:00
Joseph Cohen
d68b248fd7 Remove AbstractController from remaining and rename BaseController to Controller 2015-08-05 17:21:03 -05:00
James Brooks
5813364ccb Update dependencies 2015-08-05 15:18:26 +01:00
James Brooks
8d0a716c2d Remove AbstractController as it does nothing 2015-08-05 15:18:20 +01:00
James Brooks
e471796742 Update CONTRIBUTING.md 2015-08-05 08:47:32 +01:00