aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | SQL error - private message conversation lookupfriendica2014-10-061-1/+1
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-061-0/+0
| |\ \ \
| | * | | Merge pull request #619 from dawnbreak/masterKlaus2014-10-071-0/+0
| | |\| |
| | | * | We have no submodules, so no need for .gitmodules file.Klaus Weidenbach2014-10-061-0/+0
| | |/ /
| * / / shareable design elementsfriendica2014-10-067-12/+89
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-064-7064/+7
| |\ \
| | * \ Merge pull request #618 from solstag/masterRedMatrix2014-10-074-7064/+7
| | |\ \
| | | * | new version of moment.js to match datetimepickerAlexandre Hannud Abdo2014-10-064-7064/+7
| * | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0612-0/+0
| |\| | |
| | * | | This one had a minor glitch.Jeroen2014-10-063-0/+0
| | * | | Re-created the new png avatars in SVG and exported them directly from Inkscap...Jeroen2014-10-0612-0/+0
| | |/ /
| * / / install doc double escapes the store/[data] path.friendica2014-10-062-2/+2
| |/ /
* | | Merge remote branch 'upstream/master'habeascodice2014-10-06176-1201/+12679
|\| |
| * | attempt to deal with the diaspora recursive reshare from hell (Bob reshared N...friendica2014-10-051-10/+40
| * | send dislike activities to diaspora as comments, also send likes and dislikes...friendica2014-10-051-13/+5
| * | 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
| | | |\ \