mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-31 13:32:18 +01:00
Code Issues Projects Releases Wiki Activity
4,978 Commits 109 Branches 157 Tags
Commit Graph

4978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
ff4547c903 Fixed open space link 2018-07-02 13:46:54 +02:00
Lucas Bartholemy
9c70268134 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-07-02 13:30:31 +02:00
Lucas Bartholemy
2af6ca11d0 New cronjob handling 2018-07-02 13:30:17 +02:00
buddh4
5b7b459438 StreamCest acceptance test alignments 2018-07-02 13:29:06 +02:00
buddh4
117d727ab0 - Enh: Added error alert to moveModal in case content type is not movable. 2018-07-02 13:20:09 +02:00
buddh4
09ec260792 Added travis error output for debugging 2018-07-02 12:50:45 +02:00
buddh4
dcbacff6d6 Updated chrome driver version in travis config 2018-07-02 12:35:38 +02:00
buddh4
1a6f067a91 Production asset build 2018-07-02 12:10:06 +02:00
buddh4
dbc90d2c75 Fix: direct topicId filter not working in wallstream. 2018-07-02 12:06:45 +02:00
Lucas Bartholemy
359b85fdc9 Merge branch 'master' into v1.3-dev 
# Conflicts:
#	protected/humhub/components/Theme.php
#	protected/humhub/modules/admin/models/forms/DesignSettingsForm.php
#	protected/humhub/modules/content/resources/js/humhub.content.js
#	protected/humhub/modules/space/modules/manage/views/member/pending-invitations.php
#	protected/humhub/modules/stream/resources/js/humhub.stream.js
#	static/js/humhub/humhub.ui.richtext.js
 2018-07-02 11:12:55 +02:00
buddh4
ef5e0fdad9
Merge pull request #3178 from haykhakobyan94/add-activities-when-space-is-achieved-or-unachieved 
Add activities when space is achieved or unachieved
 2018-07-02 10:53:20 +02:00
buddh4
540e3013d7 - Moved Move logic to humhub\modules\content\controllers\MoveController.php 
- Enh: Added disable behaviour for non movable target spaces
- Fix: Invalid message source error in space permissions
 2018-07-01 15:46:44 +02:00
buddh4
ffc1fb9011 - Enh: Added Pin/Archived/Public wallentry icons 
- Enh: Smaller stream style fixes
- Enh: Added movable behavior to content type post
- Fix: Invalid use of global permission for new force invite
 2018-07-01 14:51:28 +02:00
buddh4
1097859d1e
Merge pull request #3159 from danielkesselberg/adjust-phpcs 
Update configuration for phpcs
 2018-07-01 14:41:06 +02:00
buddh4
5d9fbb1c43
Merge pull request #3189 from githubjeka/v1.3-dev-members-manager 
1.3 Added MembersManagePermission to Space Module
 2018-07-01 13:13:25 +02:00
buddh4
acaaa514d3 - Fixed hide topic picker after post submit 
- Force strip_tags for contenttags
 2018-07-01 12:21:46 +02:00
buddh4
b7971e94c9 Fixed picker value comparison check 2018-07-01 11:14:41 +02:00
buddh4
bb24d8e93d - Added Topic Picker to post form 
- Fix double topic selection
 2018-07-01 09:17:59 +02:00
buddh4
104ce26391 - Added MoveContent controller logic 
- Enabled MoveContent for content type Post
- Fixed: Wrong page title displayed
 2018-07-01 02:38:46 +02:00
buddh4
f7ed7021bf Updated npm packages 2018-07-01 02:32:20 +02:00
buddh4
b1e1143025 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 
# Conflicts:
#	protected/humhub/modules/content/components/ContentActiveRecord.php
#	protected/humhub/modules/content/widgets/WallEntryControlLink.php
 2018-06-30 22:22:54 +02:00
buddh4
151b24ccfc Added Movable ContentActiveRecord 2018-06-30 22:04:42 +02:00
githubjeka
7154590945 MembersManagePermission replaced by ManageUsers 2018-06-28 10:09:37 +03:00
Lucas Bartholemy
bde1953247 Minor fix 2018-06-27 18:54:36 +02:00
Lucas Bartholemy
2c197127e4 Updated sidebar docs 2018-06-27 18:40:12 +02:00
Lucas Bartholemy
52bde2df97 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-06-27 18:23:44 +02:00
Lucas Bartholemy
e314e035b0 Improved Space/User container layouts and sidebar handling 2018-06-27 18:23:26 +02:00
Lucas Bartholemy
6e558df85d
Merge pull request #3165 from Felli/patch-1 
Enh: Add Snippets documentation
 2018-06-27 18:16:26 +02:00
Lucas Bartholemy
0103663535 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-06-27 16:00:50 +02:00
Lucas Bartholemy
00a5229199 Ignore theme loader if baseUrl is not set 2018-06-27 16:00:36 +02:00
buddh4
9c18b17b2e Fixed timeago comment issue 2018-06-27 15:44:50 +02:00
buddh4
27d7f8749a - Enh: Added css footer-nav class for footer navigation 2018-06-27 15:05:40 +02:00
buddh4
a294d7a640 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 2018-06-27 14:54:58 +02:00
buddh4
e3867f29f8 - Fixed relative wallStream path not found 
- Fixed tests
 2018-06-27 14:54:28 +02:00
buddh4
4d4c4995c5
Merge pull request #3185 from reinq/abc 
fix #2713
 2018-06-27 13:10:29 +02:00
Lucas Bartholemy
d78e352848 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 
# Conflicts:
#	protected/humhub/docs/CHANGELOG_DEV.md
 2018-06-27 12:24:58 +02:00
buddh4
85db3f7365
Merge pull request #3079 from githubjeka/v1.3-dev-group-change-notify 
Added notification for members of groups
 2018-06-27 12:23:45 +02:00
Lucas Bartholemy
2278f27820 Chg: MySQL queue is now the default job queuing driver 2018-06-27 12:23:39 +02:00
buddh4
aa06d94696
Merge branch 'v1.3-dev' into v1.3-dev-group-change-notify 2018-06-27 11:56:30 +02:00
buddh4
4fd32d7a00
Merge pull request #3188 from Felli/patch-4 
Enh: Add steps to using Facebook Oauth
 2018-06-27 11:53:38 +02:00
buddh4
524075741f
Merge branch 'v1.3-dev' into patch-4 2018-06-27 11:53:27 +02:00
buddh4
58c42652c8
Merge pull request #3179 from Tahrz/patch-1 
Fix for humhub\components\Theme
 2018-06-27 11:51:43 +02:00
Lucas Bartholemy
1f73bc6404 fixed typo in phpdoc 2018-06-27 11:51:22 +02:00
Lucas Bartholemy
ef475caad8 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-06-27 11:49:10 +02:00
Lucas Bartholemy
9dc691fc82 Chg: Renamed information cronjob section to background jobs and added queue status 2018-06-27 11:48:56 +02:00
buddh4
b2192fa3de Fixed functional tests not working regarding ZendLuceneSearch print output. 2018-06-27 11:48:21 +02:00
buddh4
0d7926288d Fixed Content Polymorphicrelation not set when creating ContentActiveRecord 2018-06-27 11:37:12 +02:00
buddh4
55302f6d38 - Fixed unit test missing basePath 2018-06-26 18:48:51 +02:00
buddh4
e87b043162 - Fixed stream utils + tests 
- Asset Rebuild
 2018-06-26 18:11:22 +02:00
buddh4
6452f6e52c Added try/catch to BaseSettingsManager::isDatabaseInstalled() 2018-06-26 15:13:17 +02:00