7 Commits

Author SHA1 Message Date
Lucas Bartholemy
955d83be8b Revert "Merge branch 'v1.3-dev' into master"
This reverts commit 895156b2a5113f3ac87a20616e599e37ed853e7a, reversing
changes made to 28acd4040a3a7e84c90520b093eff6e977cb4f82.
2018-01-23 09:40:29 +01:00
Lucas Bartholemy
df538e14e3 Revert "Revert "Merge branch 'v1.3-dev' into master""
This reverts commit 834368140af6359eeb075b96127477c4339059d6.

# Conflicts:
#	protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
2017-12-22 19:55:12 +01:00
Lucas Bartholemy
834368140a Revert "Merge branch 'v1.3-dev' into master"
This reverts commit d2d45f7d78e54b9dcf81e023af336c5bc064b548, reversing
changes made to 3a2daed62f549a4720741b9cd5a15a83521e08e4.

# Conflicts:
#	protected/humhub/docs/guide/admin/asynchronous-tasks.md
2017-12-22 13:49:00 +01:00
githubjeka
c5d5393232 added local environments to gitignore 2017-07-20 09:59:49 +03:00
Lucas Bartholemy
e511ffdf06 Fixed Cert Path 2015-07-01 05:11:12 +02:00
luke-
08dbcbfbbf Revert "Refactor HActiveRecord and comment widgets" 2014-10-08 12:56:03 +02:00
allyraza
dd3267fc41 clean up comment widgets 2014-08-18 07:22:38 -07:00