Lucas Bartholemy
|
f93abdf8cb
|
Fixed filename typo in build.less
|
2017-01-24 13:18:16 +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 |
|
buddha87
|
4d5bc8708e
|
Initial Notification Rewrite + Markdown posts (experimental).
|
2017-01-04 14:53:25 +01:00 |
|
Lucas Bartholemy
|
c067608281
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# css/animate.min.css
# js/html5shiv.js
# js/jquery.autosize.min.js
# protected/humhub/modules/admin/messages/zh_cn/views_setting_index.php
# protected/humhub/modules/content/models/Wall.php
# protected/humhub/modules/content/models/WallEntry.php
# protected/humhub/modules/content/widgets/views/permaLink.php
# protected/humhub/modules/file/models/File.php
# protected/humhub/modules/space/models/Membership.php
# protected/humhub/modules/user/models/Group.php
# protected/humhub/modules/user/models/User.php
# protected/humhub/views/layouts/main.php
# protected/humhub/widgets/RichText.php
# protected/humhub/widgets/views/richTextEditor.php
# themes/HumHub/css/theme.less
|
2016-12-28 16:02:44 +01:00 |
|
buddha87
|
45c1841931
|
Fixed Fontawesome/Bootstrap theme imports.
|
2016-12-23 10:19:52 +01:00 |
|
buddha87
|
0488d77cc7
|
New Less Theming structure disable theme components by using @prev-* variables.
|
2016-12-23 09:36:23 +01:00 |
|
buddha87
|
2a246acfdc
|
Tests + New theming structure.
|
2016-12-20 20:26:44 +01:00 |
|
buddha87
|
0cef6f0330
|
Richtext JS Api, Disabled Archived Stream, Stream Console Fix
|
2016-12-18 23:05:34 +01:00 |
|
Lucas Bartholemy
|
37767cdf36
|
Merge pull request #2120 from acs-ferreira/patch-19
Add padding on user detail view
|
2016-12-10 12:30:19 +01:00 |
|
Lucas Bartholemy
|
ddb466f858
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# js/app.js
# protected/humhub/config/common.php
# protected/humhub/modules/admin/messages/ar/views_setting_index.php
# protected/humhub/modules/admin/messages/bg/views_setting_index.php
# protected/humhub/modules/admin/messages/cs/views_setting_index.php
# protected/humhub/modules/admin/messages/da/views_setting_index.php
# protected/humhub/modules/admin/messages/de/views_setting_index.php
# protected/humhub/modules/admin/messages/es/views_setting_index.php
# protected/humhub/modules/admin/messages/fa_ir/views_setting_index.php
# protected/humhub/modules/admin/messages/fr/views_setting_index.php
# protected/humhub/modules/admin/messages/id/views_setting_index.php
# protected/humhub/modules/admin/messages/it/views_setting_index.php
# protected/humhub/modules/admin/messages/lt/views_setting_index.php
# protected/humhub/modules/admin/messages/nb_no/views_setting_index.php
# protected/humhub/modules/admin/messages/nl/views_setting_index.php
# protected/humhub/modules/admin/messages/pl/views_setting_index.php
# protected/humhub/modules/admin/messages/pt_br/views_setting_index.php
# protected/humhub/modules/admin/messages/ro/views_setting_index.php
# protected/humhub/modules/admin/messages/th/views_setting_index.php
# protected/humhub/modules/admin/messages/tr/views_setting_index.php
# protected/humhub/modules/content/components/actions/Stream.php
# protected/humhub/modules/content/messages/nb_no/widgets_views_deleteLink.php
# protected/humhub/modules/file/models/File.php
# protected/humhub/modules/file/widgets/views/showFiles.php
# themes/HumHub/css/theme.css
|
2016-12-09 14:01:39 +01:00 |
|
buddha87
|
4a59ce7544
|
Fixed Markdown Image width
|
2016-12-06 18:48:55 +01:00 |
|
buddha87
|
b3e74cee82
|
File Upload/Preview js rewrite / Stream,Comment js rewrite / Js Refactoring
|
2016-12-04 15:54:15 +01:00 |
|
buddha87
|
24fc7fecdb
|
Legacy JS Rewrite / JS Widgets / Refactoring
|
2016-11-28 10:06:37 +01:00 |
|
Carlos Ferreira
|
76a5e754ef
|
Update theme.less
|
2016-11-25 02:03:17 +01:00 |
|
Carlos Ferreira
|
db3bdb5046
|
Add padding on user detail view
|
2016-11-25 02:00:21 +01:00 |
|
buddha87
|
9b75f381b6
|
Ressources cleanup + Pickerfield implementation + Admin Logo upload rewrite + Like Rewrite
|
2016-11-20 16:35:04 +01:00 |
|
buddha87
|
66c969de00
|
Enh: Space Chooser rewrite.
|
2016-11-11 16:23:47 +01:00 |
|
buddha87
|
ac347add6a
|
Update theme.css
|
2016-11-11 13:29:06 +01:00 |
|
buddha87
|
9c82fb1bba
|
Use of Blueimp Gallery + Top Navigation Pjax handling + User Follow Api implementation + Stream sort fix + some tests.
|
2016-11-06 17:24:20 +01:00 |
|
buddha87
|
da5384dc92
|
Merge pull request #2073 from acs-ferreira/patch-6
Cursor pointer on remove file icon
|
2016-11-04 12:21:56 +01:00 |
|
Carlos Ferreira
|
d7624cc02d
|
Cursor pointer on remove file icon
|
2016-11-03 21:19:44 +00:00 |
|
Carlos Ferreira
|
937c8bb216
|
Add padding to Markdown Editor Textarea
|
2016-11-03 19:02:51 +00:00 |
|
buddha87
|
06d6876760
|
Js Stream Api fixes + Api enhancements + Stream tests
|
2016-10-31 03:25:02 +01:00 |
|
buddha87
|
ae65760599
|
Major js api enhancements + stream rewrite
|
2016-10-29 01:12:52 +02:00 |
|
Lucas Bartholemy
|
c889256aa3
|
Added PJax page loading
|
2016-10-24 14:58:51 +02:00 |
|
Lucas Bartholemy
|
6090419f18
|
Moved icons into theme
|
2016-10-21 13:27:15 +02:00 |
|
Lucas Bartholemy
|
63d6afe0b3
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/config/common.php
# protected/humhub/modules/admin/components/Controller.php
# protected/humhub/modules/dashboard/views/dashboard/index.php
# protected/humhub/modules/dashboard/views/dashboard/index_guest.php
# themes/HumHub/css/theme.css
|
2016-10-14 17:30:06 +02:00 |
|
kozhevnikov
|
0063030cf1
|
Horizontal scrolling images on mobile devices
|
2016-09-23 15:15:39 +03:00 |
|
Lucas Bartholemy
|
8a736d1c81
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/config/common.php
# protected/humhub/modules/content/components/actions/ContentContainerStream.php
# protected/humhub/modules/space/models/Membership.php
# protected/humhub/modules/space/views/space/home.php
# protected/humhub/modules/stream/actions/Stream.php
# protected/humhub/modules/stream/widgets/StreamViewer.php
# protected/humhub/modules/user/models/User.php
# protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php
# themes/HumHub/css/theme.css
|
2016-09-12 19:29:05 +02:00 |
|
buddha87
|
b54bfd98cb
|
Theme.css update from current less compilation
|
2016-07-13 18:06:04 +02:00 |
|
buddha87
|
3a8da355bc
|
Merge branch 'master' of https://github.com/humhub/humhub
|
2016-07-13 18:04:30 +02:00 |
|
buddha87
|
e6bd5e52a7
|
Force render Markdown Addlink/AddFile modals over fullscreen editor.
|
2016-07-13 18:02:11 +02:00 |
|
Sebastian Stumpf
|
50992225d5
|
Fixed positioning of arrows in galleries.
|
2016-07-13 14:21:35 +02:00 |
|
Carsten Brandt
|
de8ab700ee
|
Removed share-panel styles
share widget has been removed in 0471bdc229dfe80e8b1ef03f3535037561513257 but style is still present in .less file in the theme.
|
2016-06-08 14:29:41 +02:00 |
|
Lucas Bartholemy
|
689d5ee34f
|
Fixed 1.1 merge
|
2016-06-03 13:28:33 +02:00 |
|
Lucas Bartholemy
|
beb208f460
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/docs/guide/README.md
# protected/humhub/modules/content/controllers/ContentController.php
# protected/humhub/modules/dashboard/components/actions/DashboardStream.php
# protected/humhub/modules/dashboard/controllers/DashboardController.php
# protected/humhub/modules/space/controllers/SpaceController.php
# protected/humhub/modules/stream/widgets/views/stream.php
# protected/humhub/views/layouts/main.php
# themes/HumHub/css/theme.css
|
2016-06-03 13:11:57 +02:00 |
|
buddha87
|
9e5dff707a
|
User Account Settings styling
|
2016-05-22 18:43:53 +02:00 |
|
buddha87
|
15de5818c5
|
Grid view alignments + Permission submenu
|
2016-05-10 16:14:43 +02:00 |
|
buddha87
|
3ff25a7894
|
Space name/color widget + Tab Menu Admin Modules
|
2016-05-10 07:25:56 +02:00 |
|
buddha87
|
2f495e1fee
|
Add Group Member loader button
|
2016-05-10 01:15:16 +02:00 |
|
buddha87
|
b92a43467f
|
New Tab Menu (Space settings)
|
2016-05-10 00:05:07 +02:00 |
|
buddha87
|
76fd7815a4
|
Addes Loader save button in admin forms
|
2016-05-07 18:29:06 +02:00 |
|
buddha87
|
fdd223a985
|
JS Action/Content refactoring Implementation of action components.
|
2016-05-02 21:40:26 +02:00 |
|