mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-18 06:38:14 +01:00
Code Issues Projects Releases Wiki Activity
2,027 Commits 102 Branches 157 Tags
Commit Graph

2027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
78577c0448 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-03-04 16:41:42 +01:00
Lucas Bartholemy
1ef80425e5 Merge branch 'master' into v1.1-dev 
Conflicts:
	protected/humhub/modules/user/libs/Ldap.php
 2016-03-04 16:41:26 +01:00
Lucas Bartholemy
974a57543a Enh: Improved cache busting for css/js files 2016-03-04 16:39:57 +01:00
buddha87
ac36e6ae50 Allow overwriting default messages per configuration + Allow restriction of allowed languages. 2016-03-04 15:33:24 +01:00
Lucas Bartholemy
9246210a23 Fixed: Profile link for guests 2016-03-04 11:30:35 +01:00
Lucas Bartholemy
60fd32e3dc Fixed: Latest version caching problem 2016-03-04 10:44:18 +01:00
Lucas Bartholemy
4e49577995 Enh: Added fixed link to current users profile 2016-03-03 23:52:52 +01:00
buddha87
a761e5d233 Merge pull request #1526 from helnokaly/master 
Fix issue #1515 Edit post with empty string
 2016-03-03 16:24:21 +01:00
helnokaly
aeecc7fc1d use jQuery .replaceWith() instead of .html() 2016-03-03 14:42:54 +02:00
helnokaly
871fd57570 Fix issue #1515 Edit post with empty string 2016-03-03 13:23:52 +02:00
Lucas Bartholemy
6223375df3 Fixed: Improved space invite lightbox error handling 2016-03-01 14:41:32 +01:00
Sebastian Stumpf
76be682ea4 Reversing order of pagetitles. 2016-03-01 13:11:15 +01:00
Lucas Bartholemy
78dd8becbc Enh: Added friendship private content to ActiveQueryContent 2016-02-28 21:57:22 +01:00
Lucas Bartholemy
34ae2818d2 Fixed: UserFollow Button 2016-02-28 21:46:21 +01:00
Lucas Bartholemy
c77d3964dd Enh: Added theme migration note for beta-4 2016-02-27 19:20:52 +01:00
Lucas Bartholemy
279054d13b Enh: Enabled AssetManager Cache Busting v1.0.0-beta.4 2016-02-27 16:21:15 +01:00
Lucas Bartholemy
95de5c41b7 Fixed: Markdown editor CSS padding 2016-02-27 16:04:29 +01:00
Lucas Bartholemy
7b47970032 Fixed: Markdown Editor preview padding 2016-02-27 09:34:34 +01:00
Lucas Bartholemy
8a2894837a Fixed: Added more infos to ldap sync error log 2016-02-27 09:05:42 +01:00
Lucas Bartholemy
be9a0f6919 Merge branch 'master' into v1.1-dev 
Conflicts:
	protected/humhub/modules/user/libs/Ldap.php
	protected/humhub/modules/user/widgets/ProfileHeader.php
	protected/humhub/modules/user/widgets/views/profileHeader.php
 2016-02-27 08:53:28 +01:00
