mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-19 23:54:54 +01:00
Code Issues Projects Releases Wiki Activity
9,834 Commits 115 Branches 157 Tags
Commit Graph

315 Commits

Author SHA1 Message Date
buddh4
61f1ccc002 Build production assets 2018-04-11 14:54:24 +02: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
13c429fbac
<img> tag has no end tag 2018-03-14 21:32:17 +01:00
Carlos Ferreira
2abb916c16
Fix #3097 2018-03-14 21:30:18 +01:00
buddh4
b7e37d7a15 Fix #2968 html encoding issue for user image tooltip 2018-03-06 15:29:08 +01:00
buddh4
f51863a6da Enh: Added ContentTypePicker 
Fix: Fixed Pickerfield image
Enhanced Stream filter style
 2018-02-25 19:57:48 +01:00
buddh4
7c88e1fc41 Enh: Refactored Stream Filters 2018-02-24 18:24:57 +01:00
Evgeniy Tkachenko
6b2018b6e8
Fix compatible PJAX with jQuery 3 2018-02-14 16:35:36 +03:00
Lucas Bartholemy
a030a033d5
Merge pull request #2959 from acs-ferreira/patch-39 
Upgrade Modernizr library from 2.6.1 to 3.5.0
 2018-02-13 19:37:30 +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
5e230c19d7 Added Stream Topic Filter 2018-02-09 21:28:09 +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
buddh4
30c16143e6
Merge pull request #2975 from Societec/master 
feature: supply 'submitted' listeners with server response
 2018-02-07 18:50:42 +01:00
Carlos Ferreira
056bfd6392
Update .ready() function 
https://api.jquery.com/ready/
 2018-02-05 21:27:46 +01:00
Kristian Lein-Mathisen
9f97d987ed feature: supply 'submitted' listeners with server response 
now your listeners can process the server response, which was
previously hidden.
 2018-01-29 10:56:18 +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
Lucas Bartholemy
895156b2a5
Merge branch 'v1.3-dev' into master 2018-01-23 09:26:11 +01:00
Carlos Ferreira
ba09858fbb
Upgrade Modernizr library from 2.6.1 to 3.5.0 
Build : https://modernizr.com/download/?-inlinesvg-domprefixes-hasevent-prefixed-prefixes-setclasses-shiv-testallprops-testprop-teststyles
 2018-01-21 14:35:19 +01:00
buddh4
d755cc1b12 humhub.ui.modal.js cleanup 2018-01-19 14:48:01 +01:00
buddh4
380440c0a3 Remove modal.load and modal.post dataType restriction 2018-01-19 14:46:12 +01:00
buddh4
55319a0302 Fix #2947: Allow json success result on modalSubmit 2018-01-19 14:43:56 +01:00
Kristian Lein-Mathisen
e1fcb09fa7 Detect dataType from server response in AJAX requests 
Previously: if the AJAX query doesn't contain a dataType, we
assume the dataType is "html".

Now: if the AJAX query doesn't contain a dataType, we determine the
dataType from the server's content-type (either "html" or "json").

This is is particularly useful in `modal.load(url)` scenarios and
other places where the response type can be both "html" and "json".
 2018-01-12 15:27:46 +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
buddh4
20328cb227 Production assets build. 2017-12-13 18:24:31 +01:00
buddh4
a3733b76a2 Added Default Topics Options 2017-11-07 17:11:30 +01:00
buddh4
c7ed7b0344 Initial Commit 2017-11-04 23:10:31 +01:00
Lucas Bartholemy
4e432faf6d Fixed problem with dropdown menus in responsive tables (grids) 2017-10-28 22:26:54 +02:00
buddh4
e02b0298e8 Build Prod assets 2017-10-21 00:25:07 +02:00
buddh4
10d5cb28c8 Fix #2781 grunt build-asset not working because of clipboard.js dependency 2017-10-21 00:19:00 +02:00
Lucas Bartholemy
a061076bf4 Fix: MarkdownEditor cursor position after inserting file/image 2017-10-12 21:11:26 +02:00
Lucas Bartholemy
9d6519d79d Rebuild assets 2017-10-08 14:42:05 +02:00
buddh4
b437373595 Enh: Added MobileTargetProvider abstraction for mobile push notifications 
Enh: Added `humhub:notification:udpateCount` js event
 2017-10-06 18:35:56 +02:00
buddh4
af0bf5c221 Build prod assets. 2017-09-21 18:57:49 +02:00
Lucas Bartholemy
cef2395a79 Rebuild assets 2017-09-12 20:07:55 +02:00
buddh4
28ef660b12 Small Cleanup 2017-08-29 12:02:22 +02:00
buddh4
b81faca5df Rebuild prod assets. 2017-08-01 22:16:37 +02:00
buddh4
c918acfee6 Fix: Mentioning keeps running even if previous input result was empty 
Enh: Darkened comment links for better readability
 2017-07-28 19:01:39 +02:00
buddh4
2872d2aa9d Enh: Use ContentActiveRecord::getUrl() for content perma links (if given) + Small refactorings 2017-07-24 23:53:50 +02:00
buddh4
a035c4ebef Fix: Reset modal dialog size + add size option 
Enh: Added `size` option `ui.modal.Modal.set()`
 2017-07-24 23:50:08 +02:00
buddh4
fabfd69c47 Enh: Reduced status success duration 2017-07-24 23:46:29 +02:00
buddh4
0f00da0e11 Fix: Automatic scroll to top after Modal loading 
Fix: Disable body scroll if modal is open.
 2017-07-21 20:53:00 +02:00
buddh4
665543c22f Enh: Avoid cutting oembed entry in stream if it's the first part of a richtext 2017-07-20 22:20:29 +02:00
buddh4
41d5ad4408 Small cleanup. 2017-07-20 18:07:05 +02:00
buddh4
7556625914 Removed redundant markdown addition. 2017-07-20 18:04:15 +02:00
buddh4
dd7545f19d - Enh: Added Modal::closable in order to respect backdrop and keyboard data setting of Modal and ModalDialog widget 2017-07-20 18:03:47 +02:00
buddh4
806149e143 Fixed markdown file upload pjax issue 2017-07-20 17:59:40 +02:00