aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-116-16/+22
|\
| * also disable uploading in comments if the channel permissionlimits for view_s...zotlabs2017-11-111-0/+3
| * set os_syspath in DAV file put operation so that photos will scale correctly.zotlabs2017-11-101-3/+6
| * hubzilla issue #901 - unicode characters in urls tripping up url regexes - th...zotlabs2017-11-094-13/+13
* | changelogMario Vavti2017-11-111-1/+32
* | fix wiki pages not updating after creating new pageMario Vavti2017-11-111-1/+1
* | animate fastMario Vavti2017-11-111-1/+1
* | dedicate the first click to slideup the cover again but make sure the nav but...Mario Vavti2017-11-111-2/+1
* | revert back to get the mid from enotify - otherwise we can not distinct betwe...Mario Vavti2017-11-103-7/+8
* | bring some ajax to photo uploadMario Vavti2017-11-103-0/+239
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-094-3/+7
|\
| * unable to change permissions on wiki with space in namezotlabs2017-11-081-1/+1
| * use loggerzotlabs2017-11-081-2/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-085-17/+35
| |\
| * | make most recent cloud_tiles setting for local channels persistent across loginszotlabs2017-11-072-0/+5
* | | get the path infos from pathname instead of seperate data attributeMario Vavti2017-11-093-9/+7
* | | load notifications links to /display via ajax if we are already in /displayMario Vavti2017-11-095-5/+34
| |/ |/|
* | css fixesMario Vavti2017-11-082-7/+7
* | only show nav app link if we have a selected appMario Vavti2017-11-081-0/+2
* | use text-muted on site locationMario Vavti2017-11-081-1/+1
* | truncate nav-app-link if appropriateMario2017-11-083-3/+8
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-078-4/+391
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-068-13/+45
| |\
| * | .htignore updatezotlabs2017-11-062-2/+3
| * | second half of issue #893 - move channel default permissions to its own modul...zotlabs2017-11-066-1/+377
| * | bring back tabindex to submit commentszotlabs2017-11-061-2/+12
* | | rename channel app events to calendar and add nav_set_selected() to /calMario Vavti2017-11-073-7/+6
* | | move style out of templateMario Vavti2017-11-072-3/+7
* | | add location info to the navbarMario Vavti2017-11-072-8/+16
| |/ |/|
* | update es-es help.htmlMario Vavti2017-11-061-1/+1
* | Merge pull request #900 from anaqreon/devgit-marijus2017-11-065-7/+39
|\ \
| * | Update help.htmlAndrew Manning2017-11-041-2/+2
| * | Add Manuel's Spanish translations for context helpAndrew Manning2017-11-025-7/+39
* | | lets try this in the wild for a whileMario Vavti2017-11-062-5/+5
* | | fix unable to mark all messages readMario Vavti2017-11-061-1/+1
| |/ |/|
* | attach.php minor cleanup and doczotlabs2017-11-061-61/+26
* | allow cloud filenames to include ampersands without messing up auth tokens (z...zotlabs2017-11-054-32/+15
* | common connections on suggestion page showing wildly different results than r...zotlabs2017-11-051-2/+2
* | fix can_comment_on_post() after recent code cleanup (a required array paramet...zotlabs2017-11-041-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-042089-505286/+492846
|\ \
| * | fix wrong variable in sprintf resulting in php warningMario Vavti2017-11-041-1/+1
| * | Merge pull request #883 from dawnbreak/docugit-marijus2017-11-0426-1254/+2153
| |\ \
| | * \ Merge branch 'dev' into docugit-marijus2017-11-040-0/+0
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'dev' into docugit-marijus2017-11-042070-504039/+490740
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #891 from dawnbreak/langlibsgit-marijus2017-11-042063-504033/+490694
| |\ \ \
| | * | | :white_check_mark: Some more work on unit tests.Klaus Weidenbach2017-10-296-177/+261
| | * | | :arrow_up: Update intl library.Klaus Weidenbach2017-10-292034-499059/+486344
| | * | | :arrow_up: Update Text_LanguageDetect.Klaus Weidenbach2017-10-2924-2489/+1614
| | * | | :white_check_mark: Some unit test for include/language.phpKlaus Weidenbach2017-10-262-0/+167
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-044-4/+18
| |\ \ \ \