6494 Commits

Author SHA1 Message Date
James Brooks
df5ade6554
Merge pull request #3287 from sideffect0/2.4
grep -rl "test\.com" . | xargs sed -i 's/test.com/example.com/g'
2018-12-27 22:55:23 +00:00
James Brooks
98edf82983 Update deps 2018-12-27 22:17:10 +00:00
James Brooks
6d8a60d293 Apply fixes from StyleCI 2018-12-27 22:13:20 +00:00
James Brooks
5db11d5f7a
Merge pull request #3334 from CachetHQ/l10n_2.4
New Crowdin translations
2018-12-27 22:13:05 +00:00
James Brooks
a01d7d4f40
Merge pull request #3342 from nstapelbroek/feature/explicit-port-numbers
Write port numbers explicitly to the .env
2018-12-27 22:09:29 +00:00
James Brooks
84fd58459d
Merge pull request #3362 from TakeMeNL/bugfix/3269
Resolve #3269
2018-12-18 08:21:11 +00:00
Cachet Bot
2edfee3643 New translations dashboard.php (Swedish) 2018-12-17 17:30:19 +00:00
Cachet Bot
93f957f602 New translations cachet.php (Swedish) 2018-12-17 17:30:17 +00:00
James Brooks
cddeac0066
Merge pull request #3363 from TakeMeNL/bugfix/3288
Resolve #3288
2018-12-17 17:27:04 +00:00
TakeMeNL
5f1dfc6249 Resolve #3288
If Binput::get('enabled') is not defined this will return NULL which resulted in a false.
Updated tests
2018-12-17 17:46:31 +01:00
TakeMeNL
201322bb53 Resolve #3269 2018-12-14 21:46:45 +01:00
Mr.Patch
80d0e6f4f7
Merge pull request #12 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2018-12-01 17:23:16 +05:30
James Brooks
a7789dc1a6
Merge pull request #3347 from PeterDaveHelloKitchen/speedup-travis-ci
Use PHP Debugger(phpdbg) for PHPUnit to speed up CI
2018-12-01 10:45:30 +00:00
Peter Dave Hello
76569f4cce Use PHP Debugger(phpdbg) for PHPUnit to speed up CI 2018-11-30 17:59:43 +08:00
Mr.Patch
cb1da22ba6
Merge pull request #11 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2018-11-27 16:12:17 +05:30
James Brooks
26d65a0ac5
Merge pull request #3344 from CachetHQ/dependabot/npm_and_yarn/url-parse-1.4.4
[Security] Bump url-parse from 1.4.1 to 1.4.4
2018-11-26 08:40:34 +00:00
Mr.Patch
86f0a801ac
Merge pull request #10 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2018-11-26 10:05:39 +05:30
dependabot[bot]
b78c73d73d
[Security] Bump url-parse from 1.4.1 to 1.4.4
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.1 to 1.4.4. **This update includes security fixes.**
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.1...1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-26 02:55:08 +00:00
James Brooks
05d6af9c3a
Merge pull request #3340 from nstapelbroek/feature/configure-socket-warning
Add warning when setting up localhost with mysql driver
2018-11-25 21:58:14 +00:00
Nico Stapelbroek
3d632a4441 Add support for empty values in the persistEnv method 2018-11-25 16:45:49 +01:00
Nico Stapelbroek
e6fc6f3970 Explicitly set the port number when not using traditional ports 2018-11-25 16:44:28 +01:00
James Brooks
2750505f28
Merge pull request #3341 from nstapelbroek/fix/postgress-driver-during-config
Fix configuring Postgres leads to wrong database driver key
2018-11-25 15:22:40 +00:00
Nico Stapelbroek
4fb2f3e7a7 Add warning when setting up localhost with mysql driver 2018-11-25 13:46:15 +01:00
Nico Stapelbroek
6feed9e2ee Fix configuring postgres leads to wrong database driver key 2018-11-25 13:42:27 +01:00
James Brooks
4a6fd7dc70
Merge pull request #3223 from stobbsm/2.4
Fixes Template not rendering when containing twig variables
2018-11-23 21:45:03 +00:00
Mr.Patch
05f9217b62
Merge pull request #9 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2018-11-20 10:30:07 +05:30
James Brooks
89debacfc8
Merge pull request #3332 from bnahin/patch-2
Remove extra parenthesis on subscribe page
2018-11-19 17:32:30 +00:00
Cachet Bot
4674eff289 New translations cachet.php (German) 2018-11-19 17:12:51 +00:00
Cachet Bot
610f4aa70c New translations cachet.php (French) 2018-11-19 17:12:47 +00:00
Cachet Bot
ab1117f1ae New translations cachet.php (Finnish) 2018-11-19 17:12:43 +00:00
Cachet Bot
1c2888f235 New translations cachet.php (English) 2018-11-19 17:12:38 +00:00
Cachet Bot
c007ca6dad New translations cachet.php (Greek) 2018-11-19 17:12:36 +00:00
Cachet Bot
9fbee51c8f New translations cachet.php (Italian) 2018-11-19 17:12:34 +00:00
Cachet Bot
cfa8305f3a New translations cachet.php (Indonesian) 2018-11-19 17:12:29 +00:00
Cachet Bot
1bef5c30a9 New translations cachet.php (Hungarian) 2018-11-19 17:12:25 +00:00
Cachet Bot
e6368e3c14 New translations cachet.php (Hebrew) 2018-11-19 17:12:22 +00:00
Cachet Bot
7840353b51 New translations cachet.php (Chinese Simplified) 2018-11-19 17:12:17 +00:00
Cachet Bot
78ae8f21b8 New translations cachet.php (Catalan) 2018-11-19 17:12:13 +00:00
Cachet Bot
7ec2e1fae8 New translations cachet.php (Albanian) 2018-11-19 17:12:06 +00:00
Cachet Bot
fd5874b27c New translations cachet.php (Arabic) 2018-11-19 17:12:03 +00:00
Cachet Bot
73b1a4722c New translations forms.php (Chinese Simplified) 2018-11-19 17:12:01 +00:00
Cachet Bot
ea5b6b5b9d New translations forms.php (Dutch) 2018-11-19 17:11:59 +00:00
Cachet Bot
4e00dc4d6a New translations cachet.php (Dutch) 2018-11-19 17:11:57 +00:00
Cachet Bot
43f120ac71 New translations cachet.php (Danish) 2018-11-19 17:11:52 +00:00
Cachet Bot
70011587a8 New translations cachet.php (Czech) 2018-11-19 17:11:48 +00:00
Cachet Bot
d59c39480a New translations cachet.php (Chinese Traditional) 2018-11-19 17:11:43 +00:00
Cachet Bot
8f44ec8d8c New translations cachet.php (Turkish) 2018-11-19 17:11:37 +00:00
Cachet Bot
ab1b8ea84b New translations cachet.php (Thai) 2018-11-19 17:11:33 +00:00
Cachet Bot
6cfa12a1be New translations cachet.php (Swedish) 2018-11-19 17:11:29 +00:00
Cachet Bot
7c3d773edc New translations cachet.php (Spanish) 2018-11-19 17:11:25 +00:00