aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* beginning of permission role settingsfriendica2014-08-172-1/+61
* add ability to follow somebody not already in your connections from "post act...friendica2014-08-171-0/+5
* diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elep...friendica2014-08-171-218/+118
* some more work on realmsfriendica2014-08-176-15/+54
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-178-2472/+2923
|\
| * Merge pull request #567 from tuscanhobbit/masterPaolo T2014-08-172-1208/+1416
| |\
| | * IT: strings updatedtuscanhobbit2014-08-172-1208/+1416
| * | Doco - attempt to explain pull requests in git for non developers.Thomas Willingham2014-08-171-2/+27
| * | Merge pull request #565 from RedMatrixCanada/BranchRedMatrix2014-08-172-1197/+1387
| |\ \
| | * | French Transalations - UPDATEDRedMatrixCanada2014-08-162-1197/+1387
| * | | Merge pull request #566 from tonnerkiller/masterRedMatrix2014-08-173-65/+93
| |\ \ \ | | |/ / | |/| |
| | * | Added "if(!function_exists('xpost_to_html2bbcode'))"tonnerkiller2014-08-161-64/+68
| | * | api_posting.bb is a new doco file that explains posting to the redmatrix from...tonnerkiller2014-08-162-1/+25
* | | | add collections widget to connections page - and some more work on realmsfriendica2014-08-175-2/+27
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-163-4/+7
|\ \ \
| * \ \ Merge pull request #564 from cvogeley/masterRedMatrix2014-08-172-3/+6
| |\ \ \
| | * | | Add account deletion to the UIChristian Vogeley2014-08-162-3/+6
| * | | | Install doc - mcrypt is required, not optional. Even if it's intendedThomas Willingham2014-08-161-1/+1
| | |/ / | |/| |
* / | | provide backend storage and declaration of directory realmfriendica2014-08-167-31/+35
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-151-1/+1
|\ \ \
| * \ \ Merge pull request #563 from zzottel/masterRedMatrix2014-08-161-1/+1
| |\ \ \
| | * | | don't block "public" messages with authenticated scopezottel2014-08-151-1/+1
| |/ / /
* / / / bring back some friendica crypto stuff including all the key mangling and tra...friendica2014-08-152-1/+173
|/ / /
* | | 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