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 |
|
Lucas Bartholemy
|
5dc7493392
|
Added yii alias @moduleId to modules basedir
|
2016-05-11 12:32:34 +02:00 |
|
Lucas Bartholemy
|
5091f40d09
|
Merge pull request #1708 from davidjeddy/patch-1
Update BaseMenu.php
|
2016-05-11 09:35:23 +02:00 |
|
David J Eddy
|
46285c3ebf
|
Update BaseMenu.php
Corrected DocBlock to properly work with IDE type hinting
|
2016-05-10 17:12:54 -04:00 |
|
buddha87
|
bfaf7c0fff
|
Merge pull request #1706 from buddha87/v1.1-dev
Grid view alignments + Permission submenu
|
2016-05-10 16:17:14 +02:00 |
|
buddha87
|
15de5818c5
|
Grid view alignments + Permission submenu
|
2016-05-10 16:14:43 +02:00 |
|
Lucas Bartholemy
|
4f0623089e
|
Space default home improvements
|
2016-05-10 13:45:37 +02:00 |
|
buddha87
|
7aa12c4427
|
Merge pull request #1704 from buddha87/v1.1-dev
Spacenamecolor widget
|
2016-05-10 09:22:55 +02:00 |
|
buddha87
|
78f74868b0
|
Use of spacenamecolorwidget in space settings + better asset management.
|
2016-05-10 09:20:49 +02:00 |
|
buddha87
|
cd8f9c1d56
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-10 07:36:17 +02:00 |
|
buddha87
|
3ff25a7894
|
Space name/color widget + Tab Menu Admin Modules
|
2016-05-10 07:25:56 +02:00 |
|
Lucas Bartholemy
|
7f44885864
|
Minor UI improvements
|
2016-05-10 02:42:24 +02:00 |
|
Lucas Bartholemy
|
21dab558df
|
Added space pretty urls, cleanup space controls menu
|
2016-05-10 02:09:39 +02:00 |
|
buddha87
|
81446fa858
|
Merge pull request #1703 from buddha87/v1.1-dev
Add Group Member loader button
|
2016-05-10 01:16:04 +02:00 |
|
buddha87
|
2f495e1fee
|
Add Group Member loader button
|
2016-05-10 01:15:16 +02:00 |
|
buddha87
|
762c35ac4f
|
Merge pull request #1702 from buddha87/v1.1-dev
New Tab Menu (Admin)
|
2016-05-10 01:05:34 +02:00 |
|
buddha87
|
944bf8dba6
|
New Tab Menu (Admin)
|
2016-05-10 01:04:40 +02:00 |
|
Lucas Bartholemy
|
2bb4db6ba1
|
Improved user url rule
|
2016-05-10 00:26:48 +02:00 |
|
buddha87
|
48590467c3
|
Merge pull request #1701 from buddha87/v1.1-dev
New Space Menu (Manage members)
|
2016-05-10 00:23:01 +02:00 |
|
buddha87
|
e61bae4e2a
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-10 00:22:11 +02:00 |
|
buddha87
|
ae6cf6a1d7
|
New Space Menu (Manage members)
|
2016-05-10 00:21:13 +02:00 |
|
buddha87
|
78be219b00
|
Merge pull request #1700 from buddha87/v1.1-dev
New Tab Menu (Space settings)
|
2016-05-10 00:06:51 +02:00 |
|
buddha87
|
61efdf3342
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-10 00:05:49 +02:00 |
|
buddha87
|
b92a43467f
|
New Tab Menu (Space settings)
|
2016-05-10 00:05:07 +02:00 |
|
Lucas Bartholemy
|
c5d3bcddb1
|
Loading buttons in installer
|
2016-05-09 16:00:54 +02:00 |
|
Lucas Bartholemy
|
234908c281
|
Fixed missing Yii import
|
2016-05-09 14:59:52 +02:00 |
|
Lucas Bartholemy
|
3a8b448eab
|
Merge pull request #1698 from 3cst4sy/cherrypick
Translations added
|
2016-05-09 13:49:27 +02:00 |
|
Lucas Bartholemy
|
f76cb85e68
|
Refactored settings usage
|
2016-05-09 03:11:41 +02:00 |
|
xTc
|
47dcef5faa
|
Translations added
|
2016-05-09 02:06:20 +02:00 |
|
Lucas Bartholemy
|
d84470dbd5
|
New settings logic for admin config
|
2016-05-09 01:13:13 +02:00 |
|
Lucas Bartholemy
|
46730ad6f7
|
Better settings compatibility for older modules
|
2016-05-09 00:31:20 +02:00 |
|
Lucas Bartholemy
|
a98753e3e3
|
Added new settings api doc
|
2016-05-09 00:31:05 +02:00 |
|
Lucas Bartholemy
|
c3f74a6428
|
Refactored settings system
|
2016-05-08 21:26:58 +02:00 |
|
buddha87
|
fcdd17e221
|
Merge pull request #1697 from buddha87/v1.1-dev
Enh: Paste text to richtext / richtext formatting
|
2016-05-07 21:50:47 +02:00 |
|
buddha87
|
cd11f6144d
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-07 21:49:54 +02:00 |
|
buddha87
|
42eac0de14
|
Enh: Paste text to richtext / richtext formatting
|
2016-05-07 21:49:15 +02:00 |
|
buddha87
|
e1bd0662a8
|
Merge pull request #1696 from buddha87/v1.1-dev
Enh: Added loader button to space/user settings + fixed user onIntegrity check
|
2016-05-07 19:08:54 +02:00 |
|
buddha87
|
626c892874
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-07 19:07:36 +02:00 |
|
buddha87
|
694e0f540b
|
Enh: Added loader button to space/user settings
|
2016-05-07 19:06:15 +02:00 |
|
buddha87
|
519a8e768e
|
Fixed user onIntegrity check + Space Indexpage validation
|
2016-05-07 18:47:08 +02:00 |
|
buddha87
|
d903267f69
|
Merge pull request #1695 from buddha87/v1.1-dev
Loader buttons + Set index Page for spaces
|
2016-05-07 18:34:09 +02:00 |
|
buddha87
|
3a834105b9
|
Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev
|
2016-05-07 18:31:15 +02:00 |
|
buddha87
|
c225722493
|
Enh: Set index page for spaces.
|
2016-05-07 18:30:48 +02:00 |
|
buddha87
|
76fd7815a4
|
Addes Loader save button in admin forms
|
2016-05-07 18:29:06 +02:00 |
|
Lucas Bartholemy
|
bd8c200f8a
|
Fixed tests scriptUrl
|
2016-05-05 16:22:08 +02:00 |
|
Lucas Bartholemy
|
6276a5bcc1
|
Added scriptUrl to test config
|
2016-05-05 16:07:43 +02:00 |
|