2085 Commits

Author SHA1 Message Date
buddha87
b78f3413c8 Added Documentation 2016-04-19 23:35:10 +02:00
buddha87
7d8658857d Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:34:28 +02:00
buddha87
cdb255e679 Use of fully qualified column names for user approval search. 2016-04-19 17:33:33 +02:00
buddha87
1edc188c4a Merge pull request #1655 from buddha87/master
Fixed #1652 use fully qualified column names for user search
2016-04-19 17:18:36 +02:00
buddha87
811b061455 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:16:15 +02:00
buddha87
bc19b1bb85 Fixed #1652 use fully qualified column names for user search 2016-04-19 17:15:46 +02:00
Lucas Bartholemy
b476ca7d0e Fixed: Login page redirect for guests 2016-04-19 15:09:52 +02:00
Lucas Bartholemy
78e9cb882f Merge pull request #1654 from cebe/patch-1
fixed path in layouting docs
2016-04-19 14:22:22 +02:00
Carsten Brandt
423cbb7b1c fixed path in layouting docs 2016-04-19 13:40:58 +02:00
buddha87
6ec93886c3 Merge pull request #1648 from buddha87/master
Static max width/height for ligthbox gallery + removed outline from g…
2016-04-15 14:53:05 +02:00
buddha87
c366600d00 Static max width/height for ligthbox gallery + removed outline from gallery 2016-04-15 14:47:10 +02:00
Lucas Bartholemy
7aab8b9339 Merge pull request #1646 from helnokaly/master
Fix issue space->getAdmins() returning all space members
2016-04-14 23:49:04 +02:00
helnokaly
0067acb0e7 Fix issue space->getAdmins returning all space members 2016-04-14 18:43:14 +02:00
Lucas Bartholemy
87ce19737c Changed HumHub version to 1.0.1 2016-04-14 17:48:48 +02:00
Lucas Bartholemy
b7d50817af Enh: Increased fxp/composer-asset-plugin version 2016-04-14 17:48:19 +02:00
Lucas Bartholemy
2e787ec380 Fixed #1636: Chinese language yii category mapping 2016-04-14 17:02:50 +02:00
Lucas Bartholemy
da88feef0e Fixed #1594: Removed duplicated code 2016-04-14 16:56:16 +02:00
Lucas Bartholemy
d09d6829ac Merge branch 'master' of github.com:humhub/humhub 2016-04-14 16:50:02 +02:00
Lucas Bartholemy
ed19da7b48 Enh #1634: Added favicon.ico to gitignore 2016-04-14 16:49:11 +02:00
buddha87
094a2741da Merge pull request #1642 from buddha87/master
Allow non unique space names by configuration + Ajax follow space button
2016-04-13 16:41:20 +02:00
buddha87
2a39ce2651 Enh: Ajax follow space button 2016-04-13 16:38:16 +02:00
buddha87
fa113fcf2c Merge branch 'master' of https://github.com/humhub/humhub 2016-04-13 16:35:57 +02:00
buddha87
3aa0d2d05b Enable non unique space names by configuration. 2016-04-13 14:39:59 +02:00
buddha87
609992a231 Merge pull request #1635 from buddha87/master
Fixed #1616 fixed contentaddon canDelete issue
2016-04-11 20:40:37 +02:00
buddha87
61d2e2b00a Fixed #1616 fixed contentaddon canDelete issue 2016-04-11 20:37:33 +02:00
buddha87
fcc3c16693 Merge pull request #1620 from buddha87/master
Fixed #1606 Hide edit and delete link when profile image is removed
2016-04-07 19:35:20 +02:00
buddha87
77bab18090 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-07 19:34:14 +02:00
buddha87
7ebf2c1df9 Fixed #1606 Hide edit and delete link when profile image is removed 2016-04-07 19:32:58 +02:00
buddha87
4f9357c792 Merge pull request #1285 from davidjeddy/patch-2
Update .travis.yml
2016-04-07 16:40:38 +02:00
buddha87
df3d578abe Merge pull request #1243 from rubenandre/patch-4
Update widgets_views_markdownEditor.php
2016-04-07 16:38:50 +02:00
buddha87
61cab1d382 Merge pull request #1612 from buddha87/master
Fixed date/birthdate field type bug
2016-04-06 00:16:46 +02:00
buddha87
ff26d3b37c Fixed Date field type bug 2016-04-05 23:29:06 +02:00
buddha87
55445a0c31 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-05 23:12:20 +02:00
buddha87
57d9a30696 Fixed FieldType Date 2016-04-05 23:10:38 +02:00
buddha87
6cb45965df Merge pull request #1609 from RichWeber/#1608
fix #1608
2016-04-05 22:54:04 +02:00
buddha87
5f8d2bb145 Fixed birthdate profile edit field 2016-04-05 22:50:02 +02:00
buddha87
4436482690 Fixed date/birthdate field type bug 2016-04-05 22:39:25 +02:00
RichWeber
516c67182e fix #1608 2016-04-05 23:32:13 +03:00
buddha87
bf3faa244c Fixed Date form field type bug. 2016-04-05 18:19:59 +02:00
buddha87
de61e77e53 Merge pull request #1607 from buddha87/master
Fixed #1604 invite error display.
2016-04-05 14:43:01 +02:00
buddha87
2cfa09aeaa Fixed #1604 invite error display. 2016-04-05 14:42:15 +02:00
Lucas Bartholemy
abc41bf181 Fixed: Typo in space-assign-all-members command 2016-04-04 17:47:23 +02:00
Lucas Bartholemy
2167fa94b3 Fixed: Word-break in comments/activity 2016-04-03 15:42:02 +02:00
Lucas Bartholemy
2807b90625 Merge pull request #1595 from nminelle/master
Completed French translations for Comment module
2016-04-01 19:49:16 +02:00
Nicolas Minelle
1eda517a29 French translation typo in Comment module 2016-04-01 19:18:53 +02:00
Nicolas Minelle
5f550f5a33 Completed French translations for Comment module 2016-04-01 18:51:12 +02:00
HumHub Translate
f4a68207a5 Enh: Updated Translations (translate.humhub.org) 2016-04-01 17:28:17 +02:00
Lucas Bartholemy
a0cc9e3fb6 Merge pull request #1586 from davidjeddy/master
Update index-test.php
2016-04-01 17:26:37 +02:00
Lucas Bartholemy
fdf130fec0 Merge pull request #1591 from nminelle/master
Completed French translation for Search module
2016-04-01 17:24:48 +02:00
Lucas Bartholemy
a834393552 Merge pull request #1593 from smb043/patch-1
Fix username or email value (rus)
2016-04-01 17:24:22 +02:00