3104 Commits

Author SHA1 Message Date
Lucas Bartholemy
a1208b3a15 Fixed typo in attribute label 2017-02-06 20:11:01 +01:00
Lucas Bartholemy
3d9607eabf Fixed installer static folder path for example images 2017-02-06 20:10:43 +01:00
Lucas Bartholemy
7ab67a5fa3 Ignore migration error when foreign key not exists 2017-02-06 20:10:16 +01:00
buddh4
70f7dded9e Fixed NewContent live event + live messageCount update. 2017-02-06 19:43:20 +01:00
buddh4
da0746dca3 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-06 18:29:53 +01:00
buddh4
6aa21af4f4 Catch all exceptions when rendering stream entries. 2017-02-06 18:25:43 +01:00
Lucas Bartholemy
c04c938f9b Raised version to 1.2.0-beta.1 2017-02-06 16:39:56 +01:00
Lucas Bartholemy
45d3f273a2 Htaccess fix when URL rewriting is not enabled in Yii 2017-02-06 14:08:03 +01:00
buddh4
115b7af252 UpdateNotficatioView 2017-02-05 20:20:56 +01:00
buddh4
a09bb0df5e Asset rebuild. 2017-02-05 16:43:00 +01:00
buddh4
a18146928d Update Notification count for each pjax call. 2017-02-05 16:24:38 +01:00
buddh4
338dd40e73 Fixed spacechooser message count update 2017-02-05 15:23:27 +01:00
buddh4
b173035610 Fixed Spacechooser message counter. 2017-02-05 14:58:18 +01:00
buddh4
58332fc438 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-05 14:39:23 +01:00
buddh4
219139daef Provide module instance in humhub module beforeInit. 2017-02-05 14:36:33 +01:00
Lucas Bartholemy
cf206ed25a Added changelog entries 2017-02-05 11:47:11 +01:00
Lucas Bartholemy
2565b0c180 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2017-02-05 11:35:22 +01:00
Lucas Bartholemy
589b1e3afd Restored local configuration files 2017-02-05 11:35:10 +01:00
buddh4
82d9f51784 Revert InviteButton change to make it overwritable. + Small refactoring. 2017-02-04 19:04:27 +01:00
buddh4
1712b1c0b7 Workaround for Notification Record bulk send. + Fixed tests. 2017-02-04 14:20:06 +01:00
buddh4
e66d2ebbaa Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-04 13:48:52 +01:00
Lucas Bartholemy
2069eb240d Fixed wrong dates on new posts 2017-02-04 12:49:29 +01:00
Lucas Bartholemy
5eadcb7ba4 Fixed theme variable parsing 2017-02-04 11:55:42 +01:00
buddh4
427dc9dd5b Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-03 16:52:52 +01:00
Lucas Bartholemy
16e540747c Fixed asset problem on ajax requests 2017-02-03 16:45:05 +01:00
buddh4
945f045e7b Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-03 15:32:45 +01:00
Lucas Bartholemy
191526d62a Enable pjax by default 2017-02-03 14:36:27 +01:00
Lucas Bartholemy
2f73c7cc4f Migration fixes 2017-02-03 14:27:53 +01:00
buddh4
a2ca2644ff Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-03 14:19:43 +01:00
buddh4
1317b64e97 Smaller Refactoring. 2017-02-03 14:19:26 +01:00
Lucas Bartholemy
6278850f84 Added bundled assets 2017-02-03 13:20:19 +01:00
Lucas Bartholemy
4a25770b74 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2017-02-03 12:28:00 +01:00
Lucas Bartholemy
ca1a38cda7 Merge branch 'master' into v1.2-dev
# Conflicts:
#	protected/humhub/modules/content/messages/pt_br/widgets_views_label.php
#	protected/humhub/modules/content/messages/pt_br/widgets_views_stickLink.php
#	protected/humhub/modules/user/messages/de/models_ProfileFieldType.php
#	protected/humhub/modules/user/messages/fr/models_ProfileFieldType.php
#	protected/humhub/modules/user/messages/pt_br/models_ProfileFieldType.php
2017-02-03 12:27:39 +01:00
buddh4
6b7123b412 Build new prod assets. 2017-02-03 12:26:01 +01:00
Lucas Bartholemy
b70e11caef Fixed Japanese message file 2017-02-03 12:17:53 +01:00
Lucas Bartholemy
fe3e75b5ea Merge branch 'master' of github.com:humhub/humhub
Conflicts:
	protected/humhub/modules/user/messages/ar/base.php
	protected/humhub/modules/user/messages/ar/controllers_AccountController.php
	protected/humhub/modules/user/messages/de/base.php
	protected/humhub/modules/user/messages/fr/base.php
	protected/humhub/modules/user/messages/nb_no/base.php
	protected/humhub/modules/user/messages/pt_br/base.php
	protected/humhub/modules/user/messages/pt_br/views_auth_login.php
2017-02-03 12:08:06 +01:00
buddh4
657cb19a9c Live update multi tab issue workaround. 2017-02-03 11:34:08 +01:00
buddh4
62c337e6aa Fixed Originator Notification issue. 2017-02-03 11:31:14 +01:00
buddh4
0811ac6d73 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-03 11:28:40 +01:00
buddh4
587c630c65 Fixed unsubscribe link in summary and notification mails. 2017-02-03 11:28:24 +01:00
HumHub Translations
a643c52327 Enh: Updated Translations (translate.humhub.org) 2017-02-03 11:08:08 +01:00
Lucas Bartholemy
10da378256 Added comment author to search index 2017-02-03 11:07:07 +01:00
Lucas Bartholemy
7a93567e0b Prevent double widget init event with Yii 2.0.11 2017-02-03 10:57:39 +01:00
Lucas Bartholemy
7e0e1c3956 Added hideSidebar ContentContainerController option again, default is false 2017-02-03 10:42:09 +01:00
buddh4
1b929bf6fd Enhanced Theming Guide + Theming Migration Guide. 2017-02-02 22:10:53 +01:00
buddh4
8c6880f2b4 Prevent module double initialization + Smaller stream js enhancement. 2017-02-02 22:10:17 +01:00
buddh4
9a89317e45 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-02 22:08:25 +01:00
buddh4
8905451315 Added $label to RichtextField to add a richtext field label. 2017-02-02 22:08:10 +01:00
Lucas Bartholemy
2ca9b623a9 Added coding standards 2017-02-02 16:55:36 +01:00
Lucas Bartholemy
2063b0394e Dev Documentation enhancements 2017-02-02 16:29:59 +01:00