Benjamin Sonntag
fe09524ff3
[enh] misc styling fixes for bootstrap
2018-06-21 19:15:18 +02:00
Benjamin Sonntag
6762429c68
replacing allow from all by Require all granted
2018-06-21 18:29:49 +02:00
Benjamin Sonntag
88f6d04f89
[fix] options now force + or - everywhere
2018-06-21 18:28:10 +02:00
Benjamin Sonntag
791e3ddb38
[fix] adding .debhelper to ignored files
2018-06-21 18:26:15 +02:00
Benjamin Sonntag
d1cba34548
[fix] removing alternc-ssl package altogether
2018-06-21 18:20:01 +02:00
Benjamin Sonntag
976296c833
removing temporary diffs from squeeze
2018-06-21 18:17:29 +02:00
Benjamin Sonntag
eae85dcbe7
removing patches for jessie / wheezy
2018-06-21 18:02:16 +02:00
Benjamin Sonntag
19871eb355
[fix] README adapted to the removal of patches for jessie / wheezy
2018-06-21 18:02:02 +02:00
Kienan Stewart
e8f764de2d
cherry picking, update of phpunit for jessie
2018-06-21 17:59:16 +02:00
Kienan Stewart
2a0b0c1f99
Add php5.6 and php7.0 versions for tests
2018-06-21 17:58:26 +02:00
Kienan Stewart
3556fbb2d4
cherry picking, update of phpunit for jessie
2018-06-21 17:58:24 +02:00
Kienan Stewart
76764e735f
fixing travix.yml
2018-06-21 17:56:38 +02:00
Kienan Stewart
0be79f9b54
Use phpunit from composer download
2018-06-21 17:54:20 +02:00
Kienan Stewart
5ba055cf7f
Cherrypick apache2 configuration for jessie/stretch
...
Sourced from ea3371ae34
2018-06-21 17:52:54 +02:00
Benjamin Sonntag
aff4ed989c
[fix] merge SSL and Bootstrap styling
2018-06-21 17:51:16 +02:00
Benjamin Sonntag
42441d29a2
Merge remote-tracking branch 'origin/pr-226'
...
Fix #225 : call fetchAll on PDO statement #226
2018-06-21 17:46:09 +02:00
Benjamin Sonntag
f48618d0e5
Merge remote-tracking branch 'origin/pr-235'
...
Fix #227 : Use stronger password hashes #235
2018-06-21 17:44:53 +02:00
Benjamin Sonntag
c6d04fd3b6
Merge remote-tracking branch 'origin/pr-236'
...
Roundcube owner fix (one frome stable-3.0 and one new) #236
2018-06-21 17:44:48 +02:00
Benjamin Sonntag
f114a66d91
Merge remote-tracking branch 'origin/pr-239'
...
Fix #222 : Replace mysql_* with mysqli_* #239
2018-06-21 17:44:32 +02:00
Benjamin Sonntag
8166ceb58f
Merge remote-tracking branch 'origin/pr-244'
...
Fix #245 : Files default to unwritable when permissions are changed in… #246
2018-06-21 17:44:17 +02:00
Benjamin Sonntag
0217985655
Merge remote-tracking branch 'origin/pr-246'
...
https://github.com/AlternC/AlternC/pull/246
Fix #245 : Files default to unwritable when permissions are changed in… #246
2018-06-21 17:43:31 +02:00
Benjamin Sonntag
0c6e56d146
Merge remote-tracking branch 'origin/pr-252'
2018-06-21 17:41:55 +02:00
Benjamin Sonntag
c88db87db3
Merge branch 'stable-3.1'
2018-06-21 17:36:34 +02:00
Kienan Stewart
e2edab6364
Add trailing slash to VHOST_DIR when building vhosts_all.conf
...
If VHOST_DIR is a symbolic link to another folder, no files will be found,
resulting in an empty vhosts_all.conf. A trailing slash ensures find will
properly resolve the symbolic link before searching.
2018-06-21 17:35:13 +02:00
Benjamin Sonntag
a7382b45a3
adding changelog for 3.5.0rc1
2018-06-21 17:34:47 +02:00
Benjamin Sonntag
f930bde36d
adding all patched from squeeze to wheezy then jessie.
2018-06-21 17:29:42 +02:00
cam.lafit
3525041839
No more need to package alternc-ssl
...
* Say good bye, thank a lot
2018-06-21 17:26:27 +02:00
cam.lafit
c8d94d2a50
SSL massive backport
...
* Now we integrate all alternc-feature in native alternc
* Files are backported as waiting by alternc
* Some files was renammed or moved to follow alternc installation
process
2018-06-21 17:26:27 +02:00
cam.lafit
bd53247eaf
Backport SSL functionality in alternc
...
* First step stop alternc-ssl support
2018-06-21 17:26:27 +02:00
Jonathan Demmerlé
4d8d2c1c39
some fixes
...
@media (max-width: is ugly, but well, better than nothing.
2018-06-21 10:25:41 +02:00
Kienan Stewart
cc184aa148
Merge branch '233-opendkim_broken_following_installation' into pu
2018-06-14 15:00:22 -04:00
Kienan Stewart
d7836e3928
Fix sed invocation to it runs in-place
2018-06-14 15:00:09 -04:00
Kienan Stewart
a4dcedeb5d
Merge branch '233-opendkim_broken_following_installation' into pu
2018-06-14 14:14:44 -04:00
Kienan Stewart
e040c3ad6a
Generate opendkim configuration in stretch when alternc.install is run
...
The default configuration in stretch doesn't work very well and
needs a couple of tweaks. This will generate the service files and
make sure opendkim is run as the opendkim user instead of root.
The alternc opendkim.conf template is updated so that the connection
can be made locally through a socket.
2018-06-14 14:12:14 -04:00
Kienan Stewart
3f94e81e44
Merge branch '247_escape-mysql-passwords-at-install' into pu
2018-06-14 13:26:57 -04:00
Kienan Stewart
5a4f924088
Properly escape passwords in template sed script
...
Previous changes were made to the wrong place
2018-06-14 13:25:57 -04:00
Kienan Stewart
ea9ecfcd50
Merge branch '254-cannot_create_default_domains' into pu
2018-06-14 10:51:28 -04:00
Kienan Stewart
ce80e3cdad
Fix #254 : Creating default domains for new members fails
...
A typo caused the check to see if domain delegation was allowed to
always fail.
2018-06-14 10:50:28 -04:00
Kienan Stewart
e9da389e85
Merge branch '247_escape-mysql-passwords-at-install' into pu
2018-06-13 18:04:25 -04:00
Kienan Stewart
1b08ae2638
use string templating instead of sed for creating/updating mysql configuration during install
2018-06-13 18:02:10 -04:00
Kienan Stewart
eca8d7ccdf
Escape mysql passwords in alternc install
2018-06-13 18:01:43 -04:00
Kienan Stewart
c300912d78
Merge branch '221_cannot_manage_subdomain' into pu
2018-06-12 21:17:05 -04:00
Kienan Stewart
9c1e7cccd0
Get sub_domain_id and status from get instead of post in dom_substatus
...
The submission is done through links with get parameters (see dom_edit.php)
2018-06-12 21:11:14 -04:00
Kienan Stewart
bc676f8b50
Merge apache2 configuration from branch '230-rebase-to-stretch' into pu
2018-06-12 19:36:32 -04:00
Kienan Stewart
ed3401404f
Cherrypick apache2 configuration for jessie/stretch
...
Sourced from ea3371ae34
2018-06-12 19:35:14 -04:00
Kienan Stewart
d5e07b6a67
Merge branch '245-fix_warning_when_setting_files_unwritable' into pu
2018-06-08 15:10:41 -04:00
Kienan Stewart
83d03b8ee7
Fix #245 : Files default to unwritable when permissions are changed in the file browser
2018-06-08 15:10:26 -04:00
Kienan Stewart
44e3cb0833
Merge branch '243-fix_undefined_variable_domaine_name' into pu
2018-06-08 14:33:18 -04:00
Kienan Stewart
f39e72d58a
Fixes #243 : Fix typo in domain_name variable
2018-06-08 14:32:01 -04:00
Kienan Stewart
325b913e24
Merge remote-tracking branch 'koumbit/stable-3.1' into pu
2018-06-07 13:22:42 -04:00