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
Lucas Bartholemy
662b71f7ee
- Chg: Migrated view and theme components to humhub\modules\ui\view package
...
- Enh: Improved Theme component
2018-06-05 01:13:02 +02:00
Lucas Bartholemy
84c4eff90e
Minor php style fix
2018-06-05 01:04:44 +02:00
Lucas Bartholemy
4e763b6eb0
Enh: BaseSettingsManager allow to bunch delete settings with prefix
2018-06-05 00:47:16 +02:00
Lucas Bartholemy
33931943d5
Merge pull request #3074 from Felli/patch-1
...
Enh/Fix: Cache Handling + File Preview Fix
2018-06-04 10:14:47 +02:00
githubjeka
754e90c896
Refactoring for GroupController
2018-06-04 08:14:46 +03:00
Sarah Tsumayoi
1869904534
Merge branch 'v1.3-dev' into patch-1
2018-06-03 21:14:11 -04:00
Lucas Bartholemy
ceb6f4c7fb
Updated composer dependencies
2018-06-04 01:16:00 +02:00
Lucas Bartholemy
749d82bd8a
Merge pull request #3141 from acs-ferreira/patch-10
...
Better Apache 2.4 support
2018-06-04 01:00:05 +02:00
Lucas Bartholemy
6e91d093bc
Updated CHANGELOG_DEV.md
2018-06-04 00:56:51 +02:00
Lucas Bartholemy
a8d2c236b8
Updated CHANGELOG.md
2018-06-04 00:55:54 +02:00
Lucas Bartholemy
6d98b1923c
Merge pull request #3114 from Felli/patch-5
...
Chg: Create a new one. to Forgot your password?
2018-06-04 00:55:10 +02:00
Lucas Bartholemy
5f6f1d05c6
Merge branch 'v1.3-dev' into patch-5
2018-06-04 00:54:34 +02:00
Lucas Bartholemy
93819aba27
Merge pull request #3151 from acs-ferreira/patch-12
...
#3148 : Rely on Max Upload Settings for Logo and Profile uploads
2018-06-04 00:45:46 +02:00
Lucas Bartholemy
1211d4b269
Update licences.md
2018-06-04 00:39:50 +02:00
Lucas Bartholemy
3ae15a15bb
Merge pull request #3137 from acs-ferreira/patch-9
...
Clean Invite model
2018-06-04 00:32:28 +02:00
Lucas Bartholemy
c104dd0fa8
Merge pull request #3154 from acs-ferreira/patch-13
...
Show 'never' instead of fake date
2018-06-04 00:30:34 +02:00
Lucas Bartholemy
88dc34955e
Merge branch 'master' into v1.3-dev
...
# Conflicts:
# protected/humhub/components/Module.php
# protected/humhub/components/ModuleManager.php
# protected/humhub/config/common.php
# protected/humhub/modules/content/components/ContentActiveRecord.php
# protected/humhub/modules/content/models/Content.php
# protected/humhub/modules/space/behaviors/SpaceModelMembership.php
# protected/humhub/modules/space/models/Space.php
# protected/humhub/modules/space/views/space/_layout.php
# protected/humhub/modules/user/views/profile/_layout.php
# protected/humhub/tests/codeception/_support/HumHubDbTestCase.php
# protected/humhub/widgets/ContentTagDropDown.php
# protected/humhub/widgets/LayoutAddons.php
2018-06-03 22:24:50 +02:00
Lucas Bartholemy
50a30e7952
Fix: Improved ZendLucence driver error handling
2018-06-03 16:41:44 +02:00
Carlos Ferreira
27ac53aef6
Update pending-invitations.php
2018-06-03 00:22:05 +02:00
Daniel Kesselberg
b07597ee4e
💚 Adjust configuration for selenium
2018-06-02 19:54:53 +02:00
Daniel Kesselberg
929908be98
💚 Adjust configuration for user
2018-06-02 19:43:25 +02:00
Daniel Kesselberg
e12a857ce9
💚 Run codeception with env travis
2018-06-02 19:43:04 +02:00
Daniel Kesselberg
8614cdc6fe
💚 Set selenium as default for acceptance tests
2018-06-02 19:41:04 +02:00
Daniel Kesselberg
04a6c8cc50
💚 Add env for travis & firefox
2018-06-02 19:40:13 +02:00
Daniel Kesselberg
d813305b28
💚 Add env for travis & firefox
2018-06-02 19:39:59 +02:00
