aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* it's probably better to return an int type in jsontuscanhobbit2014-10-081-1/+2
* The simplest way to hide hubs in statisticstuscanhobbit2014-10-081-1/+2
* Small fix so search field and search buttons fit well.Jeroen2014-10-081-1/+5
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-082-1/+10
|\
| * soundcloud using a slightly different oembed mechanism - react accordinglyfriendica2014-10-082-1/+10
* | css fixmarijus2014-10-081-1/+1
|/
* Merge pull request #626 from habeascodice/masterRedMatrix2014-10-081-1/+1
|\
| * regex missing terminator charhabeascodice2014-09-291-1/+1
* | make nav-pills a bit smaller in heightmarijus2014-10-082-3/+7
* | template for searchbox and some more work on saved searchesmarijus2014-10-086-67/+42
* | nav pills for apps asidemarijus2014-10-081-1/+1
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-081-1/+1
|\ \
| * \ Merge pull request #625 from letterbomber/masterRedMatrix2014-10-081-1/+1
| |\ \
| | * | put back local file check so body is fetched from z_ functionsnostupidzone2014-10-071-1/+1
| |/ /
* / / make author link bold againmarijus2014-10-081-1/+1
|/ /
* | css fixesmarijus2014-10-083-20/+5
* | add imagick version check when guessing mimetype. It probably isn't important...friendica2014-10-071-10/+21
* | stylish_select wants to attach itself to the root html element. Since it stil...friendica2014-10-071-1/+1
* | log the recursive reshare from hell at logger_debug until we get through this...friendica2014-10-071-3/+3
* | add "stacked pills" to saved search term list (the delete icon is still a bit...friendica2014-10-072-4/+4
* | 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
|/ /
* | attempt to deal with the diaspora recursive reshare from hell (Bob reshared N...friendica2014-10-051-10/+40