mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-15 20:49:46 +01:00
Code Issues Projects Releases Wiki Activity
2,133 Commits 134 Branches 158 Tags
Commit Graph

2133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddha87
1f28edb506 Merge pull request #1738 from buddha87/master 
Documentation enhancements
 2016-05-19 18:49:14 +02:00
buddha87
14a219e745 Documentation enhancements 2016-05-19 18:48:08 +02:00
buddha87
ce4c78e362 Merge pull request #1735 from buddha87/master 
Documentation enhancements
 2016-05-19 14:21:50 +02:00
buddha87
16474755c7 Merge branch 'master' of https://github.com/humhub/humhub 2016-05-19 14:17:16 +02:00
buddha87
8b1604f437 Documentation enhancements 2016-05-19 14:17:05 +02:00
Lucas Bartholemy
d7da514fa3 Added git stable branch notice 2016-05-19 01:14:28 +02:00
Lucas Bartholemy
35af3452aa Fixed: Determine requests hostInfo on given baseUrl 2016-05-19 00:49:19 +02:00
Lucas Bartholemy
6cc323fb6d Merge branch 'master' of github.com:humhub/humhub 2016-05-18 16:23:03 +02:00
Lucas Bartholemy
10709038f3 Enh: Optimized space header member count 2016-05-18 16:22:37 +02:00
buddha87
6fac50d840 Merge pull request #1723 from buddha87/master 
Documentation ehnhancements
 2016-05-17 16:18:00 +02:00
buddha87
af92c8a7b5 Merge branch 'master' of https://github.com/humhub/humhub 2016-05-17 16:17:07 +02:00
buddha87
1dfeff1aed Documentation enhancements 2016-05-17 16:16:05 +02:00
buddha87
1c52bcfc92 Merge pull request #1710 from nminelle/master 
Corrected typo in the mail view (space removed)
 2016-05-11 20:41:29 +02:00
Nicolas Minelle
3dae0ab298 fr corrections 2016-05-11 19:38:00 +02:00
Nicolas Minelle
8408596d7a Corrected typo (space removed) 2016-05-11 18:30:04 +02:00
Nicolas Minelle
e62ec1a90b Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	protected/humhub/modules/directory/messages/fr/views_directory_members.php
#	protected/humhub/modules/user/messages/fr/widgets_views_profileHeader.php
#	protected/humhub/modules/user/messages/fr/widgets_views_userFollower.php
#	protected/humhub/modules/user/messages/fr/widgets_views_userSpaces.php
 2016-05-11 18:26:13 +02:00
Lucas Bartholemy
5091f40d09 Merge pull request #1708 from davidjeddy/patch-1 
Update BaseMenu.php
 2016-05-11 09:35:23 +02:00
David J Eddy
46285c3ebf Update BaseMenu.php 
Corrected DocBlock to properly work with IDE type hinting
 2016-05-10 17:12:54 -04:00
Lucas Bartholemy
3a8b448eab Merge pull request #1698 from 3cst4sy/cherrypick 
Translations added
 2016-05-09 13:49:27 +02:00
xTc
47dcef5faa Translations added 2016-05-09 02:06:20 +02:00
Lucas Bartholemy
bd48f50c4d Fixed #1597: Changed datatype (activity / object_id) to integer v1.0.1 2016-05-02 00:11:45 +02:00
Lucas Bartholemy
73279be477 Fixed #1664: Misleading error message on module uninstall 2016-05-02 00:01:36 +02:00
Lucas Bartholemy
39112b860a Fixed #1667: Added share panel checkbox to account settings 2016-05-01 23:56:01 +02:00
Lucas Bartholemy
bca31ae3c6 Merge pull request #1662 from evolved37/patch-2 
Update forms_AuthenticationLdapSettingsForm.php
 2016-05-01 22:08:53 +02:00
Lucas Bartholemy
594f3c74ea Merge pull request #1670 from cebe/patch-1 
Update views_config_admin.php
 2016-05-01 22:08:34 +02:00
