mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity
3,060 Commits 16 Branches 56 Tags
Commit Graph

3060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Brooks
781b2238c6 Remove JamesForks/badger dependency. Closes #1537 2016-02-21 10:25:30 +00:00
Graham Campbell
52a1f42426 Merge branch '2.1' 
# Conflicts:
#	VERSION
 2016-02-20 21:31:04 +00:00
Graham Campbell
7bbba6e897 Bumped version 2016-02-20 21:29:33 +00:00
Graham Campbell
0f5008f301 Released 2.1.2 v2.1.2 2016-02-20 21:28:45 +00:00
Graham Campbell
dc1022e6f3 Merge pull request #1536 from CachetHQ/merge 
Merge from 2.1, and updates
 2016-02-20 21:19:32 +00:00
Graham Campbell
63eaaa325e Updated dependencies 2016-02-20 21:18:26 +00:00
Graham Campbell
819738cc77 Updated badger 2016-02-20 21:14:42 +00:00
Graham Campbell
d096e603d4 Merge branch '2.1' into merge 
# Conflicts:
#	composer.json
#	composer.lock
 2016-02-20 21:14:25 +00:00
Graham Campbell
0d614fe0c3 Merge pull request #1535 from CachetHQ/composer 
Updated deps
 2016-02-20 21:12:08 +00:00
Graham Campbell
d8ed965282 Updated deps 2016-02-20 21:00:41 +00:00
Graham Campbell
39092ff18e Bumped min laravel version 2016-02-20 20:40:44 +00:00
Graham Campbell
7d297a5c96 Merge pull request #1534 from CachetHQ/fix 
Removed bad file
 2016-02-20 20:40:05 +00:00
Graham Campbell
785fdea56d Removed bad file 2016-02-20 20:38:45 +00:00
James Brooks
b8198c0d4f Merge pull request #1533 from CachetHQ/fix-hourly-metric-points 
Fix Last hour metric points
 2016-02-20 20:25:35 +00:00
James Brooks
58f755d136 Fix Last hour metric points. Closes #1482 2016-02-20 19:39:07 +00:00
James Brooks
8d1c244e02 Merge pull request #1430 from CachetHQ/component-shields 
Added Component badges/shields
 2016-02-20 14:00:10 +00:00
James Brooks
37898bee60 Added Component badges/shields. Closes #1313 2016-02-20 13:14:29 +00:00
James Brooks
7b05d1d1b6 Merge pull request #1524 from CachetHQ/issue-template 
Create ISSUE_TEMPLATE
 2016-02-20 12:22:02 +00:00
James Brooks
625b7d9a81 Create ISSUE_TEMPLATE 2016-02-20 11:58:54 +00:00
James Brooks
cb08443b27 Merge pull request #1525 from CachetHQ/change-metric-points-value-column 
Change metric_points.value to DECIMAL(15,3)
 2016-02-20 11:54:40 +00:00
James Brooks
207361d227 Merge pull request #1527 from CachetHQ/sync-langs 
Sync language files
 2016-02-18 14:41:53 +00:00
James Brooks
de5b5bdda5 Sync language files 2016-02-18 14:16:40 +00:00
James Brooks
e25472fc18 Merge pull request #1523 from CachetHQ/timezone-error 
Use create instead of createNormalized on handlers
 2016-02-18 14:05:13 +00:00
James Brooks
026d296d8f Change metric_points.value to DECIMAL(15,3). Closes #1508 2016-02-18 08:53:16 +00:00
Joseph Cohen
537017925f Use create instead of createNormalized on handlers 2016-02-17 17:08:36 -06:00
Graham Campbell
37af01483a Merge pull request #1519 from CachetHQ/merge 
Merge branch '2.1'
 2016-02-17 20:22:26 +00:00
Graham Campbell
726f5e851d Merge branch '2.1' 2016-02-17 20:08:56 +00:00
Graham Campbell
1ddd868449 Merge pull request #1518 from CachetHQ/deps 
Updated laravel again
 2016-02-17 20:01:24 +00:00
Graham Campbell
4a6e47c86b Updated laravel again 2016-02-17 19:55:47 +00:00
Graham Campbell
02b893cc89 Merge pull request #1517 from CachetHQ/fix-js-object 
Fix [object object] notification error with js
 2016-02-17 19:46:53 +00:00
Joseph Cohen
b8f89e97cd Fix [object object] notification error with js 2016-02-17 13:46:02 -06:00
Graham Campbell
42c8ee8adf Merge pull request #1515 from CachetHQ/laravel 
Updated Laravel
 2016-02-17 19:23:08 +00:00
Graham Campbell
9d0a49b2be Updated composer.lock 2016-02-17 18:36:30 +00:00
Graham Campbell
5de5a5cd91 Bumped laravel version 2016-02-17 18:33:42 +00:00
Graham Campbell
73fa0951f7 Merge pull request #1514 from CachetHQ/version 
Bumped version to target 2.2
 2016-02-17 17:34:13 +00:00
Graham Campbell
4e3879a949 Updated composer.lock hashes 2016-02-17 17:33:53 +00:00
Graham Campbell
7f55829035 Bumped version to target 2.2 2016-02-17 17:28:29 +00:00
Graham Campbell
63dd826377 Merge pull request #1512 from CachetHQ/ajax-charts 
Load metrics via AJAX
 2016-02-17 17:27:09 +00:00
James Brooks
2565774fea Load metrics via AJAX. Fixes #819 2016-02-17 17:08:15 +00:00
Graham Campbell
c72974de27 Merge pull request #1509 from CachetHQ/deps 
Updated deps
 2016-02-17 11:59:52 +00:00
Graham Campbell
676e7be9fb Updated deps 2016-02-17 11:43:52 +00:00
Graham Campbell
cfca0434ba Merge pull request #1506 from CachetHQ/dont-notify-incident-default 
Fixes #1496
 2016-02-16 13:00:14 +00:00
James Brooks
8264f72a5a Fixes #1496 2016-02-16 08:58:44 +00:00
James Brooks
3cb6ba237c Merge pull request #1502 from CachetHQ/ignore-token-field 
Ignore the _token field when updating settings
 2016-02-15 13:00:48 +00:00
James Brooks
e8e8dc2828 Ignore the _token field when updating settings 2016-02-15 10:42:05 +00:00
James Brooks
8a5b07f8d2 Merge pull request #1501 from CachetHQ/fix-piwik-siteid 
Properly store the piwik site id
 2016-02-15 10:41:32 +00:00
James Brooks
98f0d7ed31 Properly store the piwik site id 
Fixes #1499
 2016-02-15 10:17:37 +00:00
Graham Campbell
dc45f7625a Bumped version 2016-02-13 21:38:05 +00:00
Graham Campbell
694727f6d6 Released 2.1.1 v2.1.1 2016-02-13 21:37:19 +00:00
Graham Campbell
3f991ddb63 Lock down laravel version 2016-02-13 21:36:43 +00:00