Lucas Bartholemy
afc0f6112d Fixed #1458: Birthday Date is saved off by one 2016-02-27 08:46:15 +01:00
Lucas Bartholemy
d25913da11 Enh: Added Date profile field 2016-02-27 08:43:59 +01:00
Lucas Bartholemy
da93e9d650 Enh: Added option for admins to access private contents 2016-02-26 19:16:53 +01:00
Lucas Bartholemy
2324c2f153 Enh: Added option that admins can manage profile images/banners of all users 2016-02-26 16:10:06 +01:00
Lucas Bartholemy
c1f07e7b0d Fixed: Don't add comment link when there are no permissions 2016-02-26 15:03:16 +01:00
Lucas Bartholemy
9f0655a909 Enh: Added directory page size setting 2016-02-26 07:49:17 +01:00
Lucas Bartholemy
ac75d3decb Enh: Added can comment permission 2016-02-26 07:35:50 +01:00
Lucas Bartholemy
c21dd47022 Enh: Allow LDAP sync of date fields in arbitrary formats 2016-02-26 06:14:19 +01:00
Lucas Bartholemy
c32d9e5637 Fixed: Login via E-Mail Address 2016-02-26 06:09:56 +01:00
Lucas Bartholemy
5aca8de984 Fixed: Installer country field config 2016-02-26 06:08:58 +01:00
Lucas Bartholemy
9eea699665 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-02-26 05:58:12 +01:00
Lucas Bartholemy
5c79bf80fd Merge branch 'master' into v1.1-dev 2016-02-26 05:58:03 +01:00
Lucas Bartholemy
e81b32a11f Enh: Added default hide age option to birthday profile field type 2016-02-26 05:56:42 +01:00
Lucas Bartholemy
1fc3f89de7 Fixed: HForm readOnly option for checkbox and datetime fields 2016-02-26 05:51:04 +01:00
Lucas Bartholemy
6ee0f865d9 Enh: Allow profile field types to set default values 2016-02-26 05:46:55 +01:00
Lucas Bartholemy
862b19803e Enh: Allow LDAP sync of date fields in arbitrary formats 2016-02-26 05:43:33 +01:00
Lucas Bartholemy
35f8ab2ff6 Fixed #1485: Allow underscore in CheckClassType helper 2016-02-26 03:26:56 +01:00
buddha87
a16ea92bd0 Merge pull request #1503 from buddha87/master 
Fixed change post visibility to private if default visibility is private.
 2016-02-25 20:50:47 +01:00
buddha87
a48baf55e5 Refactor change visibility frontend logic 2016-02-25 20:39:06 +01:00
buddha87
3cf8edb516 Fixed change visibility to private if default visibility is private. 2016-02-25 20:27:14 +01:00
Lucas Bartholemy
c0cb62d8cb Merge pull request #1502 from buddha87/master 
Fixed #1318, #1467, #1501 Set visibility checkbox prop instead of att…
 2016-02-25 19:50:49 +01:00
Lucas Bartholemy
c516a452d5 Fixed #1176: Removed unused space website attribute 2016-02-25 19:12:22 +01:00
buddha87
0b342086e4 Fixed #1318, #1467, #1501 Set visibility checkbox prop instead of attribute + Don't hide public badge on profile view + Proper implementation of input placeholder replacement for richtexteditor 2016-02-25 19:05:03 +01:00
Lucas Bartholemy
bbd87a3dee Merge pull request #1500 from phorque/master 
Fix $filePath generation with Nginx when X-Sendfile is used
 2016-02-25 18:51:13 +01:00
Lucas Bartholemy
8d5f63ef19 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 
Conflicts:
	protected/humhub/modules/admin/controllers/SettingController.php
 2016-02-25 18:45:52 +01:00
Lucas Bartholemy
3e8ac428cf Merge branch 'master' into v1.1-dev 
Conflicts:
	protected/humhub/config/common.php
	protected/humhub/modules/user/models/Invite.php
	protected/humhub/modules/user/widgets/UserFollowButton.php
 2016-02-25 18:41:41 +01:00
Sebastian Stumpf
c4f2cccb61 Enh.: Extension of protected/humhub/components/Controller.php to added page titles to modules. 2016-02-25 18:05:52 +01:00
Victor Goya
4737821920 Fix $filePath generation with Nginx when X-Sendfile is used 
When I tried to use the "X-Sendfile" option with Nginx no images were displayed and I got a bunch of `substr() expects parameter 1 to be string, object given` in the logs.

Seems like we should use $filePath instead of $file here, I tried it and everything works great now :3
 2016-02-25 17:38:43 +01:00
Lucas Bartholemy
cc31bc51df Fixed #877: Removed content edit possibility on archived spaces 2016-02-25 17:35:43 +01:00
Lucas Bartholemy
5480d86c63 Fixed: Directory widget knob display height 2016-02-25 16:47:23 +01:00