aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-208-1571/+1633
|\
| * Merge pull request #230 from wave72/masterWave2015-12-202-841/+867
| |\
| | * Updated Italian stringswave722015-12-202-841/+867
| * | use realpath to bypass symlinks and check actually directoryredmatrix2015-12-182-1/+11
| * | allow widget 'packages' as well as individual filesredmatrix2015-12-181-2/+7
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-1814-197/+173
| |\ \
| * | | sql delete with limitredmatrix2015-12-184-728/+749
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-18429-98157/+8997
|\ \ \ \ | | |/ / | |/| |
| * | | update smarty to 3.1.28 stableMario Vavti2015-12-1814-197/+173
| |/ /
| * | loop detectionredmatrix2015-12-172-5/+12
| * | more work on media uploads via apiredmatrix2015-12-172-9/+27
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-1711-104/+116
| |\ \
| | * | fix search item attachment renderingMario Vavti2015-12-171-5/+6
| | * | Merge pull request #227 from zzottel/masterzzottel2015-12-174-0/+87
| | |\ \
| | | * \ Merge remote-tracking branch 'upstream/master'zottel2015-12-170-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #226 from zzottel/masterzzottel2015-12-176-99/+23
| | |\ \ \
| | | | * | add forgotten German docszottel2015-12-174-0/+87
| | | |/ /
| | | * | small fixes to English docszottel2015-12-173-7/+6
| | | * | 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