Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -0/+4 |
|\ | |||||
| * | dummy update | redmatrix | 2015-09-22 | 1 | -1/+5 |
| | | |||||
* | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 3 | -1/+16 |
| | | |||||
* | | DB table for delivery reports | redmatrix | 2015-09-18 | 3 | -1/+86 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+5 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | dummy update | redmatrix | 2015-09-18 | 1 | -1/+5 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -3/+2 |
|\| | |||||
| * | in this case no results is not an error | redmatrix | 2015-09-03 | 1 | -3/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -11/+18 |
|\| | |||||
| * | fix update 1148 | zottel | 2015-09-03 | 1 | -11/+18 |
| | | |||||
* | | add timestamps for syncing apps | redmatrix | 2015-09-02 | 3 | -3/+25 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -2/+10 |
|\| | |||||
| * | dummy update | redmatrix | 2015-09-02 | 1 | -2/+10 |
| | | |||||
| * | dummy update placeholder | redmatrix | 2015-09-01 | 1 | -1/+8 |
| | | |||||
* | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 3 | -1/+49 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 3 | -1/+25 |
|\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | ||||
| * | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 3 | -1/+24 |
| | | |||||
| * | issues with abook sync between hubzilla and red | redmatrix | 2015-08-23 | 1 | -1/+2 |
| | | |||||
* | | documentation re-org | redmatrix | 2015-08-31 | 2 | -0/+232 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 3 | -2/+14 |
|\| | |||||
| * | missed this one - it's required | redmatrix | 2015-08-20 | 3 | -2/+14 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 3 | -3/+17 |
|\| | |||||
| * | add event_sequence for vtodo's | redmatrix | 2015-08-18 | 3 | -3/+17 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 3 | -2/+35 |
|\| | |||||
| * | add DB support for tasks, todo items and repeating events | redmatrix | 2015-08-16 | 3 | -2/+35 |
| | | |||||
* | | update some of the old attach.flag values to the new schema | redmatrix | 2015-07-30 | 1 | -1/+16 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -1/+6 |
|\| | |||||
| * | dummy update | redmatrix | 2015-07-30 | 1 | -1/+6 |
| | | |||||
* | | very crude but working doc search | redmatrix | 2015-07-05 | 1 | -0/+8 |
| | | |||||
* | | fix the postgres schema with all the changes to date | redmatrix | 2015-06-29 | 1 | -3/+115 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -0/+1 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 3 | -1/+15 |
|\| | | | | | | | | | | | | | 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 | 3 | -1/+15 |
| | | | | | | | | still pretty cool. | ||||
* | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -0/+4 |
| | | |||||
* | | start on the DAV/photos merger | redmatrix | 2015-06-11 | 1 | -0/+2 |
| | | |||||
* | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 3 | -3/+18 |
|\| | | | | | | | | | | | | | | | | | 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 | 3 | -2/+17 |
| | | | | | | | | webpages to be viewed even if site is configured "block public". | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 3 | -3/+33 |
|\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| * | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 3 | -2/+32 |
| | | |||||
* | | more db structure | redmatrix | 2015-05-19 | 1 | -6/+31 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -2/+4 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | Document php-xml requirement for webdav. | Alexandre Hannud Abdo | 2015-05-19 | 1 | -2/+4 |
| | | |||||
* | | bring the new photo schema into play | redmatrix | 2015-05-18 | 1 | -2/+2 |
| | | |||||
* | | here's a fair chunk of the new schema - still a lot of bits missing and no ↵ | redmatrix | 2015-05-17 | 1 | -414/+107 |
| | | | | | | | | migration tools, and only for mysql currently. Oh, and you still don't have the new code to make use of the new schema yet. That's on another branch that I'm not checking in yet because then you might get the idea that bits of it actually work and infect the rest of the matrix with unstable code and bring other sites down that have never even heard of hubzilla. Please do not use this code. Let me repeat, please do not use this code. One more time in case you didn't understand - please do not use this code. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -2/+23 |
|\| | |||||
| * | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 1 | -2/+23 |
| | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
* | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 2 | -0/+6 |
| | | |||||
* | | second pass name change | redmatrix | 2015-05-05 | 2 | -11/+11 |
| | | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 1 | -11/+11 |
|/ |