Commit Graph

2740 Commits

Author SHA1 Message Date
Graham Campbell
ab370be1c0 Added missing return annotation 2015-12-22 19:47:05 +00:00
Graham Campbell
b1b98f9b55 Merge pull request #1250 from thehereward/fix-some-php-docs
Fix some PHP docs
2015-12-22 19:45:09 +00:00
Hereward Mills
d176cb9b8f Fully qualify class names. 2015-12-22 12:17:21 +00:00
Hereward Mills
a78a5ddb04 Fix some PHP docs. 2015-12-22 08:41:03 +00:00
Joe Cohen
09b4912801 Merge pull request #1242 from phecho/fix-trans
Added missing translation
2015-12-21 22:32:40 -06:00
phecho
e1fa49d1f7 Added missing translation 2015-12-22 08:48:18 +08:00
Graham Campbell
83c4a57acc Merge pull request #1247 from cachethq/fix
Prevent tests breaking due to rolling into the next second
2015-12-22 00:42:56 +00:00
Graham Campbell
78b7582b8d Prevent tests breaking due to rolling into the next second 2015-12-21 22:40:11 +00:00
Graham Campbell
2e48fe919a Merge pull request #1246 from thehereward/fix-spelling-mistakes
Fix some obvious spelling mistakes.
2015-12-21 22:25:46 +00:00
Hereward Mills
ee886cddfd Fix some obvious spelling mistakes. 2015-12-21 22:06:21 +00:00
Graham Campbell
1607275d2d Merge branch '2.0'
# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php
2015-12-18 12:55:47 +00:00
Graham Campbell
c1ab3a175c Bumped version 2015-12-18 12:51:20 +00:00
Graham Campbell
666da0125e Released 2.0.4 2015-12-18 12:50:27 +00:00
Graham Campbell
7ff5da78b9 Updated laravel 2015-12-18 12:48:05 +00:00
Graham Campbell
4886bb9815 Merge pull request #1238 from cachethq/fix-notifing-subscribers
Fixes #1237
2015-12-18 12:39:33 +00:00
James Brooks
d2beb6263e Remove indentation 2015-12-18 09:07:40 +00:00
James Brooks
dabed137ab Fixes #1237 2015-12-17 14:41:22 +00:00
James Brooks
0d9ec1c164 Merge pull request #1236 from phecho/develop
Update README for feature #1231
2015-12-17 08:26:20 +00:00
phecho
804d661c31 Update README for feature #1231 2015-12-17 16:13:04 +08:00
James Brooks
f75c9f5500 Fixes #1218 2015-12-16 18:15:25 +00:00
Graham Campbell
cfe0cefeb3 Merge branch 'master' of https://github.com/cachethq/Cachet 2015-12-16 18:11:27 +00:00
Graham Campbell
57491b8062 Merge branch '2.0' 2015-12-16 18:11:12 +00:00
James Brooks
3a5405e032 Merge pull request #1231 from phecho/dev-login
User can login with username or email
2015-12-16 18:03:47 +00:00
James Brooks
b9b282ba7b Fixes #1234 2015-12-16 18:02:04 +00:00
James Brooks
5f2e2d5925 Merge pull request #1233 from phecho/fix-page_title
Fixed issue #1195
2015-12-16 13:49:27 +00:00
phecho
89c708de07 Fixed issue #1195 2015-12-16 21:42:02 +08:00
phecho
c57c9db54a User can login with username or email 2015-12-16 19:15:03 +08:00
Graham Campbell
04af799052 Merge branch '2.0'
# Conflicts:
#	composer.lock
2015-12-15 15:43:37 +00:00
Graham Campbell
7f02aa2bce Updated dependencies 2015-12-15 15:38:04 +00:00
Graham Campbell
7de9440731 Bumped some minimum versions 2015-12-15 15:12:57 +00:00
Graham Campbell
9e11f5eba0 Merge pull request #1219 from axilleas/sqlite_gitignore
Add sqlite database to .gitignore
2015-12-12 20:50:43 +00:00
Achilleas Pipinellis
8035ba81f8 Add sqlite database to .gitignore 2015-12-12 22:16:03 +02:00
Graham Campbell
d9a885647b Updated dependencies 2015-12-11 11:47:14 +00:00
Graham Campbell
53889efa8d Updated exceptions package 2015-12-11 11:44:34 +00:00
Graham Campbell
821870f496 Merge branch '2.0'
# Conflicts:
#	composer.lock
2015-12-11 11:43:15 +00:00
Graham Campbell
409d34f251 Updated dependencies 2015-12-11 11:37:12 +00:00
Graham Campbell
68b0d35d1a Locked down some dependency versions 2015-12-11 11:34:21 +00:00
Joe Cohen
37598fac3d Merge pull request #1216 from cachethq/unify-is-getters
Unify is clamed on Invite like we do on Subscriber
2015-12-09 19:07:19 -06:00
Joseph Cohen
4c5a12ec89 Unify is clamed on Invite like we do on Subscriber 2015-12-09 18:36:17 -06:00
Joe Cohen
2f526d6cb3 Merge pull request #1214 from cachethq/subcribers-verified-scopes
Added subcriber verified scope and already subscribed msg
2015-12-09 18:33:08 -06:00
Graham Campbell
2fce5f6d6a Merge pull request #1215 from cachethq/analysis-8nPZgq
Applied fixes from StyleCI
2015-12-09 23:38:10 +00:00
Graham Campbell
f1772a2108 Applied fixes from StyleCI 2015-12-09 18:38:06 -05:00
Joseph Cohen
e5c90b25b2 Make subscribers is verified a attribute getter 2015-12-09 17:37:54 -06:00
Joseph Cohen
412c119131 Added subcriber verified scope and already subscribed msg 2015-12-09 15:29:41 -06:00
Graham Campbell
e099b45495 Merge branch '2.0'
# Conflicts:
#	composer.lock
2015-12-09 14:20:18 +00:00
Graham Campbell
8ca809d5a0 Updated dependencies 2015-12-09 14:04:26 +00:00
Graham Campbell
9cde8277ad Bumped min exceptions version 2015-12-09 14:02:57 +00:00
Graham Campbell
945f9cdc78 Merge pull request #1211 from cachethq/move
Moved stuff to foundation
2015-12-07 22:17:14 +00:00
Graham Campbell
be5672c352 Moved stuff to foundation 2015-12-07 22:12:45 +00:00
Graham Campbell
7759f128d2 Merge pull request #1203 from cachethq/exceptions
Exception Improvements
2015-12-07 21:59:10 +00:00