Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | reorganize German docs to fit the new docs structure | zottel | 2015-12-17 | 3 | -92/+17 | |
| |/ / / | ||||||
* / / / | issue #228 | redmatrix | 2015-12-17 | 2 | -3/+3 | |
|/ / / | ||||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-16 | 6 | -58/+75 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #225 from zzottel/master | redmatrix | 2015-12-17 | 6 | -58/+75 | |
| |\ \ \ | ||||||
| | * | | | small fixes in English help files | zottel | 2015-12-16 | 3 | -5/+5 | |
| | * | | | updates to some German help files | zottel | 2015-12-16 | 3 | -53/+70 | |
* | | | | | queue/notification/delivery refactor continued | redmatrix | 2015-12-16 | 5 | -241/+119 | |
|/ / / / | ||||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-16 | 5 | -7953/+8255 | |
|\| | | | ||||||
| * | | | Merge pull request #224 from zzottel/master | zzottel | 2015-12-16 | 2 | -6969/+7218 | |
| |\ \ \ | ||||||
| | * | | | update to German strings | zottel | 2015-12-16 | 2 | -6969/+7218 | |
| |/ / / | ||||||
| * | | | Merge pull request #223 from zzottel/master | zzottel | 2015-12-16 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead | zottel | 2015-12-16 | 1 | -1/+1 | |
| * | | | | Merge pull request #222 from wave72/master | Wave | 2015-12-16 | 2 | -983/+1036 | |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | ||||||
| | * | | Updated Italian strings | Paolo Tacconi | 2015-12-16 | 2 | -983/+1036 | |
* | | | | some notifier optimisations. Also put a fixme on the invite total generations... | redmatrix | 2015-12-16 | 3 | -27/+21 | |
|/ / / | ||||||
* | | | some more minor api tweaks | redmatrix | 2015-12-15 | 1 | -5/+9 | |
* | | | bring back the schemaspy makefile | redmatrix | 2015-12-15 | 1 | -0/+17 | |
* | | | remove deprecated table | redmatrix | 2015-12-15 | 6 | -39/+2 | |
* | | | additional fix for the array_key_exists message in #221 | redmatrix | 2015-12-15 | 1 | -1/+1 | |
* | | | issue #221 | redmatrix | 2015-12-15 | 374 | -89385/+31 | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-15 | 3 | -2/+9 | |
|\ \ \ | ||||||
| * | | | Invitation only added to the admin site page. Plus css wrapper class to docu ... | jeroenpraat | 2015-12-15 | 3 | -2/+9 | |
* | | | | enhance whitespace | redmatrix | 2015-12-15 | 1 | -1/+1 | |
* | | | | fix typos before merging | redmatrix | 2015-12-15 | 1 | -1/+1 | |
* | | | | revise the photo activity a bit so that we always have a valid activity body.... | redmatrix | 2015-12-15 | 4 | -50/+53 | |
|/ / / | ||||||
* | | | even more queue api | redmatrix | 2015-12-15 | 1 | -15/+7 | |
* | | | more queue api | redmatrix | 2015-12-15 | 4 | -30/+29 | |
* | | | more work on queue api | redmatrix | 2015-12-14 | 4 | -67/+45 | |
* | | | simplify queue insertion for normal items | redmatrix | 2015-12-14 | 2 | -39/+44 | |
* | | | regenerate the item body for linked photo items that now have no body to prov... | redmatrix | 2015-12-14 | 2 | -0/+22 | |
* | | | set following to false | redmatrix | 2015-12-14 | 1 | -1/+1 | |
| | * | Commented out extra addons, themes etc. | Haakon Meland Eriksen | 2015-12-18 | 1 | -9/+9 | |
| | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-14 | 51 | -3337/+3139 | |
| | |\ | |_|/ |/| | | ||||||
* | | | revert include/photos.php:L380 | redmatrix | 2015-12-14 | 2 | -2/+2 | |
* | | | more work on api media uploads | redmatrix | 2015-12-13 | 4 | -20/+37 | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-13 | 5 | -1518/+1511 | |
|\ \ \ | ||||||
| * | | | Typos | jeroenpraat | 2015-12-12 | 1 | -1/+1 | |
| * | | | That script is taken from someone else without any contribution (http://blog.... | jeroenpraat | 2015-12-12 | 1 | -14/+3 | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2015-12-12 | 3 | -2/+28 | |
| |\ \ \ | ||||||
| * | | | | es+nl strings update | jeroenpraat | 2015-12-12 | 4 | -1504/+1508 | |
* | | | | | remove the unqualified "OAuth" namespace from the project. We need to referen... | redmatrix | 2015-12-13 | 8 | -102/+103 | |
| |/ / / |/| | | | ||||||
* | | | | a couple of api improvements | redmatrix | 2015-12-11 | 2 | -2/+11 | |
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-11 | 1 | -0/+16 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #215 from royalterra/master | redmatrix | 2015-12-12 | 1 | -0/+16 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Update INSTALL.txt | royalterra | 2015-12-11 | 1 | -0/+1 | |
| | * | | | Update INSTALL.txt | royalterra | 2015-12-11 | 1 | -0/+15 | |
| | * | | | Merge pull request #1 from redmatrix/master | royalterra | 2015-12-11 | 286 | -47204/+49251 | |
| | |\ \ \ | ||||||
* | | | | | | add deprecated update_with_media endpoint | redmatrix | 2015-12-11 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | / / / | incorrect obj_type on several items | redmatrix | 2015-12-11 | 6 | -618/+621 | |
| |/ / / |/| | | | ||||||
* | | | | some minor cleanup - change the default of the discover tab (public stream ac... | redmatrix | 2015-12-10 | 5 | -27/+28 |