harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,389 Commits 6 Branches 36 Tags
develop
Commit Graph

8246 Commits

Author SHA1 Message Date
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 90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
 2015-07-02 22:00:15 -07:00
redmatrix 1a5898bf80 sync abook entries from redmatrix 
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
 2015-07-02 21:58:28 -07:00
redmatrix 065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix 2015-07-02 21:55:36 -07:00
redmatrix 8b2b92fe32 provide compatibility with redmatrix extended item export 2015-07-01 18:50:37 -07:00
redmatrix 3f38e52caf provide backward compatibility with hubzilla extended item export 2015-07-01 18:49:34 -07:00
redmatrix 86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) 2015-06-30 20:18:48 -07:00
redmatrix 97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix 0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix a7135b5ecd fix the postgres schema with all the changes to date 2015-06-29 19:58:44 -07:00
redmatrix 6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
redmatrix 0b012e2995 some prep work 2015-06-29 16:56:18 -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 8d84472b4c bring single instance file storage to dav and cloud uploaded photos 2015-06-27 16:36:30 -07:00
redmatrix a3d7e8456a undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. 2015-06-25 20:07:10 -07:00
redmatrix 70975dda4a remove all QR-code stuff from core - now in qrator addon 2015-06-25 19:05:49 -07:00
redmatrix b06b6f798f localise event calendar 2015-06-25 18:23:48 -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 1a0655f34e more work on mail flags 2015-06-23 21:01:59 -07:00
redmatrix cb76fb8b9b item flag fixes discovered after a few merges 2015-06-23 19:45:39 -07:00
redmatrix 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
redmatrix 9879cf3c6c ensure we always sign a trimmed item body. 2015-06-22 16:09:02 -07:00
redmatrix 0d8fcbe48d discovered a couple of loose ends in the per-member enable diaspora setting 2015-06-22 15:03:47 -07:00
redmatrix ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
redmatrix 68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
redmatrix e1caf77480 Merge pull request #352 from solstag/store_update_fix 
Make item_store_update only affect the data we requested
 2015-06-21 10:07:58 +10:00
redmatrix 9dfb8a3401 ensure the photo driver is included 2015-06-20 16:24:10 -07:00
redmatrix dd950baa82 import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction 2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo ec23a94b6d Make item_store_update only affect the data we requested 2015-06-20 02:21:25 -03:00
redmatrix ddbaabd62d wrong logic 2015-06-19 18:08:10 -07:00
redmatrix 94e7a425e6 import_diaspora - a few more atypical settings 2015-06-19 18:06:55 -07:00
redmatrix e85d2c4b90 import_diaspora: add all the friends 2015-06-19 17:07:31 -07:00
redmatrix 0a9d3b4025 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-19 16:44:16 -07:00
redmatrix 6bd90816dd very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. 2015-06-19 16:39:03 -07:00
Mario Vavti de84f48e2f bring some more generic-content-wrappers and fix some of them 2015-06-19 12:44:11 +02:00
redmatrix 33c9d8e06b all file attachments are now stored natively, still have photos-0 to store natively 2015-06-18 22:12:26 -07:00
redmatrix 6aa159e2ac Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-18 19:15:01 -07:00
redmatrix 7e59580812 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-18 16:36:47 -07:00
redmatrix 1a9c059062 issues with markdownify and escaped HTML 2015-06-18 16:35:40 -07:00
redmatrix 2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix 6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix c6c17182e5 attach_mkdirp - implement force option to return success if dir exists 2015-06-17 01:18:55 -07:00
redmatrix 4ecee713d5 recursive mkdir (ala mkdir -p) for file and photo storage 2015-06-16 22:58:26 -07:00
redmatrix 39309ad45c start work on photo directories 2015-06-16 19:05:09 -07:00
redmatrix 65661b7ec3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/photos.php
	mod/siteinfo.php
 2015-06-16 18:43:03 -07:00
redmatrix d84b3cfc3c remove file/attachments when their associated photos are removed 2015-06-16 17:50:15 -07:00
Mario Vavti 40ee0d41dc fix deleting of album for remote channel 2015-06-16 12:54:29 +02:00
redmatrix bc72d3fd26 move profile photos to new methods 2015-06-15 23:37:51 -07:00
redmatrix bdedda7c6b fix attachment permissions when they also contain an image. 2015-06-15 20:43:49 -07:00