aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | make lockview for photos workmarijus2014-10-172-5/+15
| * | | merge madnessfriendica2014-10-1964-1253/+1177
| * | | string updatefriendica2014-10-191-374/+368
| * | | new doc added to doc checkinfriendica2014-10-1920-0/+2790
| * | | doc updatesfriendica2014-10-19114-2050/+2239
| * | | wall-e random signature failuresfriendica2014-10-191-1/+2
| |/ /
| * | mark signature forgeriesfriendica2014-10-166-4/+16
| * | Merge pull request #645 from pafcu/masterRedMatrix2014-10-172-13/+13
| |\|
| | * Merge branch 'master' of https://github.com/pafcu/redStefan Parviainen2014-10-1612-34/+48
| | |\
| | | * Merge pull request #1 from friendica/masterpafcu2014-10-1612-34/+48
| | | |\
| | * | | Login menuStefan Parviainen2014-10-162-13/+13
| | |/ /
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-163-3/+6
| |\ \ \ | | | |/ | | |/|
| | * | jsonp support (thankxs fabrixxm)friendica2014-10-163-3/+6
| * | | lighttpd sample conf security enhancementmarijus2014-10-161-0/+5
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-151-1/+1
| |\ \
| | * \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-162-3/+3
| | |\ \
| | * | | Let's not play security expert. Use Mozillas recommended serverThomas Willingham2014-10-161-1/+1
| * | | | remove log statementfriendica2014-10-151-2/+0
| * | | | missing event permissionsfriendica2014-10-154-4/+7
| | |/ / | |/| |
| * | | Don't recognise hashtags starting with #, e.g. ###friendica2014-10-152-3/+3
| |/ /
* | | missing custom/ descriptionhabeascodice2014-10-201-0/+2
* | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-151-1/+0
|\ \ \
| * | | Revert "x"habeascodice2014-10-111-1/+0
| * | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-11301-11204/+11847
| |\ \ \
| * \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-0936-182/+151
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-075-18/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-071-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-1526-283/+493
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | SSL is broken you say? Well bah gum.Thomas Willingham2014-10-161-1/+1
| * | | | | | | | $comments > $commentboxmarijus2014-10-151-1/+1
| * | | | | | | | some work on single photo view commentsmarijus2014-10-153-19/+29
| * | | | | | | | one more item_id > idmarijus2014-10-151-1/+1
| * | | | | | | | it seems we do not have an key called item_id here so must be id onlymarijus2014-10-151-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | chanman is now 'locs' and a couple of post handlers have been defined.friendica2014-10-142-31/+90
| * | | | | | | back to wrestling with the !@#$ diaspora recursive reshare from hellfriendica2014-10-141-3/+8
| * | | | | | | missing quotefriendica2014-10-141-1/+1
| * | | | | | | this is the reason Diaspora forum tagging was brokenfriendica2014-10-144-6/+14
| * | | | | | | if a hubloc primary change results in an xchan primary change, create a direc...friendica2014-10-131-1/+5
| * | | | | | | figuring out how to bootstrap the change_primary procedure when all you have ...friendica2014-10-132-0/+6
| * | | | | | | fix import sql errorfriendica2014-10-131-1/+1
| * | | | | | | don't use cached datafriendica2014-10-131-0/+2
| * | | | | | | there's the problemfriendica2014-10-131-2/+2
| * | | | | | | more diagnostic when changing primaryfriendica2014-10-131-4/+17
| * | | | | | | this bug has been there for a *long* time. First time I've ever seen it trigg...friendica2014-10-131-1/+1
| * | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-137-200/+251
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #638 from dawnbreak/RedDAVRedMatrix2014-10-147-200/+251
| | |\ \ \ \ \ \ \
| | | * | | | | | | When you delete something in /cloud stay in the right folder.Klaus Weidenbach2014-10-147-200/+251
| | |/ / / / / / /
| * | | | | | | | sqlfriendica2014-10-131-1/+1
| * | | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-134-13/+8
| |\| | | | | | |