mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-02-22 10:44:09 +01:00
Code Issues Projects Releases Wiki Activity
2,914 Commits 15 Branches 56 Tags
Commit Graph

2914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Graham Campbell
c84c49c761 Merge pull request #1199 from cachethq/events 
Added Event Interfaces
 2015-12-07 21:59:01 +00:00
Graham Campbell
385391bf1f Merge branch '2.0' 2015-12-07 12:05:31 +00:00
Graham Campbell
c48f54ec28 Removed unused code 2015-12-07 12:05:08 +00:00
Graham Campbell
17ad609424 Merge pull request #1209 from cachethq/revert-1208-master 
Revert "Tidy: Remove unused variable."
 2015-12-07 12:04:12 +00:00
Graham Campbell
be793a9fd1 Revert "Tidy: Remove unused variable." 2015-12-07 12:04:05 +00:00
Graham Campbell
ffeaed336e Merge branch '2.0' 2015-12-07 11:59:29 +00:00
James Brooks
408e66f793 Merge pull request #1208 from thehereward/master 
Tidy: Remove unused variable.
 2015-12-07 11:58:03 +00:00
Hereward Mills
8b9adfb9f8 Tidy: Remove unused variable. 2015-12-07 11:25:38 +00:00
James Brooks
cf19fecdbe Fixes #1202 2015-12-07 07:18:06 +00:00
Graham Campbell
f5617abd9e Fixed typo 2015-12-06 18:13:30 +00:00
Graham Campbell
991b3e68aa Merge pull request #1204 from cachethq/analysis-XpbMVz 
Applied fixes from StyleCI
 2015-12-06 18:02:22 +00:00
Graham Campbell
ef220b1c40 Applied fixes from StyleCI 2015-12-06 13:02:14 -05:00
Graham Campbell
e92cb7fb01 Added AlreadySubscribedException 
Closes #1201
 2015-12-06 18:01:33 +00:00
Graham Campbell
6efe100064 Added new exception interface and updated transformers 2015-12-06 17:59:26 +00:00
Graham Campbell
b9ca5f7066 Updated dependencies 2015-12-06 12:02:12 +00:00
Graham Campbell
66c6460bab Finished off event interfaces 2015-12-06 11:44:02 +00:00
Graham Campbell
c73c5d28a1 Merge pull request #1198 from cachethq/commands 
Commands
 2015-12-06 11:37:08 +00:00
Graham Campbell
3c1f5cfdf5 Added missing command tests 2015-12-06 11:32:45 +00:00
Graham Campbell
5fd3abcbd0 Fixed commands 2015-12-06 11:32:30 +00:00
Graham Campbell
f3d2b5ba9c Merge pull request #1196 from cachethq/tests 
Updated tests
 2015-12-06 11:11:45 +00:00
Graham Campbell
bc211f2f55 Merge pull request #1197 from cachethq/analysis-qvDWE8 
Applied fixes from StyleCI
 2015-12-06 11:11:29 +00:00
Graham Campbell
39422f060f Applied fixes from StyleCI 2015-12-06 06:11:20 -05:00
Graham Campbell
19e3804227 Updated tests 2015-12-06 11:04:02 +00:00
Graham Campbell
036c819922 Merge branch '2.0' 2015-12-06 10:38:49 +00:00
Graham Campbell
cce211159b Updated dependencies 2015-12-06 10:38:15 +00:00
Graham Campbell
8c72cb8fa0 Merge pull request #1193 from phecho/merge-feed-controller 
Merge Atom & Rss Controllers into Feed Controller
 2015-12-06 10:18:51 +00:00