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
47c9aac669
Fixed PJAX Registration and password recovery
2017-01-04 14:42:51 +01:00
Lucas Bartholemy
7ac67ce973
Fixed bug on missing wall id
2017-01-04 14:40:57 +01:00
Lucas Bartholemy
6e38b4ac7f
Added StreamSuppressQuery to combine similar content types in stream.
2017-01-04 12:16:42 +01:00
Lucas Bartholemy
6f805e5905
Increased installer layout max width
2017-01-03 15:10:06 +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
Lucas Bartholemy
466d6ab380
Merge pull request #2015 from cebe/patch-1
...
Added check for APCu to installation checks
2016-12-28 15:45:45 +01:00
Lucas Bartholemy
0a0af81342
Merge pull request #2065 from valentin-vogel/feature/search-posts-by-user-names
...
search for post by author name
2016-12-28 15:44:50 +01:00
Lucas Bartholemy
d110c86ba7
Merge pull request #2094 from acs-ferreira/patch-15
...
Attached files browser caching, fixes #2091
2016-12-28 15:42:39 +01:00
Lucas Bartholemy
a7f08f2e58
Fix capitalisation of YouTube ( #2087 )
2016-12-28 15:40:25 +01:00
Lucas Bartholemy
dcec0be9a4
Merge pull request #2112 from VasileGabriel/v1.2-dev
...
Clear old logs
2016-12-28 15:38:47 +01:00
Lucas Bartholemy
eed4df9077
Merge branch 'weison-tech-master'
2016-12-28 15:34:54 +01:00
Lucas Bartholemy
5746de4aa4
Merge branch 'master' of https://github.com/weison-tech/humhub into weison-tech-master
...
# Conflicts:
# protected/humhub/messages/ht/widgets_views_markdownEditor.php
# protected/humhub/messages/zh_cn/archive.json
# protected/humhub/modules/content/messages/ja/widgets_views_permaLink.php
# protected/humhub/modules/user/messages/ja/base.php
# protected/humhub/modules/user/models/Password.php
2016-12-28 15:34:24 +01:00
HumHub Translations
7a1c603b56
Enh: Updated Translations (translate.humhub.org)
2016-12-28 15:23:46 +01:00
buddha87
52d19d5c1d
Fixed #2169 removed Tour/CoreJSConfig and Trackingwidget in LayoutAddons.
2016-12-28 13:31:33 +01:00
buddha87
e99b9f2d63
Fixed #2169 removed Tour/CoreJSConfig and Trackingwidget in installer.
2016-12-27 19:41:13 +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
2d0c5dd8da
Updated production asset.
2016-12-19 01:25:23 +01:00
buddha87
642a0e2024
Fixed: Travis Fixture Issue
2016-12-19 00:42:43 +01:00
buddha87
e5683c6acc
Travis class name issue.
2016-12-19 00:35:34 +01:00
buddha87
d89a180fc8
Travis testing with firefox.
2016-12-19 00:17:19 +01:00
buddha87
aaa1e72936
Travis tests
2016-12-18 23:57:40 +01:00
buddha87
9dfdfbd9f9
Travis tests.
2016-12-18 23:51:15 +01:00
buddha87
0cef6f0330
Richtext JS Api, Disabled Archived Stream, Stream Console Fix
2016-12-18 23:05:34 +01:00
Lucas Bartholemy
ed61294411
Merge branch 'master' of github.com:humhub/humhub
2016-12-15 14:43:15 +01:00
Lucas Bartholemy
064f372f8e
Fixed: Error when console base url is empty
2016-12-15 14:42:59 +01:00
HumHub Translations
a58f176e86
Enh: Updated Translations (translate.humhub.org)
2016-12-15 14:35:24 +01:00
Lucas Bartholemy
e8992cd580
Fixed missing profile field category translations
2016-12-13 11:41:49 +01:00
Lucas Bartholemy
a975aed852
Merge pull request #2156 from cebe/patch-2
...
Update admin-authentication.md
2016-12-12 18:14:11 +01:00
buddha87
dfb7897583
Fixed #2155 don't render oembed in richtext editmode.
2016-12-12 17:18:52 +01:00
Carsten Brandt
935d3efc2a
Update admin-authentication.md
...
Make Github client less eager in permissions. The default seems to be read/write access on all profile fields. This one will allow read access on the private email. all public info has read permission anyway.
2016-12-12 12:16:46 +01:00
buddha87
22cffc27ff
Merge branch 'master' of https://github.com/humhub/humhub
2016-12-10 17:55:52 +01:00
buddha87
6873e8e5b6
Cleaned test variable.
2016-12-10 17:53:07 +01:00
Lucas Bartholemy
f665171f37
Merge pull request #2067 from acs-ferreira/patch-4
...
Specifying the Like action
2016-12-10 12:41:19 +01:00
Lucas Bartholemy
09657ee97f
Merge pull request #2076 from acs-ferreira/patch-9
...
Code not being parsed for IE specific tags
2016-12-10 12:41:03 +01:00
Lucas Bartholemy
a23992f1ae
Merge pull request #2082 from coliff/patch-1
...
Update animate.min.css
2016-12-10 12:40:19 +01:00
Lucas Bartholemy
a8f7ef607e
Merge pull request #2066 from acs-ferreira/patch-3
...
Update string to be more specific
2016-12-10 12:39:43 +01:00
Lucas Bartholemy
db66b3582c
Merge pull request #2095 from acs-ferreira/patch-16
...
Better .htaccess file
2016-12-10 12:38:31 +01:00
Lucas Bartholemy
4b40e54126
Merge pull request #2083 from coliff/patch-2
...
Update html5shiv.js
2016-12-10 12:37:19 +01:00
Lucas Bartholemy
d4caf8fed6
Merge pull request #2088 from coliff/patch-6
...
Update jquery.autosize.min.js
2016-12-10 12:37:04 +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
e48eb307b3
Merge pull request #2124 from cebe/model-consistency
...
removed created/updated_at/by fields from model rules
2016-12-10 12:29:28 +01:00
Lucas Bartholemy
39f1d0fa41
Merge pull request #2125 from ahrasis/master
...
Adding Bahasa Melayu (Malaysia) Translation
2016-12-10 12:28:32 +01:00
Lucas Bartholemy
6f7d37ae41
Merge pull request #2145 from cebe/patch-2
...
Update File.php
2016-12-10 12:27:09 +01:00
HumHub Translations
6717f37de8
Enh: Updated Translations (translate.humhub.org)
2016-12-10 12:23:19 +01:00
HumHub Translations
0e734d36d5
Merge branch 'master' of github.com:humhub/humhub
2016-12-10 12:22:59 +01:00
HumHub Translations
d15ff4eb81
Enh: Updated Translations (translate.humhub.org)
2016-12-10 12:20:24 +01:00
