Evgeniy Tkachenko
f4a608ed89
corrected ru messages
2018-01-05 15:31:53 +03:00
Carlos Ferreira
42b0718521
Typo and format
...
Typo = We´ll to We'll
2018-01-05 13:21:04 +01:00
Lucas Bartholemy
f444c6b0e3
Merge pull request #2872 from danielkesselberg/remove-dead-code
...
Remove dead code
2018-01-04 15:31:33 +01:00
Daniel Kesselberg
11ae3866c9
Fix use statment
2018-01-04 15:04:00 +01:00
Lucas Bartholemy
c7f39e9760
Update CHANGELOG_DEV.md
2018-01-04 14:53:49 +01:00
Lucas Bartholemy
97d0289f40
Merge pull request #2881 from danielkesselberg/fix-birthday-field
...
Use medium as date format
2018-01-04 14:49:11 +01:00
Lucas Bartholemy
c6ae6a6260
Merge pull request #2875 from danielkesselberg/resend-member-invitations
...
Resend member invitations (#2811 )
2018-01-04 14:45:49 +01:00
Lucas Bartholemy
8da36c1e0d
Merge branch 'v1.3-dev' into resend-member-invitations
2018-01-04 14:45:36 +01:00
Lucas Bartholemy
04fc5b2b9d
Merge branch 'v1.3-dev' into resend-member-invitations
2018-01-04 14:44:06 +01:00
Lucas Bartholemy
359467c9ba
Merge pull request #2873 from danielkesselberg/temporary-connection
...
Use temporary connection object
2018-01-04 14:41:22 +01:00
Lucas Bartholemy
e9315f9b00
Merge pull request #2884 from danielkesselberg/custom-phpcs-ruleset
...
Add custom phpcs configuration
2018-01-04 13:20:49 +01:00
Daniel Kesselberg
358f467a8e
Add custom phpcs configuration
2018-01-03 22:18:12 +01:00
Daniel Kesselberg
2c4b44f8a8
Array short
2018-01-03 21:57:59 +01:00
Daniel Kesselberg
f9f6e693f5
Single quotes
2018-01-03 16:22:51 +01:00
Daniel Kesselberg
32c38db396
Refactor birthday field
2018-01-03 16:18:34 +01:00
Daniel Kesselberg
f3e43b0e4f
Refactor birthday field
2018-01-03 16:16:27 +01:00
Daniel Kesselberg
a3ae39c87f
Use medium as date format
2018-01-02 20:29:10 +01:00
Lucas Bartholemy
aba03d97e1
Enh: Ensure valid permalinks when URL rewriting is enabled
2018-01-02 13:01:23 +01:00
Daniel Kesselberg
25f97d9aef
Use @inheritdoc for phpdoc
2018-01-01 15:10:50 +01:00
Daniel Kesselberg
687f2e69b3
Fix more codeclimate warnings
2017-12-31 18:40:16 +01:00
Daniel Kesselberg
3bc93961d7
Fix more codeclimate warnings
2017-12-31 18:30:08 +01:00
Daniel Kesselberg
cdbcbc3f06
Fix more codeclimate warnings
2017-12-31 18:07:03 +01:00
Daniel Kesselberg
b92ec87555
Code Style
2017-12-31 16:35:11 +01:00
Daniel Kesselberg
6eca54ada4
Code Style
2017-12-31 16:27:40 +01:00
Daniel Kesselberg
974609ff6f
Code Style
2017-12-31 16:18:07 +01:00
Daniel Kesselberg
8249b7a71e
Code Sty<le
2017-12-31 16:13:54 +01:00
Daniel Kesselberg
0f863f26a3
Generate messages
2017-12-31 15:49:00 +01:00
Daniel Kesselberg
959548ffd6
Add resend invitation action
2017-12-31 15:37:01 +01:00
Daniel Kesselberg
913d7c411e
Add button for resend
2017-12-31 15:36:26 +01:00
Daniel Kesselberg
6a04ee53ab
Add view for resend
2017-12-31 15:36:06 +01:00
Daniel Kesselberg
463f60a77f
Use temporary connection object
2017-12-30 23:17:17 +01:00
Daniel Kesselberg
cfcbfa9e10
Remove dead code
2017-12-30 23:13:20 +01:00
Lucas Bartholemy
fb48ef024a
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
2017-12-24 10:42:03 +01:00
Lucas Bartholemy
14e607bb46
Use full view path to allow overwrites
2017-12-24 10:41:49 +01:00
Lucas Bartholemy
47edda4751
Enh: Added option ContentContainerController to restrict container type
2017-12-24 10:41:25 +01:00
Lucas Bartholemy
ae5252abbd
Merge pull request #2868 from acs-ferreira/patch-5
...
Don't reset opcache before invalidate $configFile
2017-12-23 12:00:08 +01:00
Lucas Bartholemy
ef4bfc0ce1
Merge pull request #2869 from Felli/patch-1
...
Fix: Let's Encrypt ACME Error
2017-12-23 11:21:36 +01:00
Sarah Tsumayoi
4b400a61ad
Update CHANGELOG.md
2017-12-23 19:12:07 +09:00
Sarah Tsumayoi
5672d3643b
Fix: Let's Encrypt ACME Error
...
The issue is seen on the community site [here](https://community.humhub.com/content/perma?id=133524 ).
2017-12-23 19:09:54 +09:00
Carlos Ferreira
d54b2065ca
Don't reset opcache before invalidate $configFile
2017-12-22 23:00:58 +01:00
Lucas Bartholemy
16e14b622e
Fixed master merge failure
2017-12-22 20:32:35 +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
92aa54151f
Merge branch 'master' into v1.3-dev
...
# Conflicts:
# protected/humhub/libs/ActionColumn.php
# protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
2017-12-22 19:35:20 +01:00
Lucas Bartholemy
a0c4945025
Fixed ActionColumn URL handling without id attribute
2017-12-22 19:30:10 +01:00
Lucas Bartholemy
2854a82f01
Fix #2867 : User profile view broken
2017-12-22 19:28:17 +01:00
Lucas Bartholemy
a53957967b
Updated CHANGELOG.md
2017-12-22 14:10:12 +01:00
Lucas Bartholemy
d7539f41ff
Merge pull request #2864 from githubjeka/patch-2
...
The fix for alignment of username in a comment
2017-12-22 14:01:27 +01:00
Lucas Bartholemy
2741e34144
Merge pull request #2865 from Felli/patch-1
...
Fix: Add some grammar fixes
2017-12-22 14:00:21 +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
Evgeniy Tkachenko
e5e712c536
Merge branch 'master' into patch-2
2017-12-22 14:48:11 +03:00
