mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-24 11:14:00 +01:00
Code Issues Projects Releases Wiki Activity
5,069 Commits 118 Branches 157 Tags
Commit Graph

5069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
c82e163938 Set Base URL prior init 2018-06-22 16:08:40 +02:00
buddh4
e8c0cdc7cb - Fixed multiple ContentTag afterSave definition 
- Fixed missing import in DashboardStreamAction
 2018-06-21 18:01:49 +02:00
buddh4
269cec204e Build theme.css 2018-06-21 18:00:44 +02:00
buddh4
00038723fa Fixed cannotLoadMore stream entry behaviour. 2018-06-21 18:00:16 +02:00
buddh4
de6cb8271b Merge remote-tracking branch 'remotes/origin/v1.3-dev' into dev-topics 
# Conflicts:
#	protected/humhub/modules/activity/widgets/views/activityStream.php
#	protected/humhub/modules/content/components/ContentActiveRecord.php
#	protected/humhub/modules/content/models/ContentTag.php
#	protected/humhub/modules/content/tests/codeception/_support/_generated/UnitTesterActions.php
#	protected/humhub/modules/content/widgets/ContentTagDropDown.php
#	protected/humhub/modules/dashboard/components/actions/DashboardStream.php
#	protected/humhub/modules/dashboard/controllers/DashboardController.php
#	protected/humhub/modules/dashboard/views/dashboard/index.php
#	protected/humhub/modules/friendship/models/Friendship.php
#	protected/humhub/modules/space/modules/manage/views/default/index.php
#	protected/humhub/modules/space/views/space/_layout.php
#	protected/humhub/modules/stream/actions/Stream.php
#	protected/humhub/modules/stream/widgets/StreamViewer.php
#	protected/humhub/modules/ui/Module.php
#	protected/humhub/modules/ui/config.php
#	protected/humhub/modules/ui/module.json
#	protected/humhub/modules/user/models/GroupPermission.php
#	protected/humhub/tests/codeception/_support/FunctionalTester.php
#	protected/humhub/widgets/BasePickerField.php
#	protected/humhub/widgets/BootstrapComponent.php
#	protected/humhub/widgets/ContentTagDropDown.php
#	protected/humhub/widgets/InputWidget.php
#	protected/humhub/widgets/JsWidget.php
#	protected/humhub/widgets/Label.php
#	protected/humhub/widgets/LayoutAddons.php
#	protected/humhub/widgets/MultiSelectField.php
#	static/js/humhub/humhub.ui.modal.js
#	static/js/jquery.pjax.modified.js
#	themes/HumHub/css/theme.css
 2018-06-21 16:27:42 +02:00
buddh4
f9dc3a0140 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 
# Conflicts:
#	protected/humhub/tests/codeception/_support/_generated/AcceptanceTesterActions.php
 2018-06-21 12:04:04 +02:00
buddh4
67eb5fba2e Added humhub\modules\content\components\ActiveQueryCotnent::contentTag() content filter 2018-06-21 11:41:01 +02:00
buddh4
1b716e2951 - Fixed new richtext on comments 
- Aligned richtext style
 2018-06-21 11:36:11 +02:00
buddh4
8e85283a24 Fixed invalid access level of humhub\modules\queue\driver\Instant::status() 2018-06-20 16:19:13 +02:00
buddh4
606ca66c5c Added javascript-stream.md documentation 2018-06-20 16:05:25 +02:00
buddh4
bd99cd8b1a Reverted stream filter style 2018-06-20 16:04:45 +02:00
buddh4
ddb9e62b2a - Added abstract stream.Stream.initEvents() to Stream javascript API 
- Fixed topic badges are not updated on stream-filter-bar
- Fixed only show show-more stream button if last entry was not already loaded
 2018-06-20 16:03:38 +02:00
Lucas Bartholemy
9230378737 Enh: Added UTC only timezone in server timezone dropdown 2018-06-20 12:14:47 +02:00
Andrey Azarko
9ba985a688 fix #2713 2018-06-17 01:40:38 +03:00
buddh4
4f20732e3c
Merge pull request #3183 from marvinhuebner/bugfix/remove-debugger 
[BUGFIX] remove `debugger;` in javascript from spaces tour
 2018-06-14 22:02:18 +02:00
Marvin Hübner
191a170a3c [BUGFIX] remove debugger; in javascript from spaces tour 2018-06-14 13:36:34 +02:00
Lucas Bartholemy
b26d41e072 Enh: Allow enable/disable modules by CLI 2018-06-14 11:14:30 +02:00
Tahrz
2ae4deb0c8
Add is_array check 2018-06-14 09:14:31 +03:00
Tahrz
f929a6ee03
Fix for humhub\components\Theme 
Fix for Theme class force `pathMap` change. So now, you can change module default views in your config files with `pathMap`.
 2018-06-13 17:08:02 +03:00
