aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-053-142/+176
|\
| * Merge pull request #617 from solstag/masterRedMatrix2014-10-063-142/+176
| |\
| | * New tag version of datetimepicker avoids hanging some browsersAlexandre Hannud Abdo2014-10-053-142/+176
* | | try and guess mimetype for openid profile photofriendica2014-10-051-1/+3
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0533-145/+364
|\|
| * Merge pull request #616 from dawnbreak/docuRedMatrix2014-10-063-137/+271
| |\
| | * Some documentation for include/reddav.php and a bit code cleanup.Klaus Weidenbach2014-10-052-84/+197
| | * Some documentation of include/auth.php.Klaus Weidenbach2014-10-051-53/+74
| * | image/jpeg > image/pngJeroen2014-10-052-5/+5
| * | Licenses issues.Jeroen2014-10-056-0/+0
| * | +png supportjeroenpraat2014-10-051-1/+1
| * | Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl...Jeroen2014-10-0532-1/+86
| * | Merge pull request #613 from unary/typoKlaus2014-10-051-1/+1
| |\ \ | | |/ | |/|
| | * typoMichael Johnston2014-10-031-1/+1
* | | diaspora share not rendering issue - still have one remaining (the recursive ...friendica2014-10-051-1/+1
|/ /
* | add blueimp-jquery-file-upload libraryfriendica2014-10-0556-0/+10272
* | add 'nopush' option to the post API so somebody could bulk load a bunch of ex...friendica2014-10-052-10/+17
* | network page default optionfriendica2014-10-042-2/+5
* | +urls to pubsites and installjeroenpraat2014-10-041-0/+2
* | updated it with the same text as in assets/home.htmljeroenpraat2014-10-041-5/+5
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-032-5/+6
|\
| * Merge pull request #612 from beardy-unixer/masterRedMatrix2014-10-041-3/+4
| |\
| | * That's a string, not an integerThomas Willingham2014-10-031-1/+1
| | * Set timezone when creating a channel.Thomas Willingham2014-10-031-3/+4
| * | it seems this is needed also to not allow editing profile photo albummarijus2014-10-031-2/+2
* | | more infrastructure for sharing page design elementsfriendica2014-10-031-1/+43
|/ /
* | remove the privacy macros in settings and connedit now that we have privacy r...friendica2014-10-032-30/+0
* | more work on shared design elementsfriendica2014-10-031-1/+7
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-037-119/+165
|\ \
| * \ Merge pull request #611 from tuscanhobbit/devRedMatrix2014-10-031-0/+1
| |\ \ | | |/ | |/|
| | * site language in siteinfo/json has been re-addedPaolo Tacconi2014-10-021-0/+1
| * | more work on photosmarijus2014-10-024-71/+75
| |/
| * Merge pull request #610 from tuscanhobbit/devRedMatrix2014-10-023-48/+89
| |\
| | * query for statistics are now executed by pollerPaolo Tacconi2014-10-023-49/+89
| | * Merge from masterPaolo Tacconi2014-10-024-5/+22
| | |\
| | | * Rebase from upstreamPaolo Tacconi2014-10-024-5/+22
| | | |\
| | * | | site language was left out of siteinfotuscanhobbit2014-10-011-0/+1
| | |/ /
| | * | Merge from upstreamtuscanhobbit2014-10-0124-1380/+2063
| | |\ \
| | * \ \ Merge from upstreamtuscanhobbit2014-09-2814-156/+453
| | |\ \ \
| | * \ \ \ Merge from origintuscanhobbit2014-09-2883-1956/+2370
| | |\ \ \ \
| | * \ \ \ \ Merge from origintuscanhobbit2014-09-220-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge from upstreamtuscanhobbit2014-09-22156-3017/+10141
| | |\ \ \ \ \ \
* | | | | | | | | rev updatefriendica2014-10-033-343/+351
* | | | | | | | | doc updatesfriendica2014-10-0349-355/+1109
|/ / / / / / / /
* | | | | | | / issues with diaspora comment signatures on relayed comments that are relayed ...friendica2014-10-025-7/+21
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | only auto-follow the site recommendations if creating the first channel for a...friendica2014-10-011-1/+11
* | | | | | | ability to pre-populate connections for new channels. e.g. "MySpace Tom"friendica2014-10-014-5/+12
| |_|_|_|_|/ |/| | | | |
* | | | | | that's why remove_obsolete_hublocs() isn't telling anybody when it does its t...friendica2014-09-301-3/+3
* | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-303-3/+13
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #608 from beardy-unixer/masterRedMatrix2014-10-011-2/+4
| |\ \ \ \ \ \