aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | reorganize German docs to fit the new docs structurezottel2015-12-173-92/+17
| |/ / /
* / / / issue #228redmatrix2015-12-172-3/+3
|/ / /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-166-58/+75
|\ \ \
| * \ \ Merge pull request #225 from zzottel/masterredmatrix2015-12-176-58/+75
| |\ \ \
| | * | | small fixes in English help fileszottel2015-12-163-5/+5
| | * | | updates to some German help fileszottel2015-12-163-53/+70
* | | | | queue/notification/delivery refactor continuedredmatrix2015-12-165-241/+119
|/ / / /
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-165-7953/+8255
|\| | |
| * | | Merge pull request #224 from zzottel/masterzzottel2015-12-162-6969/+7218
| |\ \ \
| | * | | update to German stringszottel2015-12-162-6969/+7218
| |/ / /
| * | | Merge pull request #223 from zzottel/masterzzottel2015-12-161-1/+1
| |\ \ \
| | * | | remove directory fallback server red.zottel.red, add hubzilla.zottel.net insteadzottel2015-12-161-1/+1
| * | | | Merge pull request #222 from wave72/masterWave2015-12-162-983/+1036
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Updated Italian stringsPaolo Tacconi2015-12-162-983/+1036
* | | | some notifier optimisations. Also put a fixme on the invite total generations...redmatrix2015-12-163-27/+21
|/ / /
* | | some more minor api tweaksredmatrix2015-12-151-5/+9
* | | bring back the schemaspy makefileredmatrix2015-12-151-0/+17
* | | remove deprecated tableredmatrix2015-12-156-39/+2
* | | additional fix for the array_key_exists message in #221redmatrix2015-12-151-1/+1
* | | issue #221redmatrix2015-12-15374-89385/+31
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-153-2/+9
|\ \ \
| * | | Invitation only added to the admin site page. Plus css wrapper class to docu ...jeroenpraat2015-12-153-2/+9
* | | | enhance whitespaceredmatrix2015-12-151-1/+1
* | | | fix typos before mergingredmatrix2015-12-151-1/+1
* | | | revise the photo activity a bit so that we always have a valid activity body....redmatrix2015-12-154-50/+53
|/ / /
* | | even more queue apiredmatrix2015-12-151-15/+7
* | | more queue apiredmatrix2015-12-154-30/+29
* | | more work on queue apiredmatrix2015-12-144-67/+45
* | | simplify queue insertion for normal itemsredmatrix2015-12-142-39/+44
* | | regenerate the item body for linked photo items that now have no body to prov...redmatrix2015-12-142-0/+22
* | | set following to falseredmatrix2015-12-141-1/+1
| | * Commented out extra addons, themes etc.Haakon Meland Eriksen2015-12-181-9/+9
| | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-1451-3337/+3139
| | |\ | |_|/ |/| |
* | | revert include/photos.php:L380redmatrix2015-12-142-2/+2
* | | more work on api media uploadsredmatrix2015-12-134-20/+37
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-135-1518/+1511
|\ \ \
| * | | Typosjeroenpraat2015-12-121-1/+1
| * | | That script is taken from someone else without any contribution (http://blog....jeroenpraat2015-12-121-14/+3
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-12-123-2/+28
| |\ \ \
| * | | | es+nl strings updatejeroenpraat2015-12-124-1504/+1508
* | | | | remove the unqualified "OAuth" namespace from the project. We need to referen...redmatrix2015-12-138-102/+103
| |/ / / |/| | |
* | | | a couple of api improvementsredmatrix2015-12-112-2/+11
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-111-0/+16
|\ \ \ \
| * \ \ \ Merge pull request #215 from royalterra/masterredmatrix2015-12-121-0/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update INSTALL.txtroyalterra2015-12-111-0/+1
| | * | | Update INSTALL.txtroyalterra2015-12-111-0/+15
| | * | | Merge pull request #1 from redmatrix/masterroyalterra2015-12-11286-47204/+49251
| | |\ \ \
* | | | | | add deprecated update_with_media endpointredmatrix2015-12-111-0/+1
|/ / / / /
* | / / / incorrect obj_type on several itemsredmatrix2015-12-116-618/+621
| |/ / / |/| | |
* | | | some minor cleanup - change the default of the discover tab (public stream ac...redmatrix2015-12-105-27/+28