aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc updatefriendica2014-08-1511-0/+2299
* doc updatefriendica2014-08-1594-4907/+5731
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-153-2/+4
|\
| * Merge pull request #562 from cvogeley/masterRedMatrix2014-08-152-1/+3
| |\
| | * Account deletionChristian Vogeley2014-08-152-1/+3
| * | .btn.xs > 0.75rem (let's keep that as the min. scalable font size)jeroenpraat2014-08-151-1/+1
| * | .btn-xs 0.65 > 0.7remjeroenpraat2014-08-151-1/+1
| |/
* / pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER f...friendica2014-08-142-0/+29
|/
* in HTML email notifications, angle brackets in posts were unescaped - includi...friendica2014-08-141-1/+1
* escape tags when using markdown. Strange things happen if you put HTML entiti...friendica2014-08-141-2/+2
* api - foreach warningsfriendica2014-08-141-10/+15
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-1411-6441/+6425
|\
| * Merge pull request #561 from cvogeley/masterRedMatrix2014-08-155-6/+99
| |\
| | * Some work on account deletionChristian Vogeley2014-08-145-6/+99
| * | Added some missing translation strings. Fixed to scalable for a few font sizes.Jeroen2014-08-144-408/+477
| * | update nlJeroen2014-08-142-6027/+5849
* | | put an indicator (*) in the message subject line for notification emails when...friendica2014-08-142-1/+2
|/ /
* | some work on extended profile fieldsfriendica2014-08-133-0/+74
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-136-4/+20
|\ \
| * | this is better cross-browser supportmarijus2014-08-131-1/+3
| * | tweak .comment-edit-text-empty to correlate with the new default app font-sizemarijus2014-08-132-2/+2
| * | provide an expert option to opt out from user zoom on mobile devicesmarijus2014-08-134-2/+16
* | | support title and description (and dates which were done earlier) for friendi...friendica2014-08-134-3/+17
* | | provide a way to preserve photo timestamps when importing (rather than upload...friendica2014-08-123-4/+13
* | | here's the file but I'm less than 5% of the way through porting it.friendica2014-08-121-0/+2807
|/ /
* | zot logging to figure out why we occasionally don't have an address on xchan_...friendica2014-08-121-0/+4
* | couple of frphoto fixes to work better with the dreamhost process reaperfriendica2014-08-122-1/+8
* | Friendica photo import tool. This will bring in all your photos from the chos...friendica2014-08-126-7/+171
|/
* change default invitation messagefriendica2014-08-114-24/+64
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-112-6028/+5850
|\
| * Merge pull request #560 from zzottel/masterzzottel2014-08-112-6028/+5850
| |\
| | * update to German translationszottel2014-08-112-6028/+5850
| |/
* / nothing going on here. nothing to see. move along.friendica2014-08-102-31/+124
|/
* make mention tagging by webbie do the right thing.friendica2014-08-101-1/+1
* allow channel login to the api, just like with the cloudfriendica2014-08-101-4/+24
* remember activity settingfriendica2014-08-102-2/+2
* implement max_import_sizefriendica2014-08-091-1/+7
* prevent obscured email notificationsfriendica2014-08-091-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-096-3850/+3690
|\
| * Some more buttons. Not ready yet. Changed in private message -submit- to -sen...Jeroen2014-08-096-3850/+3690
* | booboofriendica2014-08-092-2/+3
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-083-5515/+6203
|\
| * Merge pull request #554 from zzottel/masterzzottel2014-08-082-5514/+6199
| |\
| | * update to German translationszottel2014-08-082-5514/+6199
| |/
| * Merge pull request #553 from zzottel/masterzzottel2014-08-081-1/+4
| |\
| | * update German main help pagezottel2014-08-081-1/+4
| |/
* | a couple of "not quite public" fixesfriendica2014-08-082-22/+16
* | rev updatefriendica2014-08-082-220/+239
* | doc updatesfriendica2014-08-0855-174/+349
|/
* fix ignore of unapproved connectionfriendica2014-08-071-5/+4