Commit Graph

4257 Commits

Author SHA1 Message Date
James Brooks c1d8203602 Added missing setup translations. Closes #2010 2016-07-28 15:06:16 -04:00
James Brooks dc73f62803 Fixes issues with updating using dashboard api. Closes #2014 2016-07-28 10:47:59 -04:00
Graham Campbell 0f029702d4 Merge branch '2.3' into 2.4 2016-07-25 23:02:12 +01:00
Graham Campbell fdbde63143 Back to dev 2016-07-25 22:58:23 +01:00
Graham Campbell 9a9ec833eb Released 2.3.7 2016-07-25 22:57:05 +01:00
James Brooks 136cce2d6d Merge pull request #2008 from CachetHQ/analysis-XZnLDb
Applied fixes from StyleCI

[ci skip] [skip ci]
2016-07-25 21:52:31 +01:00
Graham Campbell 880a2d9cd9 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-07-25 16:52:26 -04:00
James Brooks 71b5d446ba Merge branch '2.3' into 2.4 2016-07-25 21:44:07 +01:00
James Brooks aea18a51c2 Sync languages 2016-07-25 21:42:49 +01:00
Graham Campbell 84bedf5c60 Merge pull request #2007 from CachetHQ/revert-1976-cli
Revert "Don't use settings caching in cli"
2016-07-25 19:32:16 +01:00
Graham Campbell 309a3f96ef Revert "Don't use settings caching in cli" 2016-07-25 19:25:05 +01:00
James Brooks 6246f20506 Set debug to true in tests 2016-07-25 08:09:53 +01:00
Graham Campbell 9dcc5d6896 Merge branch '2.3' into 2.4 2016-07-24 15:06:52 +01:00
Graham Campbell acd1ac496d Merge pull request #2003 from CachetHQ/analysis
Run the new static analysis checks in the tests
2016-07-24 14:58:03 +01:00
Graham Campbell 8c273b8579 Run the new static analysis checks in the tests 2016-07-24 14:48:59 +01:00
Graham Campbell b30a774bed Merge pull request #2002 from CachetHQ/imports
Added missing imports
2016-07-24 14:48:03 +01:00
Graham Campbell 3ea1428c23 Added missing imports 2016-07-24 14:47:02 +01:00
James Brooks d6ab5efd14 Fixes #1998 2016-07-22 11:08:49 +01:00
James Brooks 235e3281b0 Merge branch '2.3' into 2.4 2016-07-22 09:20:58 +01:00
James Brooks a94be2efca Update deps 2016-07-22 09:19:58 +01:00
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