aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
|\
| * try to track down intermittent wall-to-wall attribution on Diaspora exported ...friendica2014-10-092-1/+5
| * oembed issuesfriendica2014-10-082-9/+9
| * change parent constructor per discussionfriendica2014-10-081-1/+1
| * dav issuefriendica2014-10-082-2/+1
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-085-3279/+3688
| |\
| | * Merge pull request #622 from solstag/masterRedMatrix2014-10-092-3276/+3679
| | |\
| | | * update pt-br translationAlexandre Hannud Abdo2014-10-072-3276/+3679
| | * | Merge pull request #627 from tuscanhobbit/devRedMatrix2014-10-091-1/+3
| | |\ \
| | | * | 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
| | |\ \
| | * | | css fixmarijus2014-10-081-1/+1
| * | | | disable email notifications when bulk importing content.friendica2014-10-082-0/+37
| * | | | don't double-encode hashtagsfriendica2014-10-081-4/+4
| | |/ / | |/| |
| * | | soundcloud using a slightly different oembed mechanism - react accordinglyfriendica2014-10-082-1/+10
| |/ /
| * | Merge pull request #626 from habeascodice/masterRedMatrix2014-10-081-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
* | | | Merge remote branch 'upstream/master'habeascodice2014-10-075-18/+29
|\| | |
| * | | 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
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:06:56 +0000