aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* issue #588 can't add feeds to collections using connedit page group sidebar w...friendica2014-09-114-3/+4
* Merge pull request #587 from git-marijus/masterRedMatrix2014-09-1112-26/+803
|\
| * another day another concept - hope this works bettermarijus2014-09-115-29/+40
| * Revert "Revert "Merge pull request #583 from git-marijus/master""marijus2014-09-119-19/+785
|/
* Merge pull request #584 from tuscanhobbit/masterPaolo T2014-09-110-0/+0
|\
| * Merge pull request #2 from friendica/masterPaolo T2014-09-02221-10101/+12522
| |\
* | | make sure we add the filefriendica2014-09-101-0/+3
* | | endless scroll on connections pagefriendica2014-09-103-19/+43
* | | disabling ability for diaspora to plustag redmatrix forums. See the notes.friendica2014-09-101-1/+5
* | | possible solution to diaspora walltowall mistaken attributionfriendica2014-09-102-9/+22
* | | more compatibility notesfriendica2014-09-101-0/+2
* | | encrypt diaspora_meta since it may contain private message contentsfriendica2014-09-103-19/+47
* | | make verify_email the default for new installs (at least English installs), a...friendica2014-09-103-1/+9
* | | fix the like signatures to the "new ordering" - inbound and outboundfriendica2014-09-101-20/+12
* | | Revert "Merge pull request #583 from git-marijus/master"friendica2014-09-109-785/+19
* | | Revert "Revert "update nl - attempt 2""friendica2014-09-102-3/+3
* | | Revert "update nl - attempt 2"friendica2014-09-102-3/+3
* | | Merge pull request #583 from git-marijus/masterRedMatrix2014-09-119-19/+785
|\ \ \
| * | | without this check we kill the directory autoloadmarijus2014-09-101-15/+17
| * | | photo justificationmarijus2014-09-109-19/+783
* | | | update nl - attempt 2Jeroen2014-09-102-3/+3
* | | | update nlJeroen2014-09-103-373/+389
|/ / /
* | | channel or accountjeroenpraat2014-09-101-1/+1
* | | should be updatedjeroenpraat2014-09-101-7/+17
* | | don't include plus-sign in the stored term for imported mentionsfriendica2014-09-102-2/+4
* | | this should be the final piece of the puzzlefriendica2014-09-091-0/+14
* | | cross-network mention issuesfriendica2014-09-091-2/+5
* | | Did I ever mention how much I HATE hacking crypto? If you've got a protocol d...friendica2014-09-091-1/+12
* | | go through the entire discovery sequence for mentions to make sure we have th...friendica2014-09-091-1/+9
* | | diaspora connections being marked orphan on directory serversfriendica2014-09-091-1/+1
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-092-28/+1
|\ \ \
| * | | Doco - URL update, kill dupeThomas Willingham2014-09-102-28/+1
* | | | some fixes for auto-perms across networksfriendica2014-09-091-9/+9
|/ / /
* | | reduce log level of inbound d* posts until we get through some of the more se...friendica2014-09-092-2/+2
* | | and provide a strong hint by showing the errant account_flagsfriendica2014-09-091-5/+5
* | | in case somebody has problems and does an update to try and fix it, put somet...friendica2014-09-091-0/+13
* | | argument order reversed in downgrade_accountsfriendica2014-09-091-2/+2
* | | encode rss message-id's - warning this will double store all existing rss fee...friendica2014-09-091-9/+8
* | | put back old pointerfriendica2014-09-091-1/+1
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-091-1/+3
|\ \ \
| * \ \ Merge pull request #582 from beardy-unixer/masterThomas Willingham2014-09-091-1/+3
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-09140-1755/+2353
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Doco - note in Nginx file to kill a recurring support request.Thomas Willingham2014-09-091-1/+3
* | | | | fix empty reshared contentfriendica2014-09-091-2/+2
|/ / / /
* | | | doco correctionfriendica2014-09-091-11/+5
* | | | syntax error in dba driver, document z_post_urlfriendica2014-09-092-0/+30
* | | | if we have php54 don't log the whole damn stack on a db error, just the curre...friendica2014-09-091-2/+5
* | | | d* friending vsprintf errorfriendica2014-09-093-3/+5
* | | | heavy lifting on diaspora likes. Still needs much more work - especially as w...friendica2014-09-081-67/+56
* | | | prevent red#matrix smilie replacements from tripping over each other.friendica2014-09-081-2/+3