aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* xhabeascodice2014-10-071-0/+1
* Merge remote branch 'upstream/master'habeascodice2014-10-0766-7600/+648
|\
| * Schema option for bgcolour and underline yes/no on hover for the left aside.Jeroen2014-10-076-0/+16
| * check the imagick version before using it.friendica2014-10-072-5/+17
| * Schema option for making links bold again. https://redmatrix.nl/display/d09d1...Jeroen2014-10-076-0/+12
| * Merge pull request #623 from letterbomber/masterRedMatrix2014-10-081-6/+10
| |\
| | * add ability to skip broken imagemagick on shared hostingnostupidzone2014-10-071-6/+10
| |/
| * porting more widgets to bs nav-pillsmarijus2014-10-079-86/+56
| * remove this - some widgets still need to be converted to bs-pills thoughmarijus2014-10-071-1/+0
| * take away some boldness, some css fixes and some photo workmarijus2014-10-076-40/+38
| * Merge pull request #621 from solstag/masterRedMatrix2014-10-072-3/+3
| |\
| | * datetimepicker data-format now data-date-formatAlexandre Hannud Abdo2014-10-072-3/+3
| |/
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0616-371/+384
| |\
| | * Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-074-371/+384
| | |\
| | | * Merge pull request #620 from dawnbreak/RedDAVRedMatrix2014-10-074-371/+384
| | | |\
| | | | * Moved RedBrowser class from reddav.php to it's own file.Klaus Weidenbach2014-10-064-371/+384
| | * | | Rainbow_man with alpha channel turns out very ugly in the directory for some ...Jeroen2014-10-0712-0/+0
| | |/ /
| * / / Make a best guess at how to pull the attribution from the recursive reshare f...friendica2014-10-061-0/+4
| |/ /
| * | found one bug trying to fetch the recursive reshare from hell. I still think ...friendica2014-10-062-13/+13
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 02:37:26 +0000