aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge pull request #14 from redmatrix/devmrjive2018-02-0210-65/+104
| |\ \ \
| * \ \ \ Merge pull request #13 from redmatrix/devmrjive2018-01-3034-132/+450
| |\ \ \ \
| * | | | | small changesmrjive2018-01-291-1/+1
| * | | | | Update connections.tplmrjive2018-01-291-1/+1
| * | | | | Merge pull request #12 from redmatrix/devmrjive2018-01-2628-1004/+999
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #11 from redmatrix/devmrjive2018-01-24171-9879/+35010
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #10 from redmatrix/devmrjive2018-01-2226-300/+274
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #8 from redmatrix/devmrjive2018-01-181-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #7 from redmatrix/devmrjive2018-01-16569-20244/+34966
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #999 from mjfriaza/devgit-marijus2018-03-132-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Spanish translation: adapted the new timeago's stuffManuel Jiménez Friaza2018-03-132-9/+9
* | | | | | | | | | | Merge pull request #997 from mjfriaza/devgit-marijus2018-03-132-5/+5
|\| | | | | | | | | |
| * | | | | | | | | | Spanish translation: added el before artículo, which is the correct construc...Manuel Jiménez Friaza2018-03-112-5/+5
* | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-136-6/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unicode/emoji usernames. Warning: experimental feature, unstable, untested, d...zotlabs2018-03-124-6/+36
| * | | | | | | | | | | obscure permission issue with custom permissions when using the highly discou...zotlabs2018-03-122-0/+10
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-124-20/+30
|\| | | | | | | | | | |
| * | | | | | | | | | | Setup - .htconfig.php write access is now required for automated installation...zotlabs2018-03-111-8/+12
| * | | | | | | | | | | remove debuggingzotlabs2018-03-101-2/+0
| * | | | | | | | | | | trim expects error ... in admin/sitezotlabs2018-03-103-13/+20
* | | | | | | | | | | | update mysql schemaMario Vavti2018-03-111-3/+0
* | | | | | | | | | | | do not use trim on arrayMario Vavti2018-03-101-1/+1
* | | | | | | | | | | | update changelogMario Vavti2018-03-091-1/+1
* | | | | | | | | | | | Merge pull request #994 from Reylak/devgit-marijus2018-03-091-15/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Uniformize title input with other input fieldsMathieu "Matbac" Bacou2018-03-081-0/+4
| * | | | | | | | | | | | Remove useless background spec for category fieldMathieu "Matbac" Bacou2018-03-081-1/+0
| * | | | | | | | | | | | Fix background of tags fieldMathieu "Matbac" Bacou2018-03-081-15/+23
| * | | | | | | | | | | | Fix code background in wiki pagesMathieu "Thrar" Bacou2018-03-081-0/+4
* | | | | | | | | | | | | remove redundant commaMario Vavti2018-03-091-1/+1
* | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | notifications-btn-1 does not actually require the text-white class and this i...zotlabs2018-03-082-2/+2
* | | | | | | | | | | | use dbunescbin() for cover photosMario2018-03-081-1/+1
* | | | | | | | | | | | fix syntax error in postgres updateMario2018-03-081-3/+3
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-086-3/+74
|\| | | | | | | | | | |
| * | | | | | | | | | | remove extraneous loggingzotlabs2018-03-071-3/+1
| * | | | | | | | | | | hashtag autocompletezotlabs2018-03-072-1/+44
| * | | | | | | | | | | federated polls: GNU-Social requires us to preserve the original order of the...zotlabs2018-03-074-2/+32
* | | | | | | | | | | | we need the javascript in the template since strings are involvedMario Vavti2018-03-076-162/+181
* | | | | | | | | | | | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
* | | | | | | | | | | | we do not support separate mobile themes anymoreMario Vavti2018-03-072-8/+8
|/ / / / / / / / / / /
* | | | | | | | | | | federated polls: add poll_author which will be necessary for Diaspora federationzotlabs2018-03-064-1/+31
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-062-0/+144
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update changelogMario Vavti2018-03-061-0/+126
| * | | | | | | | | | | Merge pull request #991 from anaqreon/devgit-marijus2018-03-061-0/+18
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve rendering of Readme files in plugin settingsAndrew Manning2018-03-051-0/+18
| |/ / / / / / / / / / /
* / / / / / / / / / / / don't add pending connections to the default privacy group until acceptedzotlabs2018-03-061-7/+10
|/ / / / / / / / / / /
* | | | | | | | | | | add pdl file for mod moderateMario Vavti2018-03-051-0/+4
* | | | | | | | | | | fix javascript error if there are no notificationsMario Vavti2018-03-051-2/+1
* | | | | | | | | | | update redbasic theme screenshotMario Vavti2018-03-052-0/+0
* | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-056-18/+54
|\ \ \ \ \ \ \ \ \ \ \