harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,238 Commits 6 Branches 36 Tags
2bce61d18bcba2f03be3cd9f7129c4d4053213b6
Commit Graph
14238 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix 2bce61d18b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-26 22:14:19 -07:00
redmatrix 9cebd24987 change attach_store to allow a predefined item to accompany a photo 2015-08-26 22:13:20 -07:00
redmatrix 0d2c90cc2e add item info to photo detail in api 2015-08-26 22:11:50 -07:00
redmatrix 54c88dfae9 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/diaspora.php
 2015-08-26 20:22:50 -07:00
redmatrix d1c23477df support likes on comments with diaspora owner by sending as activity 2015-08-26 20:20:41 -07:00
redmatrix 8fb1356623 required for future work 2015-08-26 17:49:57 -07:00
redmatrix d2fec56456 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/import.php
 2015-08-26 16:00:13 -07:00
redmatrix bd2d99aced import fixes 2015-08-26 15:56:32 -07:00
redmatrix 71308fe8c1 syntax error in last checkin 2015-08-26 13:50:51 -07:00
redmatrix da649e397e import fixes 2015-08-26 13:49:07 -07:00
redmatrix 1dbcfaa2c6 add repository type as one that is able to self-identify as a public forum 2015-08-25 21:54:16 -07:00
redmatrix 2d471e39dc this is weird 2015-08-25 19:23:21 -07:00
redmatrix e5dec8671e make diaspora person guids for hubzilla folks globally unique. That's what a globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision. 2015-08-25 17:21:42 -07:00
redmatrix 5fa2aa6d48 lots of stuff that was needed for successful photo import from red 2015-08-24 20:58:12 -07:00
redmatrix 0edac8810b don't try to optimise the session table. Just let it fragment and let the DB worry about it. 2015-08-24 16:05:51 -07:00
redmatrix b085a3243c Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/connections.php
	mod/connedit.php
 2015-08-24 05:10:31 -07:00
redmatrix d256e8e9f2 edited event showing bad signature and null_date for edit timestamp 2015-08-24 01:46:54 -07:00
redmatrix 250d286f1d remove orphan mod_connections editing code (now done in mod/connedit) 2015-08-24 01:28:13 -07:00
redmatrix eac9c8a7e6 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	install/update.php
	util/messages.po
 2015-08-23 20:23:55 -07:00
redmatrix a67213627c provide a comment_policy of "network: diaspora" to handle their special case public-posts-are-commentable-by-anybody permission without breaking any other permissions. 2015-08-23 18:48:33 -07:00
redmatrix 852d19f209 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-23 17:41:23 -07:00
redmatrix b1f091e4d7 issues with abook sync between hubzilla and red 2015-08-23 17:40:47 -07:00
redmatrix 8cd583fd8c sync abook flags in memory after altering them 2015-08-23 17:36:00 -07:00
redmatrix bf190be5b4 issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync 2015-08-23 13:27:34 -07:00
redmatrix 2a59392ba8 change name of module 2015-08-22 19:31:39 -07:00
redmatrix feabaedd83 increase width of tasklist input element 2015-08-22 15:46:40 -07:00
redmatrix c9b8f404e0 restrict event notification to events and birthdays (exclude tasks) 2015-08-22 14:35:17 -07:00
redmatrix 39df2a475e add load_pdl hook for plugins 2015-08-22 14:28:33 -07:00
jeroenpraat 957abf1c1b Final (temporary I suppose) Spanish string update 2015-08-22 16:29:34 +02:00
redmatrix 7c34911b1c add task widget 2015-08-21 02:30:17 -07:00
redmatrix 7688bf3f21 support ical priority 2015-08-20 22:24:33 -07:00
redmatrix 242cb047d4 limit the height of tasklist 2015-08-20 22:15:09 -07:00
redmatrix 43fbbfe0df Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 22:14:51 -07:00
redmatrix 72bdca009c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 22:14:03 -07:00
redmatrix fef93af0a6 missed this one - it's required 2015-08-20 22:13:25 -07:00
redmatrix 3e7a76cc64 put tasklist into events page comanche layout 2015-08-20 21:02:42 -07:00
redmatrix 49c4aa1a54 cleanup of task widget - make jquery workflow a bit smoother 2015-08-20 20:40:42 -07:00
redmatrix afbbc9cd72 more work on tasks 2015-08-20 18:43:01 -07:00
redmatrix 05bec13bdc We don't need photos to also include attachments. It's interesting, but not all that useful. 2015-08-20 16:55:03 -07:00
redmatrix 8fc321ca62 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 16:52:56 -07:00
redmatrix 6590ca02de some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable. 2015-08-20 16:49:13 -07:00
jeroenpraat 20fc4ee021 Another Spanish strings update 2015-08-20 20:57:08 +02:00
redmatrix a322254f2a do ical export before checking logged in channel 2015-08-20 04:51:03 -07:00
redmatrix fd7b668a16 add carriage return to newlines for exported events (rfc2445:4.1) 2015-08-20 02:07:51 -07:00
redmatrix 5786fd2221 extra encoding on mail titles 2015-08-20 01:12:35 -07:00
redmatrix 419b4ecfde use consistent terminology 2015-08-19 21:17:24 -07:00
redmatrix 69920fb717 fix photo location 2015-08-19 19:17:17 -07:00
redmatrix 863a979754 check perms on ical attachments 2015-08-19 17:16:19 -07:00
redmatrix 8d66fbccfa Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/api.php
 2015-08-19 16:54:12 -07:00
redmatrix a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00