aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | update changelogMario Vavti2017-08-161-1/+1
| |/ |/|
* | typoMario Vavti2017-08-141-1/+1
* | changelogMario Vavti2017-08-141-0/+1
* | Merge pull request #842 from dawnbreak/devgit-marijus2017-08-142-2/+6
|\ \ | |/ |/|
| * Update composer autload cache.Klaus Weidenbach2017-08-112-2/+6
* | contact_slider.tpl didn't get updated with one of the bootstrap changes where...zotlabs2017-08-131-3/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-1219-158/+151
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-121-2/+5
| |\ \
| * | | minor js and css changesgit-marijus2017-08-123-10/+16
| | |/ | |/|
| * | bump versionMario Vavti2017-08-111-1/+1
| * | update to bootstrap betaMario Vavti2017-08-1115-147/+134
* | | add parent item (if applicable) to notifier plugin infozotlabs2017-08-121-0/+2
| |/ |/|
* | add protocol selection to following feedszotlabs2017-08-121-2/+5
|/
* deliverable_singleton - also check hubloc_hash in case we don't have an xchan...zotlabs2017-08-101-1/+9
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-103-3/+23
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-105-17/+23
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-102-4/+10
| |\
| | * update changeloggit-marijus2017-08-101-0/+1
| | * do not show channel manager and nav channel select if we are in a delegate se...git-marijus2017-08-101-4/+8
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-109-20/+22
| | |\
| | * | update changeloggit-marijus2017-08-091-0/+1
| * | | create cdav principal also on client access and remove redundant pconfig chec...Mario Vavti2017-08-102-6/+12
| | |/ | |/|
| * | merge red/master into devMario Vavti2017-08-109-20/+22
| |/
| * App::get_channel() does not return the right channel if we are not looking at...git-marijus2017-08-091-7/+1
* | include the mastodon summary in the postzotlabs2017-08-101-2/+2
* | when following, allow [network]follow_address syntax to connect with a specif...zotlabs2017-08-102-7/+20
* | some doco fixes and other real minor stuff to improve logreading abilityzotlabs2017-08-095-14/+15
* | libxml errorszotlabs2017-08-094-6/+7
|/
* only show upload button to those with write_storage permissionzotlabs2017-08-082-0/+3
* support upload of files and attachments into comments. This has some repercus...zotlabs2017-08-085-0/+49
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-081-1/+95
|\
| * changeloggit-marijus2017-08-081-1/+95
* | remove some no longer used images/iconszotlabs2017-08-0711-0/+0
|/
* ostatus feed was missing commentszotlabs2017-08-062-9/+5
* Merge pull request #838 from phellmes/devgit-marijus2017-08-062-2361/+2411
|\
| * Update DE translation stringsphellmes2017-08-052-2361/+2411
* | Merge pull request #839 from anaqreon/docogit-marijus2017-08-062-0/+9
|\ \
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into docoAndrew Manning2017-08-0520-52/+81
| |\|
| * | Fix CSS for help page content list in sidebar.www-data2017-08-032-0/+9
* | | make config requirements in apps more universal - provide key and valuegit-marijus2017-08-062-8/+6
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-065-0/+198
|\ \ \
| * | | allow channel address to be changedzotlabs2017-08-044-0/+195
| * | | auto preview mail on media insertion alsozotlabs2017-08-031-0/+3
| | |/ | |/|
* / | consolidate disable_discover_tab config if it was not yet set to either 1 or ...git-marijus2017-08-067-12/+15
|/ /
* | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-08-0315-22/+52
|\ \
| * | some bb-to-markdown issueszotlabs2017-08-031-5/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-022-2291/+2341
| |\|
| * | minor activitypub rendering stuffzotlabs2017-08-022-2/+2
| * | plugin hook for update_unseenzotlabs2017-08-015-13/+38
| * | add auto post preview to 'select photo from albums'zotlabs2017-08-011-0/+1