aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix photo updates in appman.Thomas Willingham2014-05-221-2/+2
* Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-05-2247-10641/+11090
|\
| * Merge pull request #469 from tuscanhobbit/masterPaolo T2014-05-222-2440/+3
| |\
| | * IT: strings fixedPaolo Tacconi2014-05-222-2440/+3
| * | Merge pull request #468 from tuscanhobbit/masterPaolo T2014-05-222-4126/+6455
| |\|
| | * IT: updated stringsPaolo Tacconi2014-05-222-4126/+6455
| * | sort by app name and not by apd filenamefriendica2014-05-222-2/+5
| * | fix cloud pathfriendica2014-05-211-1/+1
| * | Add the admin appfriendica2014-05-213-0/+9
| * | Time to flip the switch.friendica2014-05-211-2/+4
| * | more app workfriendica2014-05-216-12/+34
| * | a couple more system appsfriendica2014-05-214-0/+8
| * | bookmarks appfriendica2014-05-212-0/+4
| * | system app updatesfriendica2014-05-214-0/+8
| * | change app dropdown to point to apps module (changes nav template). Important...friendica2014-05-213-11/+7
| * | Merge pull request #467 from solstag/masterRedMatrix2014-05-221-5/+5
| |\ \
| | * | Make tag delivery work when channel name differs from profile nameAlexandre Hannud Abdo2014-05-211-5/+5
| |/ /
| * | Merge pull request #464 from solstag/masterRedMatrix2014-05-2110-5101/+5331
| |\ \
| | * | Allow translation context with plural. Use that in Likes/Dislikes.Alexandre Hannud Abdo2014-05-215-4505/+4699
| | * | Update pt-br translation.Alexandre Hannud Abdo2014-05-213-585/+614
| | * | Make translation contexts effective.Alexandre Hannud Abdo2014-05-213-11/+18
| * | | make it possible to edit/delete apps via /apps/personal/editfriendica2014-05-214-3/+9
| |/ /
| * | add zids to all the personal app linksfriendica2014-05-201-0/+5
| * | this is why I didn't see the "app installed" message....friendica2014-05-201-1/+1
| * | try to recover from bad updatefriendica2014-05-202-2/+14
| * | more app workfriendica2014-05-204-29/+78
| * | unfinished work for creating appfriendica2014-05-202-0/+70
| * | add optional context to translationsfriendica2014-05-204-106/+120
| * | most of the remaining apps basic infrastructure except a form to create the t...friendica2014-05-208-17/+121
| * | Merge pull request #463 from git-marijus/masterRedMatrix2014-05-216-178/+79
| |\ \
| | * | the js seems to interfere with something else... comment out for now...marijus2014-05-202-8/+8
| | * | some work on comment_item.tplmarijus2014-05-206-176/+77
| |/ /
| * | more app backend workfriendica2014-05-196-9/+59
| * | apps: fix encoding/decoding and chunk splittingfriendica2014-05-181-2/+2
| * | start to build out the appsfriendica2014-05-182-6/+70
* | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-05-1910-599/+841
|\| |
| * | support commerical appsfriendica2014-05-183-3/+18
| * | more app workfriendica2014-05-181-0/+44
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-183-1/+63
| |\ \
| | * | implement modal for more then 10 likes/dislikesmarijus2014-05-183-1/+63
| * | | more app infrastructurefriendica2014-05-182-5/+50
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-173-586/+615
| |\ \
| | * | Dark schema: Minor minor editjeroenpraat2014-05-171-2/+2
| | * | Merge pull request #462 from tuscanhobbit/masterPaolo T2014-05-172-584/+613
| | |\|
| | | * IT: strings updatedtuscanhobbit2014-05-172-584/+613
| * | | app DB structurefriendica2014-05-174-9/+56
| |/ /
* / / Minor docoThomas Willingham2014-05-161-2/+2
|/ /
* | the help appfriendica2014-05-163-1/+4
* | more doc updatesfriendica2014-05-165-0/+438
* | doc updatesfriendica2014-05-1665-1174/+1356