Commit Graph

3637 Commits

Author SHA1 Message Date
James Brooks 04b96e7dec Merge pull request #1995 from CachetHQ/standardise-team-member-commands
Standardise the team member commands
2016-07-22 09:15:48 +01:00
James Brooks e15af44449 Standardise the team member commands. Closes #1881 2016-07-21 11:49:05 +01:00
Joe Cohen ef9f7d23a0 Merge pull request #1993 from CachetHQ/skip-subscriber-verification
Added option to skip subscriber verification
2016-07-20 14:50:29 -05:00
Graham Campbell ef694b027a Removed old variable 2016-07-20 19:58:58 +01:00
Graham Campbell f53e466500 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-07-20 14:56:55 -04:00
Graham Campbell 1e24138d7a Removed extra brackets 2016-07-20 19:54:48 +01:00
Graham Campbell 9120dba237 Fixed verification skipping 2016-07-20 19:52:23 +01:00
James Brooks 7f261a218a Added option to skip subscriber verification. Closes #1990 2016-07-20 16:00:27 +01:00
Graham Campbell 0d90f0459b Merge branch '2.3' into 2.4 2016-07-18 19:38:10 +01:00
Graham Campbell f8505a866d Back to dev 2016-07-18 19:34:29 +01:00
Graham Campbell 27235abab2 Released 2.3.6 2016-07-18 19:34:06 +01:00
Graham Campbell f70bc7a42f Merge pull request #1986 from CachetHQ/deps
Updated dependencies
2016-07-18 18:51:37 +01:00
Graham Campbell 6cf622ae21 Updated dependencies 2016-07-18 18:46:43 +01:00
James Brooks bcbbee22d9 Merge pull request #1983 from peelman/improve-manage-subscriptions
group components on manage subscriptions page
2016-07-18 15:00:21 +01:00
Nick Peelman 9750191bff proper indents for @includes 2016-07-18 09:51:23 -04:00
Nick Peelman 52c4901a78 left align @include tags 2016-07-18 09:39:09 -04:00
Nick Peelman 587555c2d4 Adding a newline... 2016-07-18 09:12:42 -04:00
Nick Peelman b4c7fb2ab0 adding a period... 2016-07-18 09:12:00 -04:00
Nick Peelman e61d24f685 Fixing indentation problems... 2016-07-18 09:08:48 -04:00
Nick Peelman 88e85d2dfb group components on manage subscriptions page 2016-07-18 08:49:38 -04:00
James Brooks 5b72f2febc Merge '2.3' 2016-07-17 16:42:27 +01:00
James Brooks dd1a14a438 Back to dev 2016-07-17 16:38:52 +01:00
James Brooks 387818dbb2 Bump version 2016-07-17 16:38:24 +01:00
James Brooks 5d70d244ce Update feed package. Fixes #1973 2016-07-17 16:37:55 +01:00
James Brooks ddc846d959 Back to dev 2016-07-16 09:54:54 +01:00
James Brooks 6fb6641499 Bump version 2016-07-16 09:54:28 +01:00
James Brooks d5eb087eca Merge pull request #1976 from CachetHQ/cli
Don't use settings caching in cli
2016-07-15 07:48:26 +01:00
Graham Campbell fd25edb2f0 Don't use settings caching in cli 2016-07-14 21:31:07 -07:00
Graham Campbell 4703aeadb2 Merge branch '2.3' 2016-07-14 11:23:45 -07:00
Graham Campbell 5879a2cb1a Updated the exceptions package 2016-07-14 11:11:21 -07:00
Graham Campbell ef304950bb Updated the tests 2016-07-13 19:04:58 -07:00
Graham Campbell ad8f098ec1 Merge branch '2.3' 2016-07-13 18:28:48 -07:00
Graham Campbell df5b9b89e6 Updated dependencies 2016-07-13 18:25:27 -07:00
James Brooks 2551a1a038 Updated deps 2016-07-13 19:24:57 +01:00
James Brooks 3874b533be Fix Feed import 2016-07-13 14:41:59 +01:00
James Brooks 85c0e94408 Fix import 2016-07-13 14:39:39 +01:00
James Brooks 1793f5588a Added missing import 2016-07-13 14:39:13 +01:00
James Brooks 46ff13c7fb Merge pull request #1972 from CachetHQ/analysis-qyrNE2
Applied fixes from StyleCI

[ci skip] [skip ci]
2016-07-13 14:38:51 +01:00
James Brooks da8c8fae74 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-07-13 09:38:47 -04:00
James Brooks ff9eb123c6 Don't use the Config facade in any composers 2016-07-13 14:38:36 +01:00
James Brooks 895d1ea1b6 Don't use the Config facade in the TimezoneLocaleComposer 2016-07-13 14:35:49 +01:00
James Brooks 503252c3a2 Tidy up integrations, use contracts 2016-07-13 14:33:20 +01:00
James Brooks ec0f0768f0 Added missing typehints 2016-07-13 14:24:02 +01:00
James Brooks 68cc6eb93c Merge pull request #1968 from CachetHQ/system-status-api
Implement the system status api endpoint
2016-07-13 14:22:29 +01:00
James Brooks fdfebc18fb Implement the system status api endpoint. Closes #1936 2016-07-13 14:21:57 +01:00
James Brooks 0cd3ea0e92 Merge branch '2.3' 2016-07-13 14:21:00 +01:00
James Brooks 47a5569f02 Improve how we work out system status with scheduled maintenance 2016-07-13 14:19:35 +01:00
James Brooks ca4a72c518 Merge pull request #1960 from PeterDaveHello/bump-node-dependencies
bump nodejs package dependencies
2016-07-13 13:57:49 +01:00
Peter Dave Hello 6e45b5ae88 bump nodejs package dependencies 2016-07-13 20:57:16 +08:00
James Brooks 0f10522e9c Merge pull request #1957 from CachetHQ/apple-system-font
Update the font-stack to be -apple-system font
2016-07-12 22:41:07 +01:00