Commit Graph

  • a169e5c4f3 restructure the author and owner info from feeds friendica 2014-08-20 18:35:36 -07:00
  • a6829f7dcb move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) friendica 2014-08-20 17:15:13 -07:00
  • e842359e9b Merge https://github.com/friendica/red into pending_merge friendica 2014-08-20 16:13:02 -07:00
  • f7895d322e provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. friendica 2014-08-20 16:10:57 -07:00
  • 0b95a60f22 Merge branch 'master' of https://github.com/friendica/red marijus 2014-08-20 17:23:13 +02:00
  • 51d1f454db Merge pull request #570 from zzottel/master zzottel 2014-08-20 14:46:24 +02:00
  • ecf8b70794 updated German main.bb doco file zottel 2014-08-20 14:44:55 +02:00
  • b102986929 greatly simplify consume_feed() - a lot of this was friendica specific and somebody may want to put some of it back in, but we'd be much better off building a zot compatible feed for friendica (hint,hint) - even if it didn't support the other protocol bits. Special purpose feed handlers for things like likes, dislikes, events, and community tags are better handled as zot arrays. We have all those handlers. We just need to pass them a JSON message instead of an XML/Atom message. Handlers for statusnet follow messages are another casualty. That's easy to bring back - but we need to keep driving nails into the XML coffin or the damn zombies will get out. friendica 2014-08-20 04:38:17 -07:00
  • 85ef5c1033 Merge branch 'master' of https://github.com/friendica/red marijus 2014-08-20 08:05:40 +02:00
  • 0fef39a326 fangs bared friendica 2014-08-19 22:47:11 -07:00
  • 0c8866acde snakebite continued friendica 2014-08-19 21:31:33 -07:00
  • c7fe071a1f some work on network discovery friendica 2014-08-19 19:38:42 -07:00
  • 55d4ceb7e0 also reset comment policy on alternate delivery chains friendica 2014-08-19 17:51:45 -07:00
  • 8b5627e777 make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated friendica 2014-08-19 17:47:32 -07:00
  • 6feaa2689d follow => connect friendica 2014-08-19 16:26:46 -07:00
  • 82389f8c1b really really fix lockview (cross fingers) ;-) friendica 2014-08-19 16:04:38 -07:00
  • 01a9c56ef9 Merge pull request #569 from git-marijus/master RedMatrix 2014-08-20 08:52:21 +10:00
  • 341892a7af fix nl Jeroen 2014-08-19 21:48:49 +00:00
  • 0542125711 Merge branch 'master' of https://github.com/friendica/red marijus 2014-08-19 22:31:22 +02:00
  • 9f400229a7 Update nl Jeroen 2014-08-19 20:22:15 +00:00
  • a10f39b994 really fix lock info marijus 2014-08-19 22:01:33 +02:00
  • dc212c80e2 diaspora - crazy amount of work remaining friendica 2014-08-19 02:00:34 -07:00
  • b3d450626e provide an overt indication that a post/comment was edited. friendica 2014-08-18 22:44:03 -07:00
  • 206492e15d Merge https://github.com/friendica/red into pending_merge friendica 2014-08-18 20:04:19 -07:00
  • b522ab13cb nav channel selection friendica 2014-08-18 20:03:48 -07:00
  • 4ab14387df Merge pull request #568 from git-marijus/master RedMatrix 2014-08-19 06:54:31 +10:00
  • 953c8ac686 make lockview provide the right info marijus 2014-08-18 21:25:02 +02:00
  • b5d1c7865b Merge pull request #1 from friendica/master Paolo T 2014-08-18 18:55:18 +02:00
  • d9ff121930 beginning of permission role settings friendica 2014-08-17 22:53:00 -07:00
  • 3dbc3e263d add ability to follow somebody not already in your connections from "post actions" dropdown. bug: doesn't bring you back to this page. friendica 2014-08-17 21:34:52 -07:00
  • cb027232ff diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elephants standing on it. I'm working on the first tonne or two. friendica 2014-08-17 20:37:52 -07:00
  • 4a76925787 some more work on realms friendica 2014-08-17 19:06:56 -07:00
  • de1198ccfe Merge https://github.com/friendica/red into pending_merge friendica 2014-08-17 17:49:25 -07:00
  • 82eb265a20 add collections widget to connections page - and some more work on realms friendica 2014-08-17 17:48:41 -07:00
  • 1ddbd44fb0 Merge pull request #567 from tuscanhobbit/master Paolo T 2014-08-17 19:35:16 +02:00
  • 3b979dd2a9 IT: strings updated tuscanhobbit 2014-08-17 19:32:44 +02:00
  • 8d3dc7541d Doco - attempt to explain pull requests in git for non developers. Thomas Willingham 2014-08-17 14:57:39 +01:00
  • bb3768d172 Merge pull request #565 from RedMatrixCanada/Branch RedMatrix 2014-08-17 18:49:10 +10:00
  • 33d43a2a64 Merge pull request #566 from tonnerkiller/master RedMatrix 2014-08-17 18:48:43 +10:00
  • 8c366154c3 French Transalations - UPDATED RedMatrixCanada 2014-08-16 20:24:09 -04:00
  • bf3dc80233 Merge https://github.com/friendica/red into pending_merge friendica 2014-08-16 16:11:53 -07:00
  • 20bdcb037f provide backend storage and declaration of directory realm friendica 2014-08-16 16:10:35 -07:00
  • e4620179ac Merge pull request #564 from cvogeley/master RedMatrix 2014-08-17 08:33:13 +10:00
  • e3c8d36e06 Install doc - mcrypt is required, not optional. Even if it's intended to be optional, it isn't. WSoD abound without it. Thomas Willingham 2014-08-16 20:48:23 +01:00
  • 54fe09f466 Add account deletion to the UI Christian Vogeley 2014-08-16 16:28:07 +02:00
  • bac1ed2214 Added "if(!function_exists('xpost_to_html2bbcode'))" This function name is also used by post to friendica plugin Both functions seem to be identical. If you have both plugins installed you get an error because of the identical function name This will avoid the attempt to load the function a second time in case it was already loaded by the post to friendica plugin tonnerkiller 2014-08-16 15:48:44 +02:00
  • 03678716fe api_posting.bb is a new doco file that explains posting to the redmatrix from an external program by exampple of command line tool curl main.bb is an updated version of the doco main site with a link to api_posting.bb tonnerkiller 2014-08-16 13:13:57 +02:00
  • ba0bf596b5 Merge https://github.com/friendica/red into pending_merge friendica 2014-08-15 14:46:59 -07:00
  • 481263dc25 bring back some friendica crypto stuff including all the key mangling and translation functions. Also add ability to completely supress email notifications for actitivies with private contents. We'll still pass private mail notifications because often the email notification is the only way infrequently used channels get alerted to these. friendica 2014-08-15 14:42:14 -07:00
  • 73c209f325 Merge pull request #563 from zzottel/master RedMatrix 2014-08-16 07:07:36 +10:00
  • d57fe0765c don't block "public" messages with authenticated scope zottel 2014-08-15 21:36:24 +02:00
  • 4286389654 doc update friendica 2014-08-15 06:06:39 -07:00
  • 41aa9e13cf doc update friendica 2014-08-15 06:05:52 -07:00
  • 257332f434 Merge https://github.com/friendica/red into pending_merge friendica 2014-08-15 06:05:22 -07:00
  • d6da6f5001 Merge pull request #562 from cvogeley/master RedMatrix 2014-08-15 23:03:04 +10:00
  • f36253b7a8 Account deletion Christian Vogeley 2014-08-15 14:56:17 +02:00
  • b88e1e9862 .btn.xs > 0.75rem (let's keep that as the min. scalable font size) jeroenpraat 2014-08-15 14:00:51 +02:00
  • c96b18359f .btn-xs 0.65 > 0.7rem jeroenpraat 2014-08-15 13:17:38 +02:00
  • 1978500e8f pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER formats and rebuilding the darn things like we used to do. Check for illegal hex encoded album names in mod/photo so we don't throw php errors. Don't know where they come from but we get a lot of them. friendica 2014-08-14 23:05:19 -07:00
  • 21adbad4c1 in HTML email notifications, angle brackets in posts were unescaped - including those in code blocks. friendica 2014-08-14 20:19:28 -07:00
  • b9dffa9107 escape tags when using markdown. Strange things happen if you put HTML entities in the text. friendica 2014-08-14 18:00:48 -07:00
  • 414d86d3a9 api - foreach warnings friendica 2014-08-14 17:55:14 -07:00
  • 1d4fde71e0 Merge https://github.com/friendica/red into pending_merge friendica 2014-08-14 17:25:45 -07:00
  • 9d2335ebc8 put an indicator (*) in the message subject line for notification emails when the message body has been suppressed friendica 2014-08-14 17:24:39 -07:00
  • f4229dbc3f Merge pull request #561 from cvogeley/master RedMatrix 2014-08-15 09:58:43 +10:00
  • c1b89b413a Added some missing translation strings. Fixed to scalable for a few font sizes. Jeroen 2014-08-14 20:02:05 +00:00
  • fc94a638cd Some work on account deletion Christian Vogeley 2014-08-14 20:17:57 +02:00
  • 1badf53229 update nl Jeroen 2014-08-14 14:59:02 +00:00
  • 1d6f494936 some work on extended profile fields friendica 2014-08-13 22:22:52 -07:00
  • 4156c68d0d Merge https://github.com/friendica/red into pending_merge friendica 2014-08-13 16:54:59 -07:00
  • eb38f3f474 support title and description (and dates which were done earlier) for friendica photo import friendica 2014-08-13 16:34:36 -07:00
  • 4a938db398 this is better cross-browser support marijus 2014-08-13 17:37:41 +02:00
  • 92e5f31428 tweak .comment-edit-text-empty to correlate with the new default app font-size marijus 2014-08-13 16:56:31 +02:00
  • bc85f7d6e3 provide an expert option to opt out from user zoom on mobile devices marijus 2014-08-13 15:32:15 +02:00
  • 041aff36b7 provide a way to preserve photo timestamps when importing (rather than uploading) friendica 2014-08-12 21:51:32 -07:00
  • da982c6c9f here's the file but I'm less than 5% of the way through porting it. friendica 2014-08-12 21:24:36 -07:00
  • 802a5c2946 zot logging to figure out why we occasionally don't have an address on xchan_import - I suspect we don't have anything useful at all. friendica 2014-08-12 20:46:33 -07:00
  • 40667e72ad couple of frphoto fixes to work better with the dreamhost process reaper friendica 2014-08-12 20:39:57 -07:00
  • 50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. friendica 2014-08-12 18:08:31 -07:00
  • 94ed44e76e change default invitation message friendica 2014-08-11 19:38:04 -07:00
  • 6d8fe28e79 Merge https://github.com/friendica/red into pending_merge friendica 2014-08-11 05:24:10 -07:00
  • 04fcd16a33 Merge pull request #560 from zzottel/master zzottel 2014-08-11 11:55:21 +02:00
  • 948b76232f update to German translations zottel 2014-08-11 11:48:02 +02:00
  • f2244539da nothing going on here. nothing to see. move along. friendica 2014-08-10 22:19:08 -07:00
  • 5dab65d783 make mention tagging by webbie do the right thing. friendica 2014-08-10 20:38:14 -07:00
  • b12e40a4e8 allow channel login to the api, just like with the cloud friendica 2014-08-10 19:53:26 -07:00
  • 24db2e4468 remember activity setting friendica 2014-08-10 18:18:41 -07:00
  • 9ab12929d7 implement max_import_size friendica 2014-08-09 23:38:33 -07:00
  • 091138cbd3 prevent obscured email notifications friendica 2014-08-09 17:20:30 -07:00
  • 229ffd59ac Merge https://github.com/friendica/red into pending_merge friendica 2014-08-09 15:21:37 -07:00
  • 1397c6f994 booboo friendica 2014-08-09 15:21:15 -07:00
  • bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). Jeroen 2014-08-09 01:18:31 +00:00
  • 2aef2ed56b Merge https://github.com/friendica/red into pending_merge friendica 2014-08-08 15:27:47 -07:00
  • e9caf9db6a a couple of "not quite public" fixes friendica 2014-08-08 15:27:17 -07:00
  • 02b17fd27e rev update friendica 2014-08-08 15:27:07 -07:00
  • 55aa0c1041 doc updates friendica 2014-08-08 15:26:36 -07:00
  • 648c016d54 Merge pull request #554 from zzottel/master zzottel 2014-08-08 16:47:19 +02:00
  • d91eee759f update to German translations zottel 2014-08-08 16:46:29 +02:00
  • 08f5e26355 Merge pull request #553 from zzottel/master zzottel 2014-08-08 14:29:27 +02:00
  • 08bee2a03a update German main help page zottel 2014-08-08 14:28:02 +02:00