Commit graph

11051 commits

Author SHA1 Message Date
friendica
41aa9e13cf doc update 2014-08-15 06:05:52 -07:00
friendica
257332f434 Merge https://github.com/friendica/red into pending_merge 2014-08-15 06:05:22 -07:00
RedMatrix
d6da6f5001 Merge pull request #562 from cvogeley/master
Account deletion
2014-08-15 23:03:04 +10:00
Christian Vogeley
f36253b7a8 Account deletion
fix multi user deletion, add confirmation message
2014-08-15 14:56:17 +02:00
jeroenpraat
b88e1e9862 .btn.xs > 0.75rem (let's keep that as the min. scalable font size) 2014-08-15 14:00:51 +02:00
jeroenpraat
c96b18359f .btn-xs 0.65 > 0.7rem 2014-08-15 13:17:38 +02:00
friendica
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. 2014-08-14 23:05:19 -07:00
friendica
21adbad4c1 in HTML email notifications, angle brackets in posts were unescaped - including those in code blocks. 2014-08-14 20:19:28 -07:00
friendica
b9dffa9107 escape tags when using markdown. Strange things happen if you put HTML entities in the text. 2014-08-14 18:00:48 -07:00
friendica
414d86d3a9 api - foreach warnings 2014-08-14 17:55:14 -07:00
friendica
1d4fde71e0 Merge https://github.com/friendica/red into pending_merge 2014-08-14 17:25:45 -07:00
friendica
9d2335ebc8 put an indicator (*) in the message subject line for notification emails when the message body has been suppressed 2014-08-14 17:24:39 -07:00
RedMatrix
f4229dbc3f Merge pull request #561 from cvogeley/master
Some work on account deletion
2014-08-15 09:58:43 +10:00
Jeroen
c1b89b413a Added some missing translation strings. Fixed to scalable for a few font sizes. 2014-08-14 20:02:05 +00:00
Christian Vogeley
fc94a638cd Some work on account deletion 2014-08-14 20:17:57 +02:00
Jeroen
1badf53229 update nl 2014-08-14 14:59:02 +00:00
friendica
1d6f494936 some work on extended profile fields 2014-08-13 22:22:52 -07:00
friendica
4156c68d0d Merge https://github.com/friendica/red into pending_merge 2014-08-13 16:54:59 -07:00
friendica
eb38f3f474 support title and description (and dates which were done earlier) for friendica photo import 2014-08-13 16:34:36 -07:00
marijus
4a938db398 this is better cross-browser support 2014-08-13 17:37:41 +02:00
marijus
92e5f31428 tweak .comment-edit-text-empty to correlate with the new default app font-size 2014-08-13 16:56:31 +02:00
marijus
bc85f7d6e3 provide an expert option to opt out from user zoom on mobile devices 2014-08-13 15:32:15 +02:00
friendica
041aff36b7 provide a way to preserve photo timestamps when importing (rather than uploading) 2014-08-12 21:51:32 -07:00
friendica
da982c6c9f here's the file but I'm less than 5% of the way through porting it. 2014-08-12 21:24:36 -07:00
friendica
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. 2014-08-12 20:46:33 -07:00
friendica
40667e72ad couple of frphoto fixes to work better with the dreamhost process reaper 2014-08-12 20:39:57 -07:00
friendica
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. 2014-08-12 18:08:31 -07:00
friendica
94ed44e76e change default invitation message 2014-08-11 19:38:04 -07:00
friendica
6d8fe28e79 Merge https://github.com/friendica/red into pending_merge 2014-08-11 05:24:10 -07:00
zzottel
04fcd16a33 Merge pull request #560 from zzottel/master
update to German translations
2014-08-11 11:55:21 +02:00
zottel
948b76232f update to German translations 2014-08-11 11:48:02 +02:00
friendica
f2244539da nothing going on here. nothing to see. move along. 2014-08-10 22:19:08 -07:00
friendica
5dab65d783 make mention tagging by webbie do the right thing. 2014-08-10 20:38:14 -07:00
friendica
b12e40a4e8 allow channel login to the api, just like with the cloud 2014-08-10 19:53:26 -07:00
friendica
24db2e4468 remember activity setting 2014-08-10 18:18:41 -07:00
friendica
9ab12929d7 implement max_import_size 2014-08-09 23:38:33 -07:00
friendica
091138cbd3 prevent obscured email notifications 2014-08-09 17:20:30 -07:00
friendica
229ffd59ac Merge https://github.com/friendica/red into pending_merge 2014-08-09 15:21:37 -07:00
friendica
1397c6f994 booboo 2014-08-09 15:21:15 -07:00
Jeroen
bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). 2014-08-09 01:18:31 +00:00
friendica
2aef2ed56b Merge https://github.com/friendica/red into pending_merge 2014-08-08 15:27:47 -07:00
friendica
e9caf9db6a a couple of "not quite public" fixes 2014-08-08 15:27:17 -07:00
friendica
02b17fd27e rev update 2014-08-08 15:27:07 -07:00
friendica
55aa0c1041 doc updates 2014-08-08 15:26:36 -07:00
zzottel
648c016d54 Merge pull request #554 from zzottel/master
update to German translations
2014-08-08 16:47:19 +02:00
zottel
d91eee759f update to German translations 2014-08-08 16:46:29 +02:00
zzottel
08f5e26355 Merge pull request #553 from zzottel/master
update German main help page
2014-08-08 14:29:27 +02:00
zottel
08bee2a03a update German main help page 2014-08-08 14:28:02 +02:00
friendica
50be78d7dc fix ignore of unapproved connection 2014-08-07 20:42:49 -07:00
friendica
ad1472abf0 got the logic reversed on that one 2014-08-07 18:58:33 -07:00