453 Commits

Author	SHA1	Message	Date
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	132af2fcda	Fix: Stream image preview size not changeable	2018-01-23 14:56:30 +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	80058ddf8a	Reverted align of space acronym	2018-01-07 19:23:00 +01:00
Lucas Bartholemy	36dab5f27f	Fixed Space image acronym position	2018-01-07 13:50:07 +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	d7539f41ff	Merge pull request #2864 from githubjeka/patch-2 ... The fix for alignment of username in a comment	2017-12-22 14:01:27 +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
Evgeniy Tkachenko	69838b6068	Merge branch 'master' into patch-2	2017-12-22 14:46:29 +03:00
Evgeniy Tkachenko	94affa8adf	Update stream.less	2017-12-21 13:18:36 +03:00
Evgeniy Tkachenko	5adf37c44f	Update stream.less	2017-12-21 13:07:40 +03:00
Evgeniy Tkachenko	a7aa44447e	Update stream.less	2017-12-21 11:58:54 +03: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
Lucas Bartholemy	6d19c7fce7	Fixed bower paths	2017-11-05 21:38:25 +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
Lucas Bartholemy	bd5da41c82	Merge branch 'master' into v1.3-dev	2017-10-25 15:18:54 +02:00
buddh4	a64dda63bb	Fixed StreamCest test + rebuild prod assets.	2017-10-23 13:32:09 +02:00
Lucas Bartholemy	43588fefd5	Merge branch 'master' into v1.3-dev	2017-10-22 11:23:02 +02:00
buddh4	7be5ce3596	Fix stream image max-width + small cleanup.	2017-10-21 00:28:12 +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	c8733af506	Merge pull request #2549 from acs-ferreira/humhub-bootstrap-tour-update ... Update bootstrap-tour to v0.11.0	2017-10-13 21:20:42 +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
buddh4	150d0c5a4f	Merge branch 'master' of https://github.com/humhub/humhub ... # Conflicts: # protected/humhub/docs/CHANGELOG.md # protected/humhub/modules/content/widgets/WallEntry.php	2017-09-21 17:06:18 +02:00
buddh4	19301671bd	Fixed IDE type hinting	2017-09-21 16:52:35 +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	ed9a98a583	Merge branch 'master' of https://github.com/humhub/humhub	2017-07-29 20:54:52 +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
Victoria Holland	36ed810d4e	Changed 'Add an user' to 'Add a user' ... 'Add a user' is the correct form in English. Use of 'a' or 'an' are not determined by spelling, but pronunciation. Any word which sounds like it begins with a vowel (it may or may not actually begin with a vowel) will take 'an' and any word which begins with sound of a consonant will take 'a' as the preceding article.	2017-07-27 13:16:13 +01: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