harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,843 Commits 6 Branches 36 Tags 152 MiB
1cf206d764
Commit Graph

1592 Commits

Author SHA1 Message Date
redmatrix
ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
 2015-10-19 16:18:04 -07:00
redmatrix
57e0bfc5a9 add the project name to site info packet 2015-10-19 16:07:14 -07:00
redmatrix
7517c76ae4 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	install/update.php
 2015-10-15 16:02:37 -07:00
redmatrix
e26f771cbe dummy update 2015-10-15 16:00:31 -07:00
redmatrix
3a8e1e0484 process_delivery: ignore self 2015-09-28 19:04:36 -07:00
redmatrix
edbcba6f11 schema support for additional site types 2015-09-28 04:15:21 -07:00
redmatrix
0f3c2c4b24 add vdata field for caldav 2015-09-23 22:32:46 -07:00
redmatrix
8a94a4938f dummy update 2015-09-23 22:31:49 -07:00
redmatrix
5068ce0569 dummy update 2015-09-22 02:33:24 -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