Lucas Bartholemy
d1b125a9d4 Merge pull request #1675 from TadWohlrapp/master 
Added "disabled" attribute to un-editable <select> fields
 2016-05-01 22:08:12 +02:00
Lucas Bartholemy
5b4373aba1 Fixed #1668: Missing import of LDAP exception 2016-05-01 19:24:38 +02:00
Lucas Bartholemy
aad2063e6c Revert config/common.php change (commit ae502d3f0dac9bd6f113bd5b5a34bc603206ae5e) 2016-05-01 19:19:47 +02:00
HumHub Translate
ae502d3f0d Enh: Updated Translations (translate.humhub.org) 2016-05-01 17:59:17 +02:00
Lucas Bartholemy
d5757096be Fixed: Don't set empty UrlManager baseUrl in console application 2016-04-30 13:29:28 +02:00
Lucas Bartholemy
41f39050e1 Fixed: Non "returning" redirects in various actions 2016-04-29 22:28:20 +02:00
Tad Wohlrapp
8741cff058 Added "disabled" for un-editable fields 
Now un-editable <select> fields are shown as disabled. See commit 0e4f02dbc5c2d7e67b65812b3d2ff57211428f2e
 2016-04-27 22:43:00 +02:00
Tad Wohlrapp
0e4f02dbc5 Added option readonly for <select> elements 
Goes together with another Commit in protected\humhub\compat\HForm.php (marking un-editable fields as disabled and readonly).
Before, a <select> element wasn't disabled even though it couldn't be edited. The user changed a value and saved the change, but the value would remain unchanged. Now the <select> element is disabled and greyed out, so the user knows they can't change anything there.
 2016-04-27 22:39:27 +02:00
Tad Wohlrapp
003e241b1b Fixed small LdapException error 2016-04-27 22:28:56 +02:00
Tad Wohlrapp
cf45a70f74 Corrected typo 2016-04-27 22:19:55 +02:00
Carsten Brandt
49cdc0b4d9 Update views_config_admin.php 
typo fix.
 2016-04-27 17:39:28 +02:00
Lucas Bartholemy
3e0a507cea Fixed #1661 #1666 #1578: Fixed requirement error when no INTL is installed 2016-04-25 15:14:30 +02:00
Lucas Bartholemy
c2a650d399 Merge branch 'master' of github.com:humhub/humhub 
Conflicts:
	protected/humhub/modules/comment/messages/fr/widgets_views_form.php
 2016-04-24 20:15:58 +02:00
HumHub Translate
2166dc2a0a Enh: Updated Translations (translate.humhub.org) 2016-04-24 19:58:52 +02:00
Nicolas Minelle
aa833837a7 Enh New translations for French 2016-04-20 19:37:56 +02:00
Nicolas Minelle
d445860bd0 Merge remote-tracking branch 'upstream/master' 2016-04-20 18:36:51 +02:00
buddha87
a0d1ae7831 Merge pull request #1656 from buddha87/master 
Documentation and crop image fix
 2016-04-20 15:06:55 +02:00
buddha87
c231d034ee Fixed close crop image by drag outside of the modal. 2016-04-20 15:04:30 +02:00
buddha87
144b13c9cf Merge branch 'master' of https://github.com/humhub/humhub 2016-04-20 15:02:29 +02:00
Lucas Bartholemy
24790cf7e5 Fixed: Broken 72px apple touch icon url 2016-04-20 13:07:26 +02:00
buddha87
b78f3413c8 Added Documentation 2016-04-19 23:35:10 +02:00
buddha87
7d8658857d Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:34:28 +02:00
buddha87
cdb255e679 Use of fully qualified column names for user approval search. 2016-04-19 17:33:33 +02:00
buddha87
1edc188c4a Merge pull request #1655 from buddha87/master 
Fixed #1652 use fully qualified column names for user search
 2016-04-19 17:18:36 +02:00
buddha87
811b061455 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:16:15 +02:00