Commit graph

1584 commits

Author SHA1 Message Date
redmatrix
0f3c2c4b24 add vdata field for caldav 2015-09-23 22:32:46 -07:00
redmatrix
0b1b11ea53 heavy lifting for delivery reports 2015-09-22 02:32:04 -07:00
redmatrix
74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	util/messages.po
2015-09-18 22:46:21 -07:00
redmatrix
3dc066a143 dummy update 2015-09-18 22:43:35 -07:00
Michael Meer
f4d3ec908d typo 2015-09-09 17:08:53 +02:00
redmatrix
99848ab3bb Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-03 13:11:25 -07:00
zottel
5cef672f9a fix update 1148 2015-09-03 13:55:47 +02:00
redmatrix
360fda15e9 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 20:54:00 -07:00
redmatrix
2018b88093 dummy update 2015-09-02 20:53:26 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
d753ae4cf1 dummy update placeholder 2015-09-01 16:25:10 -07:00
redmatrix
d7089ab471 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/identity.php
	install/update.php
	util/messages.po
	view/nl/messages.po
2015-08-31 21:00:28 -07:00
redmatrix
d7cae1ce2a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-31 20:56:22 -07:00
redmatrix
d7cf7316be change the likes db structure to make it more easily importable/exportable 2015-08-31 20:55:25 -07:00
jeroenpraat
fd28550ad2 Changed favicon to new one (based on new Hubzilla arrow). Please revert when it's not okay. Also added a new optional default profile photo, in the same style. 2015-08-31 20:26:26 +02:00
jeroenpraat
60ac0cef5c Removed redmatrix.nl as a fallback server (directory mode to normal) + update strings ES 2015-08-29 17:21:20 +02:00
redmatrix
ca0bc2bb7b more work on AccessList integration 2015-08-27 22:20:30 -07:00
redmatrix
c2bc6a04ab Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-27 18:55:02 -07:00
redmatrix
96c61fc5f2 fallback directory server list update 2015-08-27 15:53:52 -07:00
redmatrix
39df2a475e add load_pdl hook for plugins 2015-08-22 14:28:33 -07:00
redmatrix
43fbbfe0df Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 22:14:51 -07:00
redmatrix
fef93af0a6 missed this one - it's required 2015-08-20 22:13:25 -07:00
redmatrix
afbbc9cd72 more work on tasks 2015-08-20 18:43:01 -07:00
redmatrix
3b1554db2e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-18 17:15:53 -07:00
redmatrix
37d07a7d2a add event_sequence for vtodo's 2015-08-18 17:10:40 -07:00
redmatrix
6a1d1867f0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-16 19:13:29 -07:00
redmatrix
b3b566c907 add DB support for tasks, todo items and repeating events 2015-08-16 17:17:34 -07:00
redmatrix
bf3ea2cd47 update 2015-08-07 14:20:18 -07:00
redmatrix
26411ab385 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-30 17:12:23 -07:00
redmatrix
4c6368d075 dummy update 2015-07-30 17:07:03 -07:00
redmatrix
cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/diaspora.php
2015-07-23 21:07:35 -07:00
redmatrix
27fa908233 patch to allow theme based widgets 2015-07-23 18:49:37 -07:00
redmatrix
a74631b554 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	boot.php
	include/items.php
	util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix
37c78bcf05 start doco cleanup 2015-07-03 14:56:48 -07:00
redmatrix
0b9332fde9 in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly. 2015-07-03 14:30:42 -07:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
86588bdd6c more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames 2015-06-23 22:46:39 -07:00
redmatrix
ca870dbf31 more work on item table optimisation 2015-06-10 16:59:04 -07:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
39f0e6fe62 add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public". 2015-06-08 16:55:17 -07:00
redmatrix
8fe3daab21 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	install/schema_mysql.sql
	mod/impel.php
	view/pt-br/messages.po
	view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
redmatrix
0f09a4499b add menu_created, menu_edited fields to DB 2015-05-28 16:59:56 -07:00
redmatrix
b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
7c7a5cba8f Merge branch 'master' into tres 2015-05-17 19:49:36 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
2015-05-17 19:48:57 -07:00
redmatrix
3b859aa9ef Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. 2015-05-17 18:14:50 -07:00
Mario Vavti
ed284fd4ea preserve htmlhead in case somebody needs it 2015-05-15 20:33:38 +02:00
redmatrix
f0cb3cba12 Merge branch 'master' into tres 2015-05-14 22:12:56 -07:00
redmatrix
291f3beccf Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-14 22:12:37 -07:00