mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-22 10:14:19 +01:00
Code Issues Projects Releases Wiki Activity
2,457 Commits 116 Branches 157 Tags
Commit Graph

2457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
d7da514fa3 Added git stable branch notice 2016-05-19 01:14:28 +02:00
Lucas Bartholemy
35af3452aa Fixed: Determine requests hostInfo on given baseUrl 2016-05-19 00:49:19 +02:00
Lucas Bartholemy
0471bdc229 Removed share panel 2016-05-19 00:10:53 +02:00
Lucas Bartholemy
6cc323fb6d Merge branch 'master' of github.com:humhub/humhub 2016-05-18 16:23:03 +02:00
Lucas Bartholemy
10709038f3 Enh: Optimized space header member count 2016-05-18 16:22:37 +02:00
Lucas Bartholemy
98ac3d732c Changed directory member button styles 2016-05-18 16:15:26 +02:00
Lucas Bartholemy
a70b95212b Readded space manage menu widget for 1.0 compatibility 2016-05-18 15:46:10 +02:00
buddha87
95596db15d Only show administrative badge for admin group 2016-05-18 14:57:04 +02:00
buddha87
8a392a80ae Merge pull request #1724 from buddha87/v1.1-dev 
Removed spellchecker for richtext placeholder.
 2016-05-17 21:40:24 +02:00
buddha87
59842bf49a Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-17 21:38:42 +02:00
buddha87
6694743c8c Admin Layout alignments 2016-05-17 21:38:27 +02:00
buddha87
295c7e7ae9 Removed spellchecker for richtext placeholder. 2016-05-17 21:36:50 +02:00
Lucas Bartholemy
03578dd980 Merge branch 'master' into v1.1-dev 2016-05-17 18:50:38 +02:00
Lucas Bartholemy
b22f6bbf5e Removed unnecessary notification views 2016-05-17 16:56:28 +02:00
buddha87
6fac50d840 Merge pull request #1723 from buddha87/master 
Documentation ehnhancements
 2016-05-17 16:18:00 +02:00
buddha87
af92c8a7b5 Merge branch 'master' of https://github.com/humhub/humhub 2016-05-17 16:17:07 +02:00
buddha87
1dfeff1aed Documentation enhancements 2016-05-17 16:16:05 +02:00
Lucas Bartholemy
7635e6c2a0 Added second example like & fixed translation category 2016-05-17 16:09:47 +02:00
Lucas Bartholemy
43aa54eb89 Added group support for comment notifications 2016-05-17 16:04:22 +02:00
Lucas Bartholemy
645c30d971 Created PrerequisitesList widget for installer and admin 2016-05-17 16:01:01 +02:00
Lucas Bartholemy
28e4356b73 Added group_key migration for notification table 2016-05-17 15:30:17 +02:00
Lucas Bartholemy
7af22d075c Fixed notification order 2016-05-17 15:25:13 +02:00
Lucas Bartholemy
c0fa2ab8d6 Limit like notification to the creator of the content 2016-05-17 15:21:42 +02:00
Lucas Bartholemy
bd4f37692f Also send grouped notification e-mails 2016-05-17 14:47:19 +02:00
Lucas Bartholemy
54e37169a5 Added notification grouping 2016-05-17 03:59:03 +02:00
buddha87
87c257fb9c Removed wall from renameClass in base Migration 2016-05-16 22:12:35 +02:00
Lucas Bartholemy
e7b91e3c83 Added viewable class 2016-05-14 15:47:40 +02:00
Lucas Bartholemy
5ecbe7636a SocialActivity render method cleanup 2016-05-14 15:10:33 +02:00
Lucas Bartholemy
824e1afc2b Added online modules third-party warning popup 2016-05-14 03:28:14 +02:00
Lucas Bartholemy
c384348a1d User Approval Fixes 2016-05-14 01:59:37 +02:00
Lucas Bartholemy
5be76e7820 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-14 00:51:52 +02:00
Lucas Bartholemy
d96e59d9a2 Added new user invite also outside of spaces 2016-05-14 00:51:40 +02:00
buddha87
448b8a3b40 Merge pull request #1713 from buddha87/v1.1-dev 
Admin Settings Text/Layout
 2016-05-13 20:00:18 +02:00
buddha87
c8dca96cf3 Admin Settings Text/Layout 2016-05-13 19:58:51 +02:00
Lucas Bartholemy
5ddfae7349 Fixed user deletion 2016-05-13 15:58:39 +02:00
Lucas Bartholemy
b517b68181 Renamed user profile default action to home 2016-05-13 13:47:51 +02:00
Lucas Bartholemy
b3a443e483 Disabled logging of 404 errors in database target 2016-05-13 13:36:28 +02:00
Lucas Bartholemy
6b3b911ae5 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-13 13:30:51 +02:00
Lucas Bartholemy
362ef23845 Added sublayout for space admin 2016-05-13 13:30:40 +02:00
buddha87
3b10fe9848 Merge pull request #1712 from buddha87/v1.1-dev 
Abstract SocialActivity class for BaseActivity/BaseNotification + Tabbed Forms
 2016-05-13 13:29:30 +02:00
buddha87
9f036e717f Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-13 13:27:25 +02:00
Lucas Bartholemy
41079fbc53 Fixed missing Yii Import 2016-05-13 13:18:39 +02:00
Lucas Bartholemy
8c6772e209 Restructured administration menu 2016-05-13 13:05:35 +02:00
Lucas Bartholemy
a3e919823d Make BaseMenu markAsActive static 2016-05-13 13:04:16 +02:00
buddha87
ac9e896229 Abstract SocialActivity class for BaseActivity/BaseNotification + Moved Multidropdown (select2) + Tabbed form to own assets + User Admin Layout panel-body change 2016-05-13 12:45:49 +02:00
buddha87
1c52bcfc92 Merge pull request #1710 from nminelle/master 
Corrected typo in the mail view (space removed)
 2016-05-11 20:41:29 +02:00
Nicolas Minelle
3dae0ab298 fr corrections 2016-05-11 19:38:00 +02:00
Nicolas Minelle
8408596d7a Corrected typo (space removed) 2016-05-11 18:30:04 +02:00
Nicolas Minelle
e62ec1a90b Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	protected/humhub/modules/directory/messages/fr/views_directory_members.php
#	protected/humhub/modules/user/messages/fr/widgets_views_profileHeader.php
#	protected/humhub/modules/user/messages/fr/widgets_views_userFollower.php
#	protected/humhub/modules/user/messages/fr/widgets_views_userSpaces.php
 2016-05-11 18:26:13 +02:00
Lucas Bartholemy
65138bf55b Moved all user related administration stuff to user menu 2016-05-11 12:43:11 +02:00