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
|
8a736d1c81
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/config/common.php
# protected/humhub/modules/content/components/actions/ContentContainerStream.php
# protected/humhub/modules/space/models/Membership.php
# protected/humhub/modules/space/views/space/home.php
# protected/humhub/modules/stream/actions/Stream.php
# protected/humhub/modules/stream/widgets/StreamViewer.php
# protected/humhub/modules/user/models/User.php
# protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php
# themes/HumHub/css/theme.css
|
2016-09-12 19:29:05 +02:00 |
|
Sebastian Stumpf
|
dc6be0f11e
|
Added eclipse environment files to .gitignore.
|
2016-07-13 14:30:20 +02:00 |
|
buddha87
|
6eb0b942ff
|
JS rewrite . initial stream implementation.
|
2016-04-28 14:35:30 +02:00 |
|
buddha87
|
2a4bb0a0a5
|
Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
|
2016-04-19 15:52:30 +02:00 |
|
buddha87
|
15cc36822c
|
Added package.json, pjax dependencie + js rewrite enhancements
|
2016-04-19 15:47:05 +02:00 |
|
Lucas Bartholemy
|
ed19da7b48
|
Enh #1634: Added favicon.ico to gitignore
|
2016-04-14 16:49:11 +02:00 |
|
Lucas Bartholemy
|
0b94bfe347
|
Changed gitignore theming
|
2015-08-30 21:24:45 +02:00 |
|
Lucas Bartholemy
|
1e506da60f
|
Admin/Content module restructured / yii2 changes
|
2015-06-25 02:22:49 +02:00 |
|
Lucas Bartholemy
|
e830e0363c
|
Removed .gitmodules from repostitory
|
2014-08-16 15:33:09 +02:00 |
|
Lucas Bartholemy
|
194345755e
|
Moved (dynamic) local settings into own folder config/local. Cleanup .gitingore stuff
|
2014-07-25 14:43:00 +02:00 |
|
Lucas Bartholemy
|
04641cb094
|
Updated Ignore && Modules
|
2014-02-10 10:06:46 +01:00 |
|
Lucas Bartholemy
|
d3ff1c3c4a
|
Initial Commit
|
2014-02-10 06:36:00 +01:00 |
|