mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity
5,566 Commits 102 Branches 157 Tags
Commit Graph

86 Commits

Author SHA1 Message Date
Lucas Bartholemy
eac1f0807d Added ext-json as requirement to the composer.json 2018-12-06 17:41:05 +01:00
Lucas Bartholemy
151b6e746c Updated composer.json 2018-10-23 16:16:53 +02:00
Lucas Bartholemy
c578a4c356 Updated composer depedencies 2018-10-23 14:24:19 +02:00
buddh4
b045210f53 - Fix: Richtext loses mark state 
- Fix: New comment scroll behavior not used in comment edit view
- Chng: Updated `humhub-prosemirror-richtext` to v1.0.12
 2018-10-11 11:52:57 +02:00
Lucas Bartholemy
a3c8364b07 Downgraded codeception to 2.4.5 2018-10-10 17:44:15 +02:00
Lucas Bartholemy
e2ea60b433 Updated Composer 2018-10-10 16:30:06 +02:00
buddh4
2a7fa40737 Chng: Updated humhub-prosemirror-richtext to v1.0.10 2018-09-21 17:59:51 +02:00
buddh4
202e8404f9 Chng: Updated humhub.prosemirror dependency to 1.9 2018-09-04 18:00:47 +02:00
buddh4
0ff4f26ba6 - Fix: Suprressed stream entry button not rendered. 
- Fix: Author stream filter not working.
- Chng: Use of relative urls in richtext files/images
 2018-08-24 17:26:45 +02:00
Lucas Bartholemy
45184bc554 Updated to Yii Queue 2.1.0 2018-08-17 10:34:25 +02:00
Daniel Kesselberg
f93b36cfd6 🎨 Add sorted composer.json 2018-08-13 23:14:02 +02:00
Daniel Kesselberg
cc9c1d7842 🎨 Sort composer packages by name 2018-08-13 23:01:42 +02:00
buddh4
c7b379f2b9 Enh: Added AbstractRichTextEditor::layout in order to change richtext style 
Enh: Added `block` type RichText for non focus menu style
 2018-08-03 13:27:37 +02:00
buddh4
d3a7d404ad Update richtext to 1.0.6 2018-07-30 14:56:58 +02:00
buddh4
8cbf8cd21b Fix: File upload errors not handled by richtext 2018-07-18 16:15:06 +02:00
buddh4
c3392a16a9 - Enh: Use of new richtext version 1.0.4 see https://github.com/humhub/humhub-prosemirror/blob/master/docs/CHANGELOG.md 
- Enh: Added max-height for post/comment/edit richtext
 2018-07-17 19:31:23 +02:00
Lucas Bartholemy
2dedbdadd5 Enh: Added id data attribute on contentcontainer links 2018-07-16 18:08:47 +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
ceb6f4c7fb Updated composer dependencies 2018-06-04 01:16:00 +02:00
buddh4
92012b9861 Fixed ie11/edge prosemirror-richtext issue 
Fixed richtext link bug
 2018-04-26 18:06:00 +02:00
Carlos Ferreira
be6ac05637
Allow patch versions of Yii 2.0.14 2018-03-16 13:33:39 +01:00
Lucas Bartholemy
5347ed59b7 Enh: Added random default space color on creation 2018-03-16 13:11:58 +01:00
Lucas Bartholemy
c40d9e21df Merge branch 'master' into v1.3-dev 
# Conflicts:
#	.travis.yml
#	protected/humhub/modules/admin/controllers/UserController.php
#	protected/humhub/modules/comment/models/Comment.php
#	protected/humhub/modules/post/controllers/PostController.php
#	protected/humhub/modules/space/Events.php
#	protected/humhub/modules/user/controllers/AccountController.php
#	protected/humhub/modules/user/models/User.php
 2018-03-16 10:44:04 +01:00
Carlos Ferreira
7ce6da319e
Upgrade Yii version 2018-03-13 01:27:43 +01:00
Daniel Kesselberg
3b4b5d2efd Remove invalid repositories option 2018-03-05 21:49:35 +01:00
Daniel Kesselberg
980b63d589 Remove invalid repositories option 2018-03-05 21:47:19 +01:00
Daniel Kesselberg
5ddf93d0bb Allow 0.4.6 with php5 support 2018-03-05 21:36:28 +01:00
Daniel Kesselberg
3a7ee91957 Allow 0.4.6 with php5 support 2018-03-05 21:13:19 +01:00
Daniel Kesselberg
5c486208e1 Add specify/verify as dependency 2018-03-05 20:51:16 +01:00
Lucas Bartholemy
9f032a8e7e
Merge pull request #2892 from acs-ferreira/patch-7 
Update versions constraints
 2018-02-15 15:51:20 +01:00
