Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove zotid.net from fallback dir and add hubzilla.site | Mario Vavti | 2015-11-01 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php | ||||
| * | add the project name to site info packet | redmatrix | 2015-10-19 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-15 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: install/update.php | ||||
| * | dummy update | redmatrix | 2015-10-15 | 1 | -1/+1 |
| | | |||||
| * | process_delivery: ignore self | redmatrix | 2015-09-28 | 1 | -1/+1 |
| | | |||||
| * | dummy update | redmatrix | 2015-09-23 | 1 | -1/+1 |
| | | |||||
| * | dummy update | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | schema support for additional site types | redmatrix | 2015-09-28 | 1 | -1/+7 |
| | | |||||
* | | add vdata field for caldav | redmatrix | 2015-09-23 | 1 | -1/+1 |
| | | |||||
* | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | dummy update | redmatrix | 2015-09-18 | 1 | -1/+1 |
| | | |||||
* | | typo | Michael Meer | 2015-09-09 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -1/+1 |
|\| | |||||
| * | fix update 1148 | zottel | 2015-09-03 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -1/+1 |
|\| | |||||
| * | dummy update | redmatrix | 2015-09-02 | 1 | -1/+1 |
| | | |||||
| * | dummy update placeholder | redmatrix | 2015-09-01 | 1 | -1/+1 |
| | | |||||
* | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 1 | -1/+0 |
| |\ | |||||
| | * | Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵ | jeroenpraat | 2015-08-29 | 1 | -1/+0 |
| | | | | | | | | | | | | update strings ES | ||||
| * | | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 1 | -1/+1 |
| |/ | |||||
* | | Changed favicon to new one (based on new Hubzilla arrow). Please revert when ↵ | jeroenpraat | 2015-08-31 | 1 | -1/+1 |
| | | | | | | | | it's not okay. Also added a new optional default profile photo, in the same style. | ||||
* | | more work on AccessList integration | redmatrix | 2015-08-27 | 1 | -0/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-27 | 1 | -1/+1 |
|\| | |||||
| * | fallback directory server list update | redmatrix | 2015-08-27 | 1 | -1/+1 |
| | | |||||
* | | add load_pdl hook for plugins | redmatrix | 2015-08-22 | 1 | -0/+5 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 1 | -1/+1 |
|\| | |||||
| * | missed this one - it's required | redmatrix | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | more work on tasks | redmatrix | 2015-08-20 | 1 | -0/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 1 | -1/+1 |
|\| | |||||
| * | add event_sequence for vtodo's | redmatrix | 2015-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 1 | -1/+1 |
|\| | |||||
| * | add DB support for tasks, todo items and repeating events | redmatrix | 2015-08-16 | 1 | -1/+1 |
| | | |||||
* | | update | redmatrix | 2015-08-07 | 1 | -17/+5 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -1/+1 |
|\| | |||||
| * | dummy update | redmatrix | 2015-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -1/+0 |
|\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| * | patch to allow theme based widgets | redmatrix | 2015-07-23 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po | ||||
| * | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 1 | -0/+1 |
| | | | | | | | | accidental import/export doesn't chuck a wobbly. | ||||
* | | start doco cleanup | redmatrix | 2015-07-03 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -1/+1 |
| | | | | | | | | still pretty cool. | ||||
* | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 1 | -2/+2 |
| | | | | | | | | numbering duplicate filenames | ||||
* | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | ||||
| * | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 1 | -1/+1 |
| | | | | | | | | webpages to be viewed even if site is configured "block public". |