Lucas Bartholemy
|
b716b4698c
|
Fixed double method implementation
|
2017-01-12 17:42:37 +01:00 |
|
Lucas Bartholemy
|
0a2a42e662
|
Implemented getActivityClasses in base module
|
2017-01-12 17:41:10 +01:00 |
|
Lucas Bartholemy
|
bffc9f5c2f
|
Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev
|
2017-01-12 17:36:08 +01:00 |
|
buddh4
|
942c658bc8
|
Notification Rewrite + Web Target Configurable.
# Conflicts:
# protected/humhub/widgets/JsWidget.php
|
2017-01-12 17:34:19 +01:00 |
|
buddh4
|
06ad8dc2fb
|
Added default result support in Basepicker + Permalink fix in stream.js
|
2017-01-12 17:15:49 +01:00 |
|
Lucas Bartholemy
|
a507a470a1
|
Added activity mail migrations, moved last_activity_mail column to settings
|
2017-01-12 16:28:27 +01:00 |
|
Lucas Bartholemy
|
604ad336ec
|
Added a title and description to the core activities
|
2017-01-12 12:02:05 +01:00 |
|
Lucas Bartholemy
|
482cedc530
|
Added new E-mail summary configuration pages for admin / user
|
2017-01-12 11:12:54 +01:00 |
|
Lucas Bartholemy
|
6cc20dd676
|
Removed old style mailing settings in account settings and admin settings
|
2017-01-12 10:46:33 +01:00 |
|
Lucas Bartholemy
|
0eabbdca7b
|
Added own ActiveField class in ActiveForm
|
2017-01-12 10:38:57 +01:00 |
|
Lucas Bartholemy
|
28509a6d28
|
Added getActivityClasses method to the base Module class
|
2017-01-12 10:37:34 +01:00 |
|
Lucas Bartholemy
|
be4fec5dec
|
Use yii standard View class for mailer
|
2017-01-11 19:01:40 +01:00 |
|
Lucas Bartholemy
|
27275678e0
|
Extend BasePickerField from InputWidget for better ActiveField integration
|
2017-01-11 18:24:12 +01:00 |
|
buddh4
|
80891f4d81
|
Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
|
2017-01-10 19:34:33 +01:00 |
|
buddh4
|
3d5a9c9fe4
|
Content error fix.
|
2017-01-10 19:23:21 +01:00 |
|
Lucas Bartholemy
|
2d99e6876e
|
Added extended HTML helper class, moved implemented backButton as helper
|
2017-01-10 19:01:42 +01:00 |
|
Lucas Bartholemy
|
1fd980aea8
|
Removed old fonts
|
2017-01-10 19:00:10 +01:00 |
|
buddh4
|
a22d1937be
|
Serialized settings.
|
2017-01-10 15:25:14 +01:00 |
|
buddh4
|
218bf7dbfa
|
Removed legacy flatelements.
|
2017-01-09 10:01:58 +01:00 |
|
buddh4
|
b096ff6ecc
|
Stream Fixes
|
2017-01-09 08:57:20 +01:00 |
|
buddh4
|
472d4eb853
|
Notification user account settings + Notification Overview alignment + Small comment fix.
|
2017-01-09 07:52:19 +01:00 |
|
buddh4
|
1ecf2a5a00
|
Notification Rewrite fixes + tests.
|
2017-01-09 00:14:12 +01:00 |
|
buddh4
|
10aef47872
|
Space change gui fix.
|
2017-01-08 18:43:00 +01:00 |
|
buddh4
|
fa48d0ef4f
|
Fixed Activity Stream.
|
2017-01-08 01:43:19 +01:00 |
|
buddh4
|
8f24748190
|
Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
|
2017-01-08 00:29:00 +01:00 |
|
buddh4
|
887aa4f9d0
|
Revert of Activity field change + Test alignments.
|
2017-01-08 00:28:07 +01:00 |
|
buddha87
|
eae3237799
|
Baseactivity fix + CommentActiity/Notification + Tests
|
2017-01-07 17:19:49 +01:00 |
|
Rominou
|
85a7c86a30
|
Update widgets_views_markdownEditor.php
|
2017-01-07 04:03:36 +01:00 |
|
Rominou
|
c08c1e2e09
|
Update views_space_settings.php
|
2017-01-07 03:45:20 +01:00 |
|
Rominou
|
e125ed6da1
|
Update widgets_views_showComment.php
|
2017-01-07 03:41:56 +01:00 |
|
Rominou
|
d16dd078e0
|
Update widgets_views_permaLink.php
|
2017-01-07 03:40:30 +01:00 |
|
Rominou
|
6902ef93f5
|
Update views_wallLayout.php
|
2017-01-07 03:38:43 +01:00 |
|
Rominou
|
629147605c
|
Update views_auth_login.php
|
2017-01-07 03:31:36 +01:00 |
|
Rominou
|
88511df1b0
|
Update permissions.php
|
2017-01-07 03:30:16 +01:00 |
|
Rominou
|
4b59521cea
|
Update models_Invite.php
|
2017-01-07 03:28:33 +01:00 |
|
Rominou
|
4a44be10a8
|
Update controllers_AccountController.php
|
2017-01-07 03:26:46 +01:00 |
|
Rominou
|
2d7abdc10e
|
Update base.php
|
2017-01-07 03:26:03 +01:00 |
|
Rominou
|
75ba277caf
|
Update base.php
|
2017-01-07 03:17:35 +01:00 |
|
Rominou
|
547d6f7aca
|
Update widgets_views_markdownEditor.php
|
2017-01-07 03:13:55 +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
|
5d99181dc4
|
Activity Migration Fix.
|
2017-01-04 19:03:52 +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
|
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 |
|