aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-081-3/+2
|\ \
| * | Merge pull request #361 from cvogeley/masterfriendica2014-03-091-3/+2
| |\|
| | * zrl and zmg are backChristian Vogeley2014-03-091-2/+1
| | * mergeChristian Vogeley2014-03-09335-4412/+11486
| | |\ | | |/ | |/|
| | * .Christian Vogeley2014-03-091-1/+2
| | * allow again zrl and zmg in apiChristian Vogeley2014-03-091-1/+1
| | * Typocvogeley2014-02-271-1/+1
| | * more tweaksChristian Vogeley2014-02-221-2/+1
* | | HOWTO create a derived theme lesson 1. Do not attempt to do anything more com...friendica2014-03-082-0/+79
|/ /
* | collapse the advanced directory search so that folks who think they're advanc...friendica2014-03-082-2/+6
* | advanced search front-endfriendica2014-03-084-2/+19
* | back-end for advanced directory searchfriendica2014-03-081-15/+98
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-084-4/+29
|\ \
| * \ Merge pull request #359 from beardy-unixer/masterfriendica2014-03-091-1/+10
| |\ \
| | * | is_developer() for those awkward "Don't touch this yet unlessThomas Willingham2014-03-081-1/+10
| * | | Merge pull request #358 from git-marijus/masterfriendica2014-03-093-3/+19
| |\ \ \ | | |/ / | |/| |
| | * | style fixesmarijus2014-03-083-3/+19
| |/ /
* / / incorrect webfinger link per fabrixxmfriendica2014-03-082-2/+2
|/ /
* | missing quotefriendica2014-03-071-1/+1
* | Merge pull request #357 from beardy-unixer/masterfriendica2014-03-082-0/+10
|\ \
| * | Create a sys chan for hubs that already exist too.Thomas Willingham2014-03-071-0/+7
| * | Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-03-076-35/+51
| |\ \
| * | | Actually create syschan during installThomas Willingham2014-03-071-0/+3
* | | | showwarning when manually changing alsofriendica2014-03-071-0/+7
* | | | notify when permissions change and haven't been saved.friendica2014-03-075-1/+16
* | | | start new connections out with even more sane defaults than before by pre-fil...friendica2014-03-073-1/+10
* | | | When approving a connection automatically select Full Sharing.friendica2014-03-071-0/+6
* | | | doc updatefriendica2014-03-07134-1416/+2620
| |/ / |/| |
* | | Merge pull request #356 from git-marijus/masterfriendica2014-03-086-35/+51
|\ \ \ | |/ / |/| |
| * | fix of fixmarijus2014-03-071-1/+1
| * | fixmarijus2014-03-071-2/+1
| * | thats bettermarijus2014-03-071-1/+1
| * | probably should indicate the appearence of aside visualy somehowmarijus2014-03-072-5/+10
| * | might be needed by not local users aswellmarijus2014-03-071-2/+0
| * | remove aside on navbar collapse and add button to toggle visibilitymarijus2014-03-076-35/+49
* | | Typo in database.sqlThomas Willingham2014-03-071-1/+1
|/ /
* | typofriendica2014-03-061-1/+1
* | bring friends backfriendica2014-03-065-15/+22
* | background imagefriendica2014-03-052-0/+13
* | more stufffriendica2014-03-051-5/+12
* | more teeny word smoothingfriendica2014-03-051-1/+1
* | more readability issuesfriendica2014-03-051-1/+1
* | don't context switch between singular/plural so muchfriendica2014-03-051-1/+1
* | minor readability changesfriendica2014-03-051-2/+2
* | make colorbox work again - it worked on the test site but not in productionfriendica2014-03-052-7/+9
* | missing mod/blockfriendica2014-03-051-0/+86
* | assets updatefriendica2014-03-052-45/+138
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-052-8/+12
|\ \
| * \ Merge pull request #355 from git-marijus/masterfriendica2014-03-062-8/+12
| |\ \
| | * | improve navbar collapsed state a littlemarijus2014-03-052-8/+12