harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,340 Commits 6 Branches 36 Tags
4eec9a2fba46396edadc03e71da025ac15389f68
Commit Graph
4433 Commits
Author SHA1 Message Date
redmatrix 4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-09-07 18:20:47 -07:00
redmatrix 6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
redmatrix 9fa0490c44 sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred. 2015-09-07 18:11:30 -07:00
redmatrix 2312f03eac Always open rpost editor on document ready 2015-09-06 20:50:31 -07:00
redmatrix 1d09e4b620 use conversation defaults for /public page instead of collapsed list mode, but allow over-ride 2015-09-06 16:42:50 -07:00
redmatrix 3f6d6745de syntax 2015-09-05 15:33:09 -07:00
redmatrix b1888afa10 fix typos before pushing 2015-09-03 18:47:03 -07:00
redmatrix d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix c83da012ff profile import error #34 2015-09-03 16:19:59 -07:00
redmatrix c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix 470915a55b sync "things" (obj elements) 2015-09-02 20:07:15 -07:00
redmatrix d105f324af import apps 2015-09-01 22:27:09 -07:00
redmatrix 6cc60ba477 initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose. 2015-09-01 22:03:10 -07:00
redmatrix 1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix 85daf26eb1 more work on objs/things 2015-09-01 19:01:19 -07:00
redmatrix 286be43963 issue #31 2015-09-01 17:16:10 -07:00
redmatrix 3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix 417da13353 this is a bit harder than anticipated. 2015-08-31 21:12:37 -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 039f56f390 mostly doc tweaks, some import/export work 2015-08-31 20:58:05 -07:00
redmatrix d7cf7316be change the likes db structure to make it more easily importable/exportable 2015-08-31 20:55:25 -07:00
redmatrix e23f86faa9 more work on doco search 2015-08-30 22:39:33 -07:00
redmatrix 7ba1217a13 improvements to documentation search 2015-08-30 20:47:15 -07:00
redmatrix a42b236587 more AccessList stuff - this time it's mod-item, which is a biggie 2015-08-28 14:21:49 -07:00
redmatrix d05fd9632e now we get to the heavy lifting with AccessList stuff 2015-08-27 23:04:17 -07:00
redmatrix ca0bc2bb7b more work on AccessList integration 2015-08-27 22:20:30 -07:00
redmatrix 3fbb955cf2 start conversion to AccessList object 2015-08-27 21:22:59 -07:00
redmatrix 04b4897dd8 First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication. 2015-08-27 18:55:30 -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 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 8cd583fd8c sync abook flags in memory after altering them 2015-08-23 17:36:00 -07:00
redmatrix 2a59392ba8 change name of module 2015-08-22 19:31:39 -07:00
redmatrix c9b8f404e0 restrict event notification to events and birthdays (exclude tasks) 2015-08-22 14:35:17 -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 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
redmatrix a322254f2a do ical export before checking logged in channel 2015-08-20 04:51:03 -07:00
redmatrix 863a979754 check perms on ical attachments 2015-08-19 17:16:19 -07:00
redmatrix a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
redmatrix 3b1554db2e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-18 17:15:53 -07:00
redmatrix 75fbf21e6b add month to export filename when using month 2015-08-17 22:27:41 -07:00