aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-061-1/+2
|\ | | | | | | | | | | Conflicts: boot.php install/update.php
| * rev updateredmatrix2015-11-061-1/+1
| |
| * forgot this oneredmatrix2015-11-041-1/+1
| |
* | fix path for attachments using os_storage uploaded through attach_storeredmatrix2015-11-041-1/+1
| |
* | remove zotid.net from fallback dir and add hubzilla.siteMario Vavti2015-11-011-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-191-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 packetredmatrix2015-10-191-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-151-1/+1
|\| | | | | | | | | Conflicts: install/update.php
| * dummy updateredmatrix2015-10-151-1/+1
| |
| * process_delivery: ignore selfredmatrix2015-09-281-1/+1
| |
| * dummy updateredmatrix2015-09-231-1/+1
| |
| * dummy updateredmatrix2015-09-221-1/+1
| |
* | schema support for additional site typesredmatrix2015-09-281-1/+7
| |
* | add vdata field for caldavredmatrix2015-09-231-1/+1
| |
* | heavy lifting for delivery reportsredmatrix2015-09-221-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
|\| | | | | | | | | Conflicts: util/messages.po
| * dummy updateredmatrix2015-09-181-1/+1
| |
* | typoMichael Meer2015-09-091-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-1/+1
|\|
| * fix update 1148zottel2015-09-031-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-1/+1
|\|
| * dummy updateredmatrix2015-09-021-1/+1
| |
| * dummy update placeholderredmatrix2015-09-011-1/+1
| |
* | separate objs/things from taxonomyredmatrix2015-09-011-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-311-2/+1
|\| | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-311-1/+0
| |\
| | * Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵jeroenpraat2015-08-291-1/+0
| | | | | | | | | | | | update strings ES
| * | change the likes db structure to make it more easily importable/exportableredmatrix2015-08-311-1/+1
| |/
* | Changed favicon to new one (based on new Hubzilla arrow). Please revert when ↵jeroenpraat2015-08-311-1/+1
| | | | | | | | it's not okay. Also added a new optional default profile photo, in the same style.
* | more work on AccessList integrationredmatrix2015-08-271-0/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-271-1/+1
|\|
| * fallback directory server list updateredmatrix2015-08-271-1/+1
| |
* | add load_pdl hook for pluginsredmatrix2015-08-221-0/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-201-1/+1
|\|
| * missed this one - it's requiredredmatrix2015-08-201-1/+1
| |
* | more work on tasksredmatrix2015-08-201-0/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-181-1/+1
|\|
| * add event_sequence for vtodo'sredmatrix2015-08-181-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-161-1/+1
|\|
| * add DB support for tasks, todo items and repeating eventsredmatrix2015-08-161-1/+1
| |
* | updateredmatrix2015-08-071-17/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-301-1/+1
|\|
| * dummy updateredmatrix2015-07-301-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-231-1/+0
|\| | | | | | | | | Conflicts: include/diaspora.php
| * patch to allow theme based widgetsredmatrix2015-07-231-1/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-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 ↵redmatrix2015-07-031-0/+1
| | | | | | | | accidental import/export doesn't chuck a wobbly.
* | start doco cleanupredmatrix2015-07-031-0/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-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 ↵redmatrix2015-06-281-1/+1
| | | | | | | | still pretty cool.