buddha87
|
ae65760599
|
Major js api enhancements + stream rewrite
|
2016-10-29 01:12:52 +02:00 |
|
Lucas Bartholemy
|
c889256aa3
|
Added PJax page loading
|
2016-10-24 14:58:51 +02:00 |
|
Lucas Bartholemy
|
a1af632868
|
Directory layout code cleanup
|
2016-10-24 13:37:07 +02:00 |
|
Lucas Bartholemy
|
48113f9e6d
|
Directory layout cleanup
|
2016-10-21 15:21:56 +02:00 |
|
Lucas Bartholemy
|
ae4263c667
|
Added missing PHPdoc
|
2016-10-21 15:18:23 +02:00 |
|
Lucas Bartholemy
|
8f1a8f5db6
|
Moved LayoutAddons widget from main layout to View endBody() method
|
2016-10-21 14:15:55 +02:00 |
|
Lucas Bartholemy
|
9ca1c157af
|
Moved CSRF Tag output to View renderHeader
|
2016-10-21 14:08:33 +02:00 |
|
Lucas Bartholemy
|
bcc99af9d4
|
Moved support css/js for older IE version into own AssetBundles
|
2016-10-21 13:44:22 +02:00 |
|
Lucas Bartholemy
|
6090419f18
|
Moved icons into theme
|
2016-10-21 13:27:15 +02:00 |
|
Lucas Bartholemy
|
97be266a8a
|
Added changelog file
|
2016-10-21 13:25:23 +02:00 |
|
Lucas Bartholemy
|
b0a854db10
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/modules/admin/controllers/ModuleController.php
# protected/humhub/modules/admin/controllers/UserController.php
# protected/humhub/modules/admin/widgets/SpaceMenu.php
# protected/humhub/modules/content/Events.php
# protected/humhub/modules/content/models/Wall.php
# protected/humhub/modules/content/models/WallEntry.php
# protected/humhub/modules/dashboard/components/actions/DashboardStream.php
# protected/humhub/modules/dashboard/tests/codeception/unit/DashboardStreamTest.php
# protected/humhub/modules/space/controllers/SpaceController.php
# protected/humhub/modules/space/models/Membership.php
# protected/humhub/modules/space/widgets/SpaceNameColorInput.php
# protected/humhub/tests/codeception/unit/modules/activity/BaseActivityTest.php
# protected/humhub/tests/codeception/unit/modules/notification/BaseNotificationTest.php
|
2016-10-21 12:56:23 +02:00 |
|
Lucas Bartholemy
|
127d7d0e1e
|
Merge branch 'samdark-code-style-fixes' into v1.2-dev
|
2016-10-21 12:12:36 +02:00 |
|
Lucas Bartholemy
|
0eeeb0dd7f
|
Merge branch 'code-style-fixes' of https://github.com/samdark/humhub into samdark-code-style-fixes
# Conflicts:
# protected/humhub/modules/content/controllers/ContentController.php
|
2016-10-21 12:11:35 +02:00 |
|
buddha87
|
2c577b68a3
|
Merge branch 'master' of https://github.com/humhub/humhub
|
2016-10-21 10:47:34 +02:00 |
|
buddha87
|
e9a4364f93
|
Set 'authMode' => 'null' swift mailer setting if no username und password is given to disable mail server authentication.
|
2016-10-21 10:47:07 +02:00 |
|
Lucas Bartholemy
|
7457dd1d4c
|
Merge pull request #2039 from cebe/patch-2
Update UserController.php
|
2016-10-21 08:03:15 +02:00 |
|
Carsten Brandt
|
334fe72bf7
|
Update UserController.php
Fixed redirect URL. '/' is not correct if installed in subfolder. `Url::home()` covers all cases.
|
2016-10-20 21:52:27 +02:00 |
|
buddha87
|
0064dddbd4
|
Merge branch 'master' of https://github.com/humhub/humhub
|
2016-10-20 13:02:23 +02:00 |
|
buddha87
|
fe683220fc
|
Added unsubscribe link to default mail layout for update mails.
|
2016-10-20 12:57:33 +02:00 |
|
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 |
|