buddha87
55c92cfea4
Removed test script
2016-07-14 11:43:13 +02:00
kozhevnikov
28dfe55f3b
rules for acl
...
added guestAllowedActions + rules condition
bug fix
added guestAllowedActions + rules condition
bug fix
2016-07-14 11:40:17 +03:00
Lucas Bartholemy
0ff44af29a
Adjusted login test error message
2016-07-14 07:41:29 +02:00
Lucas Bartholemy
8e0e3b8182
Merge pull request #1830 from 3cst4sy/cherrypick
...
Cherrypick
2016-07-14 07:35:42 +02:00
Lucas Bartholemy
42580504a9
Merge pull request #1850 from jyann/custom-tours
...
Custom tours
2016-07-14 07:32:59 +02:00
Jonathan Yannes
a6e709746d
ADDED configurable validation to tour-completed endpoint
2016-07-13 14:31:38 -04:00
Lucas Bartholemy
53749411f6
Merge pull request #1855 from cebe/general-cleanup
...
cleanup and grammar fixes
2016-07-13 19:34:43 +02:00
buddha87
b54bfd98cb
Theme.css update from current less compilation
2016-07-13 18:06:04 +02:00
buddha87
3a8da355bc
Merge branch 'master' of https://github.com/humhub/humhub
2016-07-13 18:04:30 +02:00
buddha87
e6bd5e52a7
Force render Markdown Addlink/AddFile modals over fullscreen editor.
2016-07-13 18:02:11 +02:00
kozhevnikov
7d44f9aa40
Merge branch 'master' of github.com:humhub/humhub
2016-07-13 17:29:13 +03:00
Carsten Brandt
662e0b56b1
cleanup module classes
2016-07-13 15:06:36 +02:00
Carsten Brandt
a5362298de
english grammar fixes
2016-07-13 15:05:56 +02:00
Sebastian Stumpf
dc6be0f11e
Added eclipse environment files to .gitignore.
2016-07-13 14:30:20 +02:00
Sebastian Stumpf
b1addd06d8
Merge branch 'master' of https://github.com/humhub/humhub.git
2016-07-13 14:26:53 +02:00
Sebastian Stumpf
50992225d5
Fixed positioning of arrows in galleries.
2016-07-13 14:21:35 +02:00
HumHub Translate
9459c69de1
Enh: Updated Translations (translate.humhub.org)
2016-07-13 14:14:45 +02:00
Sebastian Stumpf
c27f23c68e
Removed routine temporary disabling memory allocation and dimension
...
check.
2016-07-13 12:46:02 +02:00
Sebastian Stumpf
c307000dd7
Added filetype check before call to image dimension validation in
...
File->validateSize().
Added check if file exists before further processing in
ImageConverter->allocateMemory().
2016-07-13 11:46:28 +02:00
buddha87
371951df6b
Fixed error when edit user without group assignment.
2016-07-12 17:29:19 +02:00
buddha87
76b1eed6be
Merge branch 'master' of https://github.com/humhub/humhub
2016-07-12 17:09:50 +02:00
Lucas Bartholemy
796a07e980
Merge branch 'master' of github.com:humhub/humhub
2016-07-12 17:03:53 +02:00
Lucas Bartholemy
23147e3b62
Enh: Flush also assets directory on cache delete
2016-07-12 17:03:38 +02:00
buddha87
9cdecc1bdc
Merge branch 'master' of https://github.com/humhub/humhub
2016-07-12 16:55:12 +02:00
buddha87
cb8a8862b9
Enh: Added Pastvalidator for profile birthday.
2016-07-12 16:54:36 +02:00
Lucas Bartholemy
9b5abedb98
Merge pull request #1849 from cebe/patch-2
...
Adjust Yii requirements in composer.json
2016-07-12 13:06:19 +02:00
Lucas Bartholemy
d57a92202a
Fixed: Allow LDAP user login by e-mail address
2016-07-12 12:22:06 +02:00
Nadil Conscious Solutions
514a1d2068
Updated About View File
...
Although we added the markdown editor in the fields, We are unable to display the markdown editor text in the file without processing it. So here I have added some codes to process the the markdown text If the field type is Markdow
2016-07-12 11:13:29 +05:30
Nadil Conscious Solutions
7ce6881112
Updated with adding case for markdown
2016-07-12 09:57:16 +05:30
Nadil Conscious Solutions
d34e692aab
Updated the base type by adding Markdown Editor type
2016-07-12 09:52:43 +05:30
Nadil Conscious Solutions
c497258d7e
Created Markdown Editor
...
A class should be needed to create a new field type,
2016-07-12 09:50:42 +05:30
Jonathan Yannes
97fd92bcf0
Merge branch 'master' of https://github.com/humhub/humhub
...
* 'master' of https://github.com/humhub/humhub :
Module Asset Management use asset path instead of file path to determine published url
Moved "Admin->Settings->User" to "Admin->User->Settings" + added some texts.
Fixed module update assets problem.
Enhanced URL matching in RichText
Allow default value in getter of settings
Enh: Allow CamelCase moduleIds in MessageCommand
Temporarily disabled new image converter memory allocation
Enh: Updated Translations (translate.humhub.org)
Enh: Updated Translations (translate.humhub.org)
Added missing translation on space settings
Enh: Added possibility to change profile default route
Enh: Improved user spaces profile sidebar widget
Enh: Don't include hidden spaces to user profile space statistics
Fixed BaseMenu isActive flag
Fixed: Ensure LDAP 'memberof' is an array
Added memory allocation and check routine to avoid fatal php errors occurring when processing images with large dimensions.
Added notification overview link in droptodwn + notification overview styling
Enh: Added newPassword unequals currentPassword validation + trim password
Fixed hide delete and edit profile-/banner-image buttons after image deletion
2016-07-11 12:44:44 -04:00
Carsten Brandt
0de6df7d5c
Adjust Yii requirements in composer.json
...
More restrictive version constraints. Otherwise Humhub would break if Yii releases a 2.1 version. Same for extensions.
2016-07-11 18:34:49 +02:00
Jonathan Yannes
6ae469dbff
removed tour complete limitation to allow custom tour names
2016-07-11 11:22:33 -04:00
buddha87
1ffa682c2d
Module Asset Management use asset path instead of file path to determine published url
2016-07-11 14:54:29 +02:00
kozhevnikov
73ad5cd16c
added access control rule by accepted groups
2016-07-11 13:52:08 +03:00
buddha87
314b5f616e
Moved "Admin->Settings->User" to "Admin->User->Settings" + added some texts.
2016-07-10 15:32:35 +02:00
buddha87
35699dfa0b
Fixed module update assets problem.
2016-07-09 12:25:29 +02:00
buddha87
956f8930ff
Enhanced URL matching in RichText
2016-07-08 21:27:00 +02:00
buddha87
96296e781a
Allow default value in getter of settings
2016-07-08 17:36:26 +02:00
Lucas Bartholemy
1f3efd86e2
Enh: Allow CamelCase moduleIds in MessageCommand
2016-07-08 15:34:29 +02:00
Lucas Bartholemy
591bbb6e11
Merge branch 'master' of github.com:humhub/humhub
2016-07-08 14:39:54 +02:00
Lucas Bartholemy
9ae981c914
Temporarily disabled new image converter memory allocation
2016-07-08 14:39:35 +02:00
HumHub Translate
db84bb0c43
Enh: Updated Translations (translate.humhub.org)
2016-07-08 14:32:06 +02:00
HumHub Translate
8ca520b95f
Enh: Updated Translations (translate.humhub.org)
2016-07-08 14:29:53 +02:00
Lucas Bartholemy
efbd8b4b2a
Added missing translation on space settings
2016-07-08 14:29:11 +02:00
Lucas Bartholemy
f4844765a2
Enh: Added possibility to change profile default route
2016-07-08 12:53:05 +02:00
Lucas Bartholemy
2780a25b83
Enh: Improved user spaces profile sidebar widget
2016-07-08 09:44:20 +02:00
Lucas Bartholemy
0513e82caf
Enh: Don't include hidden spaces to user profile space statistics
2016-07-08 09:43:48 +02:00
Lucas Bartholemy
bb1072bcb6
Fixed BaseMenu isActive flag
2016-07-07 15:02:26 +02:00
