3158 Commits

Author SHA1 Message Date
James Brooks
57273dd96f Added contributing help for non-developers, designers and developers 2016-02-29 22:10:40 +00:00
James Brooks
b4e023b7ce Added short description 2016-02-29 22:01:59 +00:00
James Brooks
924e74d3c8 Added Packagist badge 2016-02-29 22:00:58 +00:00
James Brooks
335d326a73 Updated node packages 2016-02-29 21:58:09 +00:00
James Brooks
d572a67855 Update bower assets. Rebuild. 2016-02-29 21:48:22 +00:00
James Brooks
328608dfff Colour the panel message arrows. Closes #1567 2016-02-29 21:40:40 +00:00
James Brooks
be78216ff3 Added a version endpoint 2016-02-29 21:31:25 +00:00
James Brooks
24a29f2251 Merge branch 'master' of github.com:CachetHQ/Cachet 2016-02-29 21:24:30 +00:00
James Brooks
d4655112ca Don't override existing data when updating metrics 2016-02-29 21:24:11 +00:00
James Brooks
f30710c5a8 Fixes #1574 - default display_chart to true 2016-02-29 21:23:58 +00:00
James Brooks
eee94086db Fix French not being German! 2016-02-29 20:45:35 +00:00
James Brooks
ca152ecbc0 Merge pull request #1573 from CachetHQ/analysis-8L3RaG
Applied fixes from StyleCI
2016-02-29 20:45:30 +00:00
James Brooks
fce4823d2c Applied fixes from StyleCI 2016-02-29 15:45:25 -05:00
James Brooks
a20b95b87c Updated dependencies 2016-02-29 20:34:09 +00:00
James Brooks
640571a6bc Moved CONTRIBUTING doc back to root 2016-02-29 20:32:49 +00:00
James Brooks
2ad0085370 Merge pull request #1568 from CachetHQ/meta-updates
Updated meta content for inline-previewing
2016-02-26 11:51:24 +00:00
James Brooks
053d3191c8 Updated meta content for inline-previewing 2016-02-26 11:35:53 +00:00
Graham Campbell
6b6f5ee09d Merge pull request #1566 from CachetHQ/remove-chmod
Remove chmod script
2016-02-26 10:43:33 +00:00
James Brooks
481296ad21 Remove chmod script 2016-02-26 10:10:25 +00:00
James Brooks
55d4a639d9 Merge pull request #1565 from CachetHQ/move-contributing-doc
Move the CONTRIBUTING.md file into .github
2016-02-26 08:34:48 +00:00
James Brooks
b19c9fc885 Move the CONTRIBUTING.md file into .github 2016-02-26 08:21:33 +00:00
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