mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity
2,050 Commits 102 Branches 157 Tags
Commit Graph

2050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddha87
15cc36822c Added package.json, pjax dependencie + js rewrite enhancements 2016-04-19 15:47:05 +02:00
buddha87
ceeaabedc7 JS Rewrite initial API with introduction of Grunt build, script loading, humhub script additions, global modal loading, initial content implementation 2016-03-24 02:03:42 +01:00
Lucas Bartholemy
a17c6285f8 Merge branch 'master' into v1.1-dev 
Conflicts:
	protected/humhub/modules/user/libs/Ldap.php
	protected/humhub/modules/user/models/User.php
	protected/humhub/modules/user/views/auth/login.php
	protected/humhub/modules/user/widgets/UserPicker.php
	protected/humhub/modules/user/widgets/views/userPicker.php
	resources/user/userpicker.js
 2016-03-10 20:17:38 +01:00
Sebastian Stumpf
f411337cda Merge branch 'master' of https://github.com/humhub/humhub 2016-03-10 14:44:28 +01:00
Lucas Bartholemy
0979b13fe7 Fixed: Possible search race condition in cron 2016-03-10 14:08:33 +01:00
Lucas Bartholemy
d11b958e8b Enh: Added search database path config parameter 2016-03-10 14:05:59 +01:00
buddha87
a32042653a Merge pull request #1545 from buddha87/master 
Fix: Added access control for inactive user.
 2016-03-09 18:17:35 +01:00
buddha87
fa96ee0ba9 Fix: Added access control for inactive user. 2016-03-09 18:15:47 +01:00
buddha87
28fbe362ee Fix: Align username validation 2016-03-09 15:44:33 +01:00
buddha87
a92e0b6394 Extend username length migration 2016-03-09 15:23:50 +01:00
Lucas Bartholemy
f5f75b7f0a Fixed: Removed constant in group migration - to avoid potential upgrade error 2016-03-09 14:47:10 +01:00
Sebastian Stumpf
2d5e01a414 Fixed permanent deactivation of ldap users when the user is not found in ldap. 2016-03-09 14:27:50 +01:00
buddha87
e619b9463e Merge pull request #1537 from buddha87/master 
Fix: New Mail Modal Form fix
 2016-03-08 21:57:21 +01:00
buddha87
b228d88784 Merge branch 'master' of https://github.com/humhub/humhub 2016-03-08 21:55:18 +01:00
buddha87
e4c32c0c67 Clear richtext in contentcreateform 2016-03-08 21:53:14 +01:00
buddha87
0fed888aa7 Fix: New Mail Modal Form fix 
Enh: Enhanced user picker (ordering, data transfer)
Fix: Richtext clear event is triggered when contentcreateform is submitted
Enh: Removed client form validation in login form
 2016-03-08 19:26:47 +01:00
buddha87
b1568b29f8 UserFilter minor refactoring 2016-03-08 00:11:44 +01:00
buddha87
964a06ba60 SendMail Permission and Sendmail user picker filter by permission + UserFilter helper for user filter querys + Userpicker ordering of json result + Userpicker of invite to space form searches for non member groups. 2016-03-07 23:12:52 +01:00
buddha87
c4e86b898d Merge pull request #1534 from buddha87/master 
Fix: Show only members in space membership panel
 2016-03-07 16:53:09 +01:00
buddha87
8984f34cc7 Fix: Show only members in space membership panel 2016-03-07 16:49:06 +01:00
Lucas Bartholemy
b832c5cf67 Added gitignore to config message directory 2016-03-04 18:18:19 +01:00
Lucas Bartholemy
93c6d17f9a Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-03-04 17:57:41 +01:00
Lucas Bartholemy
7bbc5f241c Enh: Added @config alias 2016-03-04 17:57:01 +01:00
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