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

2747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
fbf7e4f3e8 Moved subLayout handling logic to the controller 2016-10-20 12:22:40 +02:00
Lucas Bartholemy
608f4d4119 Merge pull request #2037 from cebe/patch-2 
added note about dev env for i18n guide
 2016-10-20 09:24:02 +02:00
Carsten Brandt
593460ffe9 added note about dev env for i18n guide 
issue #2035 and others
 2016-10-20 08:36:57 +02:00
Lucas Bartholemy
100ef7355b Merge pull request #2033 from b17/issue-1968/mysql-check 
Add check for PDO Mysql extension.
 2016-10-18 16:39:05 +02:00
Lucas Bartholemy
4f3d669c97 Merge pull request #2032 from samdark/removed-unused-local-variables 
Removed unused local variables
 2016-10-18 16:38:45 +02:00
Lucas Bartholemy
a74d36f991 Merge pull request #2030 from samdark/fixed-wrong-concat-operator 
Fixed wrong concatenation operator
 2016-10-18 16:35:21 +02:00
Lucas Bartholemy
9b1652978e Merge pull request #2031 from samdark/remove-unused-use 
Removed unused use statements
 2016-10-18 16:34:51 +02:00
Lucas Bartholemy
7ff7003a46 Merge pull request #2029 from samdark/performance-fixes 
Minor performance fixes
 2016-10-18 16:34:31 +02:00
buddha87
925165c29d Show "Become this user" only for system admins. 2016-10-18 12:17:07 +02:00
buddha87
5be81a8c23 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2016-10-18 12:14:09 +02:00
buddha87
1f7c48525a Test build 2016-10-18 12:13:35 +02:00
Roman Yakovenko
2d154d1640 Add check for PDO Mysql extension. Fixes #1968 2016-10-16 13:07:58 +03:00
Alexander Makarov
0b2bbdee49 Removed unused local variables 2016-10-16 02:40:44 +03:00
Alexander Makarov
0fe99bdb03 Removed unused use statements 2016-10-16 02:30:49 +03:00
Alexander Makarov
4d0b242a3f Fixed wrong concatenation operator 2016-10-16 02:24:31 +03:00
Alexander Makarov
c0d95ed928 Minor performance fixes 2016-10-16 02:20:51 +03:00
Alexander Makarov
4fb7fad866 Fixed method name case mismatches 2016-10-16 00:55:44 +03:00
Alexander Makarov
3df4bbfc06 Non-static method should be called with $this 2016-10-16 00:31:32 +03:00
Alexander Makarov
3c640f4eb5 Added missing method modifier 2016-10-16 00:31:06 +03:00
Lucas Bartholemy
55c45bc8dc Merge pull request #2027 from b17/patch-1 
Add var keyword for container in like.js
 2016-10-15 19:23:42 +02:00
Roman Yakovenko
6040e220eb Add var keyword for container in like.js 
It can be an issue on slow connections.
 2016-10-15 17:05:12 +03:00
Lucas Bartholemy
be2f051829 DashboardContent 1.2 adjustments 2016-10-14 17:33:44 +02:00
Lucas Bartholemy
63d6afe0b3 Merge branch 'master' into v1.2-dev 
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/admin/components/Controller.php
#	protected/humhub/modules/dashboard/views/dashboard/index.php
#	protected/humhub/modules/dashboard/views/dashboard/index_guest.php
#	themes/HumHub/css/theme.css
 2016-10-14 17:30:06 +02:00
Lucas Bartholemy
8673769ab1 Space Membership Button enhancements 2016-10-14 17:15:41 +02:00
Lucas Bartholemy
2b30d68002 Cleanup content container module settings after deactivation 2016-10-14 17:13:54 +02:00
Lucas Bartholemy
037ace60a8 SettingsManager - added deleteAll method and improved boolean handling 2016-10-14 17:13:05 +02:00
Lucas Bartholemy
f7aea6532e Merge pull request #2016 from Lokke/patch-3 
Update views_mails_UserInviteSpace.php
 2016-10-14 17:10:29 +02:00
Lucas Bartholemy
4f5f0a44af Merge pull request #2020 from SilverFire/master 
Added SpaceContent widget
 2016-10-14 17:09:51 +02:00
Lucas Bartholemy
fb2371adb3 Merge pull request #2021 from SilverFire/dashboard-content 
Added DashboardContent widget
 2016-10-14 17:08:36 +02:00
Lucas Bartholemy
48cc36a0dc Merge pull request #2023 from cebe/patch-2 
fixed paths of icon and manifest.json in main layout
 2016-10-14 17:06:55 +02:00
Carsten Brandt
85899bcb5d fixed paths of icon and manifest.json in main layout 2016-10-12 23:57:53 +02:00
SilverFire - Dmitry Naumenko
7aab0a9da1 Added SpaceContent widget to have an event before dashboard content rendering 2016-10-11 18:47:30 +03:00
SilverFire - Dmitry Naumenko
39fb75ab31 Added SpaceContent widget to have an event before space content rendering 2016-10-11 14:16:20 +03:00
Lokke
2a7d3a76c2 Update views_mails_UserInviteSpace.php 
just fixed some german translations
 2016-10-07 14:50:36 +02:00
buddha87
4a4975cdf9 User Approval Fix 2016-10-06 17:08:39 +02:00
buddha87
4d6e142d9a Change language in account settings refactored. 2016-10-06 15:46:46 +02:00
buddha87
a054d665b4 Merge branch 'master' of https://github.com/humhub/humhub 2016-10-06 13:41:12 +02:00
buddha87
6508b78922 Fixed #1551 change language account setting without additional page reload. 2016-10-06 13:40:51 +02:00
buddha87
add444e14f Acceptancetest Login wait; 2016-10-06 13:19:24 +02:00
buddha87
099acb8ab0 Merge pull request #2014 from SilverFire/master 
Fixed russian spelling
 2016-10-06 12:42:47 +02:00
SilverFire - Dmitry Naumenko
329d6b09a2
Fixed russian spelling 2016-10-06 13:11:20 +03:00
buddha87
52a6ffb8a5 Travis test alignment. 2016-10-06 11:57:35 +02:00
buddha87
b6e59c1e7f Test alignments 2016-10-06 11:50:42 +02:00
buddha87
f1213ca70b Small text change. 2016-10-05 11:25:20 +02:00
buddha87
eaaf40fbbd Small text change. 2016-10-05 11:23:03 +02:00
buddha87
8f42e6151e Enhanced Permission Management/AccessControl + Aligned core testings 2016-10-05 10:40:45 +02:00
Lucas Bartholemy
10fd14782d Fixed: Ldap sync error for users empty email address 2016-09-26 17:23:14 +02:00
Lucas Bartholemy
17b3fc0801 Merge branch 'master' of github.com:humhub/humhub v1.1.1 2016-09-26 09:57:25 +02:00
Lucas Bartholemy
e4b338e93a Changed version to 1.1.1 2016-09-26 09:57:08 +02:00
Lucas Bartholemy
45bb66e1cb Merge pull request #2000 from onmotion/mobile-horizontal-scrolling 
Horizontal scrolling images on mobile devices
 2016-09-25 19:21:32 +02:00