Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-20 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #232 from wave72/master | redmatrix | 2015-12-21 | 1 | -0/+1 |
| |\ | |||||
| | * | Added 'invitation_only' to site info | wave72 | 2015-12-20 | 1 | -0/+1 |
| | * | Merge pull request #4 from redmatrix/master | Wave | 2015-12-20 | 716 | -138586/+51589 |
| | |\ | | |/ | |/| | |||||
* | | | merge hell | redmatrix | 2015-12-20 | 4 | -42/+50 |
* | | | Merge branch 'HaakonME-master' | redmatrix | 2015-12-20 | 6 | -2480/+2575 |
|\ \ \ | |||||
| * | | | Updated Norwegian strings for Hubzilla | Haakon Meland Eriksen | 2015-12-20 | 2 | -1591/+1669 |
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-20 | 8 | -1571/+1633 |
| |\| | | |||||
| | * | | Merge pull request #230 from wave72/master | Wave | 2015-12-20 | 2 | -841/+867 |
| |/| | |/| |/ | |||||
| | * | Updated Italian strings | wave72 | 2015-12-20 | 2 | -841/+867 |
* | | | use realpath to bypass symlinks and check actually directory | redmatrix | 2015-12-18 | 2 | -1/+11 |
* | | | allow widget 'packages' as well as individual files | redmatrix | 2015-12-18 | 1 | -2/+7 |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-18 | 14 | -197/+173 |
|\ \ \ | |||||
* | | | | sql delete with limit | redmatrix | 2015-12-18 | 4 | -728/+749 |
| | * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-18 | 429 | -98157/+8997 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | update smarty to 3.1.28 stable | Mario Vavti | 2015-12-18 | 14 | -197/+173 |
|/ / / | |||||
* | | | loop detection | redmatrix | 2015-12-17 | 2 | -5/+12 |
* | | | more work on media uploads via api | redmatrix | 2015-12-17 | 2 | -9/+27 |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-17 | 11 | -104/+116 |
|\ \ \ | |||||
| * | | | fix search item attachment rendering | Mario Vavti | 2015-12-17 | 1 | -5/+6 |
| * | | | Merge pull request #227 from zzottel/master | zzottel | 2015-12-17 | 4 | -0/+87 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2015-12-17 | 0 | -0/+0 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #226 from zzottel/master | zzottel | 2015-12-17 | 6 | -99/+23 |
| |\ \ \ \ | |||||
| | | * | | | add forgotten German docs | zottel | 2015-12-17 | 4 | -0/+87 |
| | |/ / / | |||||
| | * | | | small fixes to English docs | zottel | 2015-12-17 | 3 | -7/+6 |
| | * | | | 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 |
|/ / / |