aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-314-58/+47
|\
| * nl+es-es string updatejeroenpraat2015-12-294-58/+47
* | comment clarificationredmatrix2015-12-311-1/+1
* | log API improvements and queue optimisation for singleton networksredmatrix2015-12-317-49/+87
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-291-1/+1
|\
| * Merge pull request #238 from anaqreon/remove-bad-urlredmatrix2015-12-281-1/+1
| |\
| | * Removed defunct URL from old auto-update ideaAndrew Manning2015-12-261-1/+1
* | | store perms_accept on channel creationredmatrix2015-12-292-3/+3
|/ /
* / refresh issueredmatrix2015-12-273-3/+10
|/
* Set accept permissions to that of role so if you change to a custom role you ...redmatrix2015-12-251-1/+1
* don't send wall-post notifications when creating webpages on another channelredmatrix2015-12-251-1/+1
* spellingredmatrix2015-12-251-1/+1
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-253-47/+45
|\
| * update es-es stringsjeroenpraat2015-12-253-47/+45
* | regression: default inherited permission was not being set for a connection i...redmatrix2015-12-253-7/+4
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-2413-1710/+1761
|\
| * After reading and talking with experts I came to the conclusion that es-es an...jeroenpraat2015-12-2412-23098/+1
| * reverted my previous commit. this is going to be fixed remotely upstream. Mea...jeroenpraat2015-12-2321-20/+1
| * Spanish language codes. See issue #234jeroenpraat2015-12-2341-0/+23117
| * update es+nl stringsjeroenpraat2015-12-224-1710/+1760
* | issue #235redmatrix2015-12-242-2/+2
* | start on refactor of plugin/theme/widget info block parsingredmatrix2015-12-223-15/+16
|/
* make the queue api accessible to addonsredmatrix2015-12-212-2/+8
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-201-0/+1
|\
| * Merge pull request #232 from wave72/masterredmatrix2015-12-211-0/+1
| |\
| | * Added 'invitation_only' to site infowave722015-12-201-0/+1
| | * Merge pull request #4 from redmatrix/masterWave2015-12-20716-138586/+51589
| | |\ | | |/ | |/|
* | | merge hellredmatrix2015-12-204-42/+50
* | | Merge branch 'HaakonME-master'redmatrix2015-12-206-2480/+2575
|\ \ \
| * | | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2015-12-202-1591/+1669
| * | | 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
|/ / /