1787 Commits

Author SHA1 Message Date
Graham Campbell
2b3b6fb8d8 Merge pull request #664 from cachethq/no-html
Removed the html component
2015-05-25 19:33:37 +01:00
Graham Campbell
9bc598d234 Removed the html component 2015-05-25 19:29:29 +01:00
Graham Campbell
bc11ae6ed6 Merge branch 'master' of https://github.com/cachethq/Cachet 2015-05-25 19:19:09 +01:00
Graham Campbell
ebc842f19e Updated config 2015-05-25 19:19:03 +01:00
James Brooks
084f685387 Fix compilation of nav 2015-05-25 19:05:55 +01:00
Graham Campbell
f235780dda Revert "Updated package.json"
This reverts commit 5a9cb34332757ae75c316d864835616880974ae6.
2015-05-25 19:03:26 +01:00
Graham Campbell
09c33a698d Fixed license years 2015-05-25 19:03:23 +01:00
Graham Campbell
fbf55eeb48 Composer updates 2015-05-25 18:53:00 +01:00
Graham Campbell
946b442ae0 Merge pull request #659 from cachethq/env-config-setup
Env config setup
2015-05-25 18:41:33 +01:00
Graham Campbell
51a4799a29 Merge pull request #663 from cachethq/package
Updated package.json
2015-05-25 18:41:01 +01:00
James Brooks
6dbd15d272 Allow changing of some env variable during setup. 2015-05-25 18:40:09 +01:00
Graham Campbell
5a9cb34332 Updated package.json 2015-05-25 18:32:30 +01:00
Graham Campbell
5709995b13 Fixed server.php 2015-05-25 18:31:51 +01:00
Graham Campbell
aa5e24e96d Updated phpunit config 2015-05-25 18:31:45 +01:00
Graham Campbell
26fbbf9f35 Updated travis config 2015-05-25 18:28:56 +01:00
Graham Campbell
634c318f3f Updated composer.lock 2015-05-25 18:02:12 +01:00
Graham Campbell
45abeea90f Fixed composer.json 2015-05-25 18:02:04 +01:00
Graham Campbell
3988753b99 Updated copyright headers 2015-05-25 17:59:08 +01:00
Graham Campbell
b06167f5e9 Updated joe's email address 2015-05-25 17:53:06 +01:00
James Brooks
a1470a01cf Delete nginx.conf 2015-05-23 17:16:38 +01:00
James Brooks
c554b40c7d Remove unused import (Input) 2015-05-23 15:54:21 +01:00
James Brooks
0e40fe4d3f Prevent Binput from trimming values when dealing with metric suffixes 2015-05-23 15:53:03 +01:00
James Brooks
1402242766 Wrap metric name value in quotes to prevent truncation 2015-05-23 15:47:59 +01:00
James Brooks
bf5941f66e Improve metric tooltips, now show name, value and suffix 2015-05-23 15:46:57 +01:00
James Brooks
6044f7d87c Don't escape the two factor auth help block 2015-05-23 15:29:27 +01:00
Graham Campbell
82cdd171c5 Updated composer.lock file 2015-05-23 14:58:56 +01:00
Graham Campbell
768f4979be Force newer jenssegers/date 2015-05-23 14:57:37 +01:00
Graham Campbell
dc1f1c4737 Updated version constraints 2015-05-23 14:51:07 +01:00
Graham Campbell
0b8ec411ae Added missing into to composer.json 2015-05-23 14:50:17 +01:00
Graham Campbell
91e4dafca9 Updated my email address 2015-05-23 14:48:33 +01:00
James Brooks
65aaa6402a Default all segment contexts to include driver info. 2015-05-23 13:30:18 +01:00
James Brooks
1af50d991e segment_track defaults parameters to an empty array 2015-05-23 13:29:01 +01:00
James Brooks
01b6bb1c2b Track Logged In and Logged Out events 2015-05-23 13:27:56 +01:00
James Brooks
83be116075 Make changes to what we send to Segment, still anonymous! 2015-05-23 13:20:05 +01:00
James Brooks
92604f2ecd Fix the segment_page function 2015-05-23 13:13:38 +01:00
James Brooks
d01ef397b3 Update laravel/framework to 5.0.32 2015-05-23 10:48:10 +01:00
James Brooks
0fb43b2ada Don't use url helper for logo in setup 2015-05-23 08:19:10 +01:00
James Brooks
e577451833 Update dependencies 2015-05-23 07:35:41 +01:00
James Brooks
6803f8e4a8 Improve handling of BasicAuth errors. 2015-05-22 18:29:09 +01:00
James Brooks
fd18b0ae07 Merge pull request #657 from cachethq/update-enUD-lang
Updates en-UD for incontext localization.
2015-05-22 17:08:39 +01:00
James Brooks
b743d56901 Fix lang src 2015-05-22 17:08:29 +01:00
James Brooks
2a94965bb6 Updates en-UD for incontext localization. 2015-05-22 17:06:18 +01:00
James Brooks
03bcf20001 Fix generation of metric point array 2015-05-22 15:35:39 +01:00
James Brooks
e4ef64d014 Fix generation of metrics, no longer sub an extra hour in calculation 2015-05-22 15:32:55 +01:00
James Brooks
d24e83e0ae Account for BasicAuth within ApiAuthenticate 2015-05-22 15:11:44 +01:00
James Brooks
2ae5fb9f22 Added GoSquared demo tracking to the seeder. 2015-05-22 14:07:09 +01:00
James Brooks
aeea02efa2 Fix conditional check for segment_write_key 2015-05-22 14:04:23 +01:00
James Brooks
b15ce2c2c7 Prefix asset urls with / for relative path 2015-05-22 08:28:03 +01:00
James Brooks
7a3a7588b1 Don't wrap the formatted message in p tags, Markdown does it 2015-05-22 08:23:40 +01:00
James Brooks
1e6cb06387 Fix displaying of scheduled time 2015-05-22 07:52:44 +01:00