5413 Commits

Author SHA1 Message Date
Daniel Kesselberg
39246c13ee 🎨 Single Quotes 2018-07-08 17:55:35 +02:00
Daniel Kesselberg
8f462a0db5 🎨 Single Quotes 2018-07-08 17:54:35 +02:00
Daniel Kesselberg
70272704d7 🎨 Single Quotes 2018-07-08 17:52:30 +02:00
Daniel Kesselberg
0d0f261d2f 🎨 Single Quotes 2018-07-08 17:51:10 +02:00
Daniel Kesselberg
19eb0c66e4 📝 Changelog [skip ci] 2018-07-08 17:28:23 +02:00
Daniel Kesselberg
e84c2cad48 ❇️ Add possiblity to delete invite 2018-07-08 17:22:41 +02:00
Lucas Bartholemy
06b5fe487e
Merge pull request #3203 from githubjeka/console-description
Fix bug comment in console description app
2018-07-07 11:24:06 +02:00
githubjeka
bd414c6326 Fix bug comment in console description app 2018-07-07 11:37:10 +03:00
Lucas Bartholemy
90f6a5176a Fix: ThemeLoader publishes assets on CLI requests 2018-07-07 10:27:52 +02:00
buddh4
be8a89e01e Fix: UI addition mutation observer interfering with new rich-text mutation logic 2018-07-06 22:37:33 +02:00
buddh4
6d803246ec Use of JSWidget for Notification Overview 2018-07-06 21:18:57 +02:00
buddh4
56168e572d Removed notification content init data from notification overview. 2018-07-06 20:15:46 +02:00
Lucas Bartholemy
f1ba149233
Merge pull request #3202 from githubjeka/use-statement
Remove unnecessary use statement. Fix bug on php 7.2
2018-07-06 15:53:51 +02:00
Lucas Bartholemy
b4b0897b3d Updated docs 2018-07-06 15:40:05 +02:00
Lucas Bartholemy
ae27e07aca Merge branch 'master' of github.com:humhub/humhub
# Conflicts:
#	protected/humhub/modules/user/widgets/ProfileHeader.php
2018-07-06 15:36:24 +02:00
Lucas Bartholemy
b74ada8a59 Dynamic profile/space header counter 2018-07-06 15:12:41 +02:00
githubjeka
4b0693d2ae Remove unnecessary use statement. Fix bug on php 7.2 2018-07-06 15:40:43 +03:00
Lucas Bartholemy
712a43b72e
Merge pull request #3201 from githubjeka/phpdoc-yii
Updated phpDoc. Removed duplicates properties.
2018-07-06 09:14:25 +02:00
githubjeka
ff161fe17b Updated phpDoc. Removed duplicates properties. 2018-07-06 09:08:19 +03:00
buddh4
c422756a87 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-05 12:25:18 +02:00
buddh4
de9f253cdf Fixed: Stream wall scroll event not detached on pjax call 2018-07-05 12:25:00 +02:00
Daniel Kesselberg
f62bb20fc0
Merge pull request #3199 from danielkesselberg/master
Replace array with []
2018-07-05 11:52:32 +02:00
Daniel Kesselberg
82544e4c0c 🔧 Add configuration for php-cs-fixer [skip-ci] 2018-07-05 11:50:20 +02:00
Daniel Kesselberg
21aa8ee59f 🎨 Short-Array 2018-07-05 11:48:19 +02:00
Daniel Kesselberg
171a22f69c 🎨 Short-Array 2018-07-05 11:47:53 +02:00
Daniel Kesselberg
edcfb5acd2 🎨 Short-Array 2018-07-05 11:35:18 +02:00
Daniel Kesselberg
d51300303c 🎨 Short-Array 2018-07-05 11:34:18 +02:00
Daniel Kesselberg
e4750829e5
Merge pull request #3198 from danielkesselberg/master
CodeClimate does not pickup phpcs.xml.dist
2018-07-05 11:22:24 +02:00
Daniel Kesselberg
a0808f4b63 🔧 Update codeclimate.yml to latest standard 2018-07-05 11:14:44 +02:00
Daniel Kesselberg
a221243254 🔧 CodeClimate does not pickup phpcs.xml.dist 2018-07-05 11:09:30 +02:00
Lucas Bartholemy
bea8d5a785
Merge pull request #3197 from danielkesselberg/master
Code Style #2
2018-07-05 10:38:20 +02:00
Daniel Kesselberg
ca7f720968 🎨 The closing brace for the class must go on the next line after the body 2018-07-04 22:50:34 +02:00
Daniel Kesselberg
ceed66350f 🎨 The closing brace for the class must go on the next line after the body 2018-07-04 22:46:56 +02:00
Daniel Kesselberg
3db20459fd
Merge pull request #3196 from danielkesselberg/master
Code Style
2018-07-04 22:14:29 +02:00
Daniel Kesselberg
cb18f55240 🎨 TRUE, FALSE and NULL must be lowercase
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-07-04 21:17:52 +02:00
Daniel Kesselberg
b75a4f3db5 🎨 Expected 1 blank line at end of file
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-07-04 21:09:30 +02:00
Daniel Kesselberg
f4b83e5600 Merge remote-tracking branch 'upstream/master' 2018-07-04 21:05:01 +02:00
Daniel Kesselberg
2ca60b6047
🎨 Replace "else if" with "elseif" (#3195)
* 🎨 Replace "else if" with "elseif"

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

* 🎨 Fix indention
2018-07-04 18:12:26 +02:00
Daniel Kesselberg
0e2060dd15 🎨 Fix indention 2018-07-04 18:08:10 +02:00
Daniel Kesselberg
ea2c5de468 🎨 Replace "else if" with "elseif"
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-07-04 17:53:01 +02:00
buddh4
a5a24b2ee6 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-04 17:37:36 +02:00
buddh4
26386ad709 Added deprecation section to 1.3 dev migration guide 2018-07-04 17:37:20 +02:00
Lucas Bartholemy
831e9960d8 Fixed migration link 2018-07-04 17:25:16 +02:00
Lucas Bartholemy
28b5aaac6b Merge branch 'master' of github.com:humhub/humhub 2018-07-04 16:54:34 +02:00
Lucas Bartholemy
b69cd998b8 Fixed theme loading during the installation 2018-07-04 16:54:20 +02:00
buddh4
7643b04878 Fixed #3156 members and space list modal does not close after item click 2018-07-04 16:11:39 +02:00
buddh4
e5afb19ccf Merge branch 'master' of https://github.com/humhub/humhub 2018-07-04 15:52:16 +02:00
buddh4
ef288a2f2c Fixed PHP Warning non-compound name 'Yii' has no effect in memberAdded.php 2018-07-04 15:52:00 +02:00
Lucas Bartholemy
0b7e34e97b Update doc update 2018-07-04 15:14:06 +02:00
Lucas Bartholemy
dd11d106cd Prepare 1.3.0-beta.1 release v1.3.0-beta.1 2018-07-04 15:13:03 +02:00