haykhakobyan94
7c8858691f fix errors 2018-06-13 15:22:06 +04:00
haykhakobyan94
f4a296bae7 fixing errors 2018-06-13 15:12:36 +04:00
haykhakobyan94
d27e197616 fixing errors 2018-06-13 15:05:08 +04:00
haykhakobyan94
88fd8cf8ad fixing errors 2018-06-13 14:51:54 +04:00
haykhakobyan94
375757f60a fixing errors 2018-06-13 14:45:33 +04:00
haykhakobyan94
d198661f9b fixing errors 2018-06-13 14:36:51 +04:00
haykhakobyan94
46c9356740 fixing errors 2018-06-13 14:33:13 +04:00
haykhakobyan94
52d31fac75 fixing errors 2018-06-13 14:16:19 +04:00
haykhakobyan94
8e5b9cfcec fixing errors 2018-06-13 14:11:46 +04:00
haykhakobyan94
27326513e1 fixes 2018-06-13 14:04:59 +04:00
haykhakobyan94
7f555c7a96 fixing test 2018-06-13 13:55:19 +04:00
haykhakobyan94
8f572e4a3a fix 2018-06-12 22:30:22 +04:00
haykhakobyan94
dc9bbb163d adding activities 2018-06-12 22:28:35 +04:00
Lucas Bartholemy
5881a4682c Added CSS class for search menu item 2018-06-12 14:19:35 +02:00
Lucas Bartholemy
ac7c558bbe Merge branch 'master' of github.com:humhub/humhub 2018-06-11 17:23:59 +02:00
Lucas Bartholemy
86b192483e Allow text overwrite of content delete modal 2018-06-11 17:23:46 +02:00
Daniel Kesselberg
81616a9a65
Fix merge conflict (#3168) 
* 🐛 Fix merge conflict

* 🐛 Fix merge conflict
 2018-06-07 18:33:21 +02:00
Daniel Kesselberg
e4bf634b71
🐛 Fix merge conflict (#3167) 2018-06-07 17:48:08 +02:00
Carlos Ferreira
7dc71f8bbe Use statements and clean (#3166) 
* Use statements and clean

* Format Settings

* Format Membership

* Format RequestMembershipForm

* Format InviteForm

* Format MemberRemoved

* Format MemberAdded

* Format Created

* Format memberRemoved

* Format memberAdded

* Format memberAdded

* Format created

* Format SpaceController

* Format MembershipController

* Format CreateController

* Format SecurityTabMenu

* Format PendingApprovals

* Format MemberMenu

* Format DefaultMenu

* Format pendingApprovals

* Format permissions

* Format index

* Format index

* Format pending-invitations

* Format pending-approvals

* Update pending-approvals.php

* Format index

* Format change-owner

* Format cropBanner

* Format crop

* Format index

* Format delete

* Format advanced

* Format MembershipSearch

* Format DeleteForm

* Format AdvancedSettingsSpace

* Format ModuleController

* Format MemberController

* Typo

* Format ImageController

* Format Controller

* Format InviteDeclined

* Format InviteAccepted

* Format Invite

* Format ApprovalRequestDeclined

* Format ApprovalRequest

* Format InviteUsers

* Format CreatePublicSpace

* Format CreatePrivateSpace

* Format config

* Format Events

* Format Wall

* Format SpacePickerField

* Format SpaceNameColorInput

* Format SpaceChooserItem

* Format Sidebar

* Format Picker

* Format Menu

* Format MembershipButton

* Format Members

* Format ListBox

* Format InviteModal

* Format InviteButton

* Format and typo

* Format HeaderControlsMenu

* Format Header

* Format FollowButton

* Format Chooser

* Format BrowseMenu

* Format spaceWall

* Format spacePicker

* Format spaceNameColorInput

* Format spaceChooserItem

* Format requestMembershipSave

* Format requestMembership

* Format membershipButton

* Format and enconde $title

* Format header

* Format _sidebar

* Format _layout

* Format requestMembershipSave

* Format modules

* Typo

* Format create
 2018-06-07 16:36:35 +02:00
Lucas Bartholemy
3ee9cfb6e5
#3164 Update requirements 2018-06-07 09:29:36 +02:00
Sarah Tsumayoi
a72a928853
Enh: Add Snippets documentation 
Add a few examples of snippets for the docs later can be changed however.
 2018-06-07 11:06:58 +09:00
Daniel Kesselberg
490bbaeedc Merge branch 'update-acceptance-tests' into v1.3-dev 2018-06-06 21:11:43 +02:00
buddh4
56a036b071 Merge branch 'master' of https://github.com/humhub/humhub 2018-06-06 16:45:04 +02:00
buddh4
cc1ac14cc7 Added test output and codeception build classes to .gitignore 2018-06-06 16:39:50 +02:00
buddh4
50609cfe71
Merge pull request #3160 from danielkesselberg/update-acceptance-tests 
Update configuration for acceptance suite
 2018-06-06 16:28:05 +02:00
Lucas Bartholemy
06fe164228 Enh: Automatic theme stylesheet loading including parent theme stylesheets 
Chg: Moved OpenSans font to core assets
 2018-06-05 16:26:48 +02:00
Lucas Bartholemy
55db7de41e Improved IDE autocompletion 2018-06-05 15:11:53 +02:00
Lucas Bartholemy
d10385f677 Enh: Added Theme cascading to reduce view overwrites 2018-06-05 11:24:27 +02:00
Lucas Bartholemy
fa8b2508a2 Updated CHANGELOG_DEV.md 2018-06-05 02:08:30 +02:00
Lucas Bartholemy
ddd0463de3
Merge pull request #3076 from githubjeka/v1.3-dev-notify-membership 
Added notification for MembershipSpace by role member changes
 2018-06-05 02:06:33 +02:00
Lucas Bartholemy
d0ff232b4d
Merge branch 'v1.3-dev' into v1.3-dev-notify-membership 2018-06-05 01:18:29 +02:00