aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* check the imagick version before using it.friendica2014-10-072-5/+17
|
* Schema option for making links bold again. ↵Jeroen2014-10-076-0/+12
| | | | https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com
* Merge pull request #623 from letterbomber/masterRedMatrix2014-10-081-6/+10
|\ | | | | add ability to skip broken imagemagick on shared hosting
| * 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-format
| * 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.
| | | * Moved RedBrowser class from reddav.php to it's own file.Klaus Weidenbach2014-10-064-371/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step on cleaning up ReadDAV classes and restructuring it bit in preparation for adding some more DAV features, photo access, CalDAV, etc. and hopefully also some PHPunits. Add a PHP5.3 namespace for RedDAV classes. Any objections against this or the vendor namespace? Add some more documentation for RedBrowser.
| * | | Rainbow_man with alpha channel turns out very ugly in the directory for some ↵Jeroen2014-10-0712-0/+0
| |/ / | | | | | | | | | hosts. Reset to rainbow_man with alpha, with alpha to rainbow_man_trans. Did the same for red_koala to be sure. You now have a red_koala_trans too.
* / / Make a best guess at how to pull the attribution from the recursive reshare ↵friendica2014-10-061-0/+4
|/ / | | | | | | from hell.
* | found one bug trying to fetch the recursive reshare from hell. I still think ↵friendica2014-10-062-13/+13
| | | | | | | | there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing.
* | 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.
| | * 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 datetimepicker
| | * 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 ↵Jeroen2014-10-0612-0/+0
| |/ | | | | | | Inkscape to PNG. Result: super sharp.
* / install doc double escapes the store/[data] path.friendica2014-10-062-2/+2
|/
* attempt to deal with the diaspora recursive reshare from hell (Bob reshared ↵friendica2014-10-051-10/+40
| | | | Nancy's reshare of George's reshare of Lilly's reshare of Nathan's post). The attribution may be wrong so this is still a work in progress.
* send dislike activities to diaspora as comments, also send likes and ↵friendica2014-10-051-13/+5
| | | | dislikes of comments as additional comments. We won't go into why this is necessary for a service that claims to support activitystreams.
* 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 browsers
| | * New tag version of datetimepicker avoids hanging some browsersAlexandre Hannud Abdo2014-10-053-142/+176
| | | | | | | | | | | | | | | But still won't work with those same browsers. Devel versions seem to work, but I chose to be conservative.
* | | 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
| |\ | | | | | | Documentation and some restructure in RedBasicAuth
| | * Some documentation for include/reddav.php and a bit code cleanup.Klaus Weidenbach2014-10-052-84/+197
| | | | | | | | | | | | | | | Removed some duplicate code in RedBasicAuth and restructured a bit. Still work in progress.
| | * 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
| | | | | | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl
| * | Changed default avatars to PNG as agreed with Mike here: ↵Jeroen2014-10-0532-1/+86
| | | | | | | | | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl. Added a few new. You can set it like this: util/config system default_profile_photo red_avatar
| * | Merge pull request #613 from unary/typoKlaus2014-10-051-1/+1
| |\ \ | | |/ | |/| typo
| | * typoMichael Johnston2014-10-031-1/+1
| | |
* | | diaspora share not rendering issue - still have one remaining (the recursive ↵friendica2014-10-051-1/+1
|/ / | | | | | | share from hell)
* | 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 ↵friendica2014-10-052-10/+17
| | | | | | | | existing content via the API without invoking the notifier and sending each out as a fresh post.
* | 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
|/