githubjeka
957c6a5c6d fix Object for PHP7.2 2018-02-14 10:10:38 +03:00
Lucas Bartholemy
b09dd2fce9 fix composer.json merge 2018-02-13 19:31:41 +01:00
Lucas Bartholemy
708af2787b Merge branch 'master' into v1.3-dev 
# Conflicts:
#	composer.json
#	protected/humhub/modules/admin/controllers/PendingRegistrationsController.php
#	protected/humhub/modules/admin/controllers/UserController.php
#	protected/humhub/modules/admin/views/pending-registrations/index.php
#	protected/humhub/modules/admin/views/user/index.php
#	protected/humhub/modules/space/behaviors/SpaceController.php
#	protected/humhub/modules/space/behaviors/SpaceModelMembership.php
#	static/less/file.less
#	themes/HumHub/css/theme.css
 2018-02-13 19:21:27 +01:00
buddh4
975e715995 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/docs/CHANGELOG_DEV.md
#	protected/humhub/docs/guide/bundled-software.md
#	protected/humhub/modules/content/widgets/richtext/HumHubRichText.php
#	themes/HumHub/css/theme.css
 2018-02-08 14:35:13 +01:00
buddh4
130c4aa6de Added ProseMirror rich text editor. 2018-02-08 14:28:55 +01:00
Lucas Bartholemy
00691514c1 Revert "Revert "Merge branch 'v1.3-dev' into master"" 
This reverts commit 955d83be8b9e20183b1db209141db7ab24d048a3.
 2018-01-23 09:50:01 +01:00
Lucas Bartholemy
955d83be8b Revert "Merge branch 'v1.3-dev' into master" 
This reverts commit 895156b2a5113f3ac87a20616e599e37ed853e7a, reversing
changes made to 28acd4040a3a7e84c90520b093eff6e977cb4f82.
 2018-01-23 09:40:29 +01:00
Daniel Kesselberg
98a8a41831 Migrate PendingRegistrations to new Exporter 
Drop phpexcel dependency
 2018-01-18 12:52:56 +01:00
Daniel Kesselberg
6eefd92997 Update packages 2018-01-15 22:48:13 +01:00
Daniel Kesselberg
94da209f95 Add packages 2018-01-12 15:54:54 +01:00
Carlos Ferreira
6925740074
Update versions constraints 2018-01-05 14:38:45 +01:00
Lucas Bartholemy
df538e14e3 Revert "Revert "Merge branch 'v1.3-dev' into master"" 
This reverts commit 834368140af6359eeb075b96127477c4339059d6.

# Conflicts:
#	protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
 2017-12-22 19:55:12 +01:00
Lucas Bartholemy
834368140a Revert "Merge branch 'v1.3-dev' into master" 
This reverts commit d2d45f7d78e54b9dcf81e023af336c5bc064b548, reversing
changes made to 3a2daed62f549a4720741b9cd5a15a83521e08e4.

# Conflicts:
#	protected/humhub/docs/guide/admin/asynchronous-tasks.md
 2017-12-22 13:49:00 +01:00
Lucas Bartholemy
d2d45f7d78
Merge branch 'v1.3-dev' into master 2017-12-20 12:00:21 +01:00
Carsten Brandt
958d940da6
improve composer-asset-plugin config 
- Make sure to be compatible with newer versions of the plugin

  > The "extra.asset-installer-paths" option is deprecated, use the
  > "config.fxp-asset.installer-paths" option

- Improve performance of dependency resolution:
  120d35506e (diff-b5d0ee8c97c7abd7e3fa29b9a27d1780)
 2017-11-17 11:16:08 +01:00
Lucas Bartholemy
5fef46c527 Enh: Added Push live module driver using Redis and Node.JS 2017-11-10 01:45:08 +01:00
Lucas Bartholemy
b87e0b1b81 Composer update (add queue & redis) 2017-10-27 21:52:18 +02:00
Lucas Bartholemy
13c5a53d3c - Chg: Switched from Composer FXP plugin to Asset Packagist repository 
- Enh: Committed composer.lock
 2017-10-14 00:22:23 +02:00
Lucas Bartholemy
18f5bdce4c Enh: Added DurationPickerWidget 2017-09-19 13:58:40 +02:00
Carlos Ferreira
887e0acd80 Stick to Yii2 concrete version 
See https://github.com/humhub/humhub/issues/2745
 2017-09-07 08:47:45 +02:00