Commit Graph

3087 Commits

Author SHA1 Message Date
Graham Campbell
a2abd43fd2 Merge pull request #1404 from CachetHQ/native-throttling
Native throttling
2016-02-25 21:40:40 +00:00
Graham Campbell
1ab9d95b9c Native throttling 2016-02-25 21:26:46 +00:00
Graham Campbell
08b490a3cc Merge pull request #1550 from CachetHQ/fix-api-paging
Start fixing sorting on API
2016-02-25 19:14:37 +00:00
Joseph Cohen
919c7127e7 Fixes API sorting and filtering. Closes #1489 2016-02-25 18:58:42 +00:00
Graham Campbell
98550c31c9 Merge pull request #1553 from CachetHQ/update-cors
Update cors
2016-02-25 17:51:18 +00:00
James Brooks
4deff42aff Updated laravel-cors. Closes #1485 2016-02-25 17:50:51 +00:00
Graham Campbell
e8cbd81ad0 Merge pull request #1561 from CachetHQ/deps
Updated dependencies
2016-02-25 17:45:03 +00:00
Graham Campbell
54a8fbd185 Updated dependencies 2016-02-25 17:35:37 +00:00
James Brooks
49c6a7806b Rebuilt assets 2016-02-24 13:51:08 +00:00
James Brooks
251e90433e Merge pull request #1554 from CachetHQ/tweaks
Tweaks
2016-02-24 13:50:13 +00:00
James Brooks
3f7d1f588b Remove unused styles 2016-02-24 13:39:17 +00:00
James Brooks
9a3b073fc6 Split up component groups to make it more obvious 2016-02-24 13:36:27 +00:00
James Brooks
f92761437d Move position of "About This Site". Don't double wrap text. 2016-02-24 13:20:33 +00:00
James Brooks
f186907d8b Seed with app_about data 2016-02-24 13:16:58 +00:00
James Brooks
718bd99c24 Merge pull request #1549 from CachetHQ/model-factory-change
Make the model factories more dynamic
2016-02-24 12:34:28 +00:00
James Brooks
5c0f39759e Make the model factories more dynamic 2016-02-24 12:14:33 +00:00
Graham Campbell
bc9607a735 Merge pull request #1543 from CachetHQ/paginate-metric-points-api
Paginate the points API for metrics
2016-02-22 16:58:56 +00:00
James Brooks
01e40c4684 Paginate the points API for metrics 2016-02-22 14:53:34 +00:00
Graham Campbell
69fe2d7b3a Merge pull request #1539 from CachetHQ/deps
Updated dependencies
2016-02-21 16:09:27 +00:00
Graham Campbell
363dd5358f Updated dependencies 2016-02-21 16:04:25 +00:00
Graham Campbell
3487194415 Merge pull request #1470 from CachetHQ/view-subscriptions
Subscription changes
2016-02-21 15:55:17 +00:00
James Brooks
08dc9e0be9 Merge pull request #1538 from CachetHQ/remove-badger-dependency
Remove JamesForks/badger dependency
2016-02-21 10:52:01 +00:00
James Brooks
781b2238c6 Remove JamesForks/badger dependency. Closes #1537 2016-02-21 10:25:30 +00:00
Joseph Cohen
e51504b3ec Add manage link to email notifications 2016-02-20 21:32:14 +00:00
James Brooks
af0e578a44 Manage my subscriptions page 2016-02-20 21:32:13 +00:00
James Brooks
140970ac37 Changed subscribers page description 2016-02-20 21:32:12 +00:00
James Brooks
0b78332a20 Display what subscriptions (if any) a subscriber has 2016-02-20 21:32:11 +00:00
James Brooks
c9f08a3e6e Show the verified subscriber count in the sidebar 2016-02-20 21:32:09 +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 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