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

3290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Brooks
a5ce958b92 Merge pull request #1753 from CachetHQ/configure-automatic-localization 
Allow configuring of automatic localization
 2016-05-05 11:22:24 +01:00
James Brooks
47e1dff5c5 Allow configuring of automatic localization. Closes #1747 2016-05-05 10:50:14 +01:00
James Brooks
9ddf9e3e1a Merge pull request #1751 from CachetHQ/fix-component-group-api 
Fix component group api
 2016-05-05 10:49:44 +01:00
James Brooks
9747cb9204 Added missing docblock 2016-05-05 10:24:01 +01:00
James Brooks
bd35db8d87 Default collapsed value to 0 (always open) 2016-05-05 10:23:18 +01:00
James Brooks
23ff795809 Don't pass through default order value when updating group 2016-05-05 10:23:02 +01:00
Graham Campbell
48d2721605 Updated dependencies 2016-05-04 21:52:01 +01:00
Graham Campbell
9d78092121 Merge pull request #1750 from CachetHQ/fix-str 
Fixed a bad import
 2016-05-04 20:08:21 +01:00
Graham Campbell
a0b1501b2a Fixed a bad import 2016-05-04 16:38:09 +01:00
Graham Campbell
c4e724e0e6 Rebuilt assets 2016-05-01 16:24:16 +01:00
James Brooks
792a8f6a07 Bower has changed the rules in which a name must follow 2016-05-01 16:06:24 +01:00
Graham Campbell
684b480338 Merge pull request #1738 from CachetHQ/fix-subscribers 
Fix subscribers
 2016-05-01 16:05:41 +01:00
Joe Cohen
f1b61c7ef1 Applied fixes from StyleCI 2016-05-01 16:04:43 +01:00
Joseph Cohen
05bb91d2d9 Global subscribers and fix notifications 2016-05-01 16:04:43 +01:00
Joseph Cohen
5abd25c408 Redirect subscribers to manage 2016-05-01 16:04:43 +01:00
Graham Campbell
e1a8e2220d Merge branch '2.2' into 2.3 
# Conflicts:
#	VERSION
#	public/build/dist/js/all-a62567215d.js
#	public/build/rev-manifest.json
 2016-04-29 17:05:53 +01:00
Graham Campbell
9d9d3b2e6c Bumped version 2016-04-29 16:58:35 +01:00
Graham Campbell
f79fadab80 Released 2.2.2 v2.2.2 2016-04-29 16:58:08 +01:00
Graham Campbell
e3dc7594e5 Updated dependencies 2016-04-29 16:54:08 +01:00
Graham Campbell
200771cdab Merge pull request #1733 from CachetHQ/2.2-rebuild-assets 
Rebuild assets
 2016-04-29 16:48:22 +01:00
James Brooks
56760c7445 Rebuild assets 2016-04-29 16:45:06 +01:00
Graham Campbell
df373e93ef Merge branch '2.2' into 2.3 
# Conflicts:
#	composer.lock
 2016-04-27 14:58:20 +01:00
Graham Campbell
65ebfde315 Merge pull request #1729 from CachetHQ/fix-removal-customizations 
Fixes removal of Customization values
 2016-04-27 14:50:31 +01:00
Graham Campbell
4f7c50f7f4 Updated laravel 2016-04-27 14:49:37 +01:00
James Brooks
de232ab2b5 Fixes removal of Customization values 2016-04-27 14:47:47 +01:00
James Brooks
067018cf47 Use the Str facade 2016-04-27 14:37:17 +01:00
Graham Campbell
97e5fa07fa Updated dependencies 2016-04-27 09:41:39 +01:00
James Brooks
dec48a92f3 Merge pull request #1726 from alprs/fix-always_show_scrollbar 
Always show vertical scrollbar
 2016-04-27 09:28:58 +01:00
Andreas Lutro
0672fe046e Always show vertical scrollbar 2016-04-27 10:14:14 +02:00
James Brooks
b78009bee4 Merge pull request #1725 from alprs/fix-settings_localization_error 
Fix a PHP error in settings -> localization
 2016-04-27 08:56:56 +01:00
James Brooks
5907f54201 Merge pull request #1722 from alprs/fix-view_signup_notfound 
Fix location of signup template
 2016-04-27 08:56:07 +01:00
Andreas Lutro
555865d761 Fix a PHP error in settings -> localization 
$langs is a nested array, not an array of strings.

Fixes #1723
 2016-04-27 09:34:59 +02:00
Andreas Lutro
c0561ad8c0 fix location of signup template 
fixes #1668
 2016-04-27 09:00:05 +02:00
Graham Campbell
28e7af7107 Merge pull request #1582 from CachetHQ/metric-point-enhancement 
Refactoring metric point storage
 2016-04-25 20:42:11 +01:00
James Brooks
f9bc46b460 Refactored the way we store metrics 2016-04-25 20:42:00 +01:00
James Brooks
3730ca8811 Rebuild assets 2016-04-25 16:03:48 +01:00
James Brooks
69716730ac Update dependencies 2016-04-25 16:03:40 +01:00
Graham Campbell
ef8049c21d Updated laravel 2016-04-25 15:56:50 +01:00
Graham Campbell
cf80bf31f3 Synced with laravel/laravel 2016-04-25 15:25:52 +01:00
Graham Campbell
28bf01396c Merge branch '2.2' 
# Conflicts:
#	VERSION
 2016-04-23 11:04:10 +01:00
Graham Campbell
cf900e1390 Back to dev 2016-04-23 11:03:33 +01:00
Graham Campbell
df31b4d20e Released 2.2.1 v2.2.1 2016-04-23 11:02:55 +01:00
Graham Campbell
a9185b7876 Bumped version 2016-04-23 11:00:30 +01:00
Graham Campbell
f383d50f16 Merge pull request #1718 from CachetHQ/js 
Fixed chart.js and rebuilt assets
 2016-04-23 10:53:06 +01:00
Graham Campbell
369073e636 Fixed chart.js and rebuilt assets 2016-04-23 10:52:16 +01:00
Graham Campbell
eb6a638a59 Updated dependencies 2016-04-23 10:24:21 +01:00
James Brooks
9a743ab425 Include default_view_name in metric results 2016-04-22 15:50:14 +01:00
James Brooks
36d89a9ad8 Specify use of the master branch 2016-04-22 15:30:59 +01:00
James Brooks
7dfe1b6fab Use sync as the default queue driver 2016-04-21 19:33:10 +01:00
James Brooks
ebc6525b65 Use query method rather than querying where 1 = 1 2016-04-21 18:53:12 +01:00