381 Commits

Author SHA1 Message Date
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
075d143a43
fix merge conflict 2017-12-22 14:43:16 +03:00
Evgeniy Tkachenko
9c0ebdd79c
Update theme.css 2017-12-21 13:19:53 +03:00
Evgeniy Tkachenko
0a515b102d
Update theme.css 2017-12-21 13:11:03 +03:00
Evgeniy Tkachenko
8061a6b517
Update theme.css 2017-12-21 12:03:47 +03:00
Lucas Bartholemy
6d19c7fce7 Fixed bower paths 2017-11-05 21:38:25 +01:00
buddh4
d40f1b12ef Enh: Added apple-mobile-web-app-* and mobile-web-app-capable meta tags to head.php 2017-10-23 01:49:30 +02:00
buddh4
7be5ce3596 Fix stream image max-width + small cleanup. 2017-10-21 00:28:12 +02:00
buddh4
19301671bd Fixed IDE type hinting 2017-09-21 16:52:35 +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
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
6bc65a88d2 Enh: Added new MarkdownField input widget as replacement of deprecated MarkdownEditor
Fix: Fixed markdown file upload pjax issue
2017-07-20 17:54:37 +02:00
buddh4
1353c263ca Fix #2644 overlapping popup preview image after increasing preview image size (hagalaz)
Fix: Button widget child class static instantiation not working
Fix: ModalButton instatiation and added ModalButton::close()
2017-06-28 15:30:07 +02:00
buddh4
b7d2b0a0cf Fix #2612: Single list item hides markers 2017-06-07 17:40:52 +02:00
buddh4
fa13155fa6 Fix #2601 multi select dropdown style. 2017-06-07 17:16:01 +02:00
buddh4
2ec9f6c93f Fixed activity stream word-break issue. 2017-06-01 17:49:24 +02:00
buddh4
7c987fcf08 Fix: Label success color 2017-04-13 18:18:12 +02:00
buddh4
44e5ac1c2d Fix #2219: Overlapping summary mail content
Fix Wall entry layout link/text overflow
2017-04-04 16:14:05 +02:00
Lucas Bartholemy
250a6bf1e7 Enh: WallEntry layout layout improvements 2017-03-25 12:09:30 +01:00
Lucas Bartholemy
d5736ed0ba Enh: Improved administration user deletion view 2017-03-24 21:25:07 +01:00
Sarah Tsumayoi
2c1137009b Fix: Typo 2017-03-22 16:33:34 -04:00
buddh4
9d01d7ddad Fixed Test
Added Missing production asset
Enh: Added Grunt tasks `build-assets`, `build-theme`, `build-search`
2017-03-17 13:48:08 +01:00
buddh4
39d082745a Enh: Raised collapse value for posts to full embeded youtube video height
Fix: Fixed oembed post edit
+ Rebuild theme
2017-03-15 14:57:07 +01:00
buddh4
cd64d15cae Enh: Included select2-humhub theme into the new theming
Enh: Added select2 dropdown for language selection in account and admin settings
Enh: Added data-ui-select2 addition for simple select2 dropdowns
Fix: Don't apply js additions if there was no matching element
2017-03-15 13:23:55 +01:00
buddh4
b58aba384f Fix: missing margin of wall-entry-controls in comments. 2017-03-13 22:50:45 +01:00
buddh4
09b6f64053 Fix: file preview text overflow in HumHub theme. 2017-02-20 15:18:59 +01:00
buddh4
18d39adfbd Added JS context menu to ui.additions. 2017-02-17 14:42:10 +01:00
buddh4
df84ef633d Minified theme.css 2017-02-09 15:26:28 +01:00
buddh4
3a027c8989 Fixed markdown comment rendering. + Added collapsable text to comments. 2017-02-09 15:25:01 +01:00
buddh4
59e90445f5 Theme rebuild. 2017-02-09 11:20:14 +01:00
buddh4
ce76ef0bb9 Fixed Markdown space issue. 2017-02-08 18:27:21 +01:00
Lucas Bartholemy
e7e42de41f Fixed less build paths 2017-01-27 00:27:36 +01:00
buddh4
498d10adc0 Simple smartpolling client for live events. 2017-01-25 20:34:47 +01:00
buddh4
4da79ebe4f Live Polling + Notification Frontend Rewrite. 2017-01-25 16:16:35 +01:00
Lucas Bartholemy
56905f80cf Improved PermissionGridEditor 2017-01-24 13:37:52 +01:00
Lucas Bartholemy
3823f3c414 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2017-01-24 13:26:47 +01:00
Lucas Bartholemy
f93abdf8cb Fixed filename typo in build.less 2017-01-24 13:18:16 +01:00
buddh4
98ce7b4fef Use of better variable names in new theme + theme component variable loading. 2017-01-24 12:29:33 +01:00
buddh4
24fadd51f8 Theme variable loading. 2017-01-22 00:11:02 +01:00
buddh4
161312ea0c Notification Mails/Rendering 2017-01-22 00:08:20 +01:00
buddh4
7869e99919 Removed old theme concept 2017-01-20 20:40:49 +01:00
buddh4
472d4eb853 Notification user account settings + Notification Overview alignment + Small comment fix. 2017-01-09 07:52:19 +01:00
buddha87
e3796fb2f3 Load Suppressed entries. 2017-01-04 20:25:51 +01:00
buddha87
16b918c155 Legacy Picker support. 2017-01-04 19:13:33 +01:00
buddha87
16e48e405c BaseActivity Fix 2017-01-04 15:08:26 +01:00
buddha87
b6efd6c2f8 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-01-04 14:59:38 +01:00