aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* issues with editing webpage permissionsfriendica2014-06-153-7/+15
* ensure item_private tracks acl fields on editfriendica2014-06-152-2/+11
* only show jotnets when posting conversation itemsfriendica2014-06-1413-17/+22
* webpage permissions weirdnessfriendica2014-06-142-15/+22
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-145-22/+21
|\
| * Merge pull request #494 from git-marijus/masterRedMatrix2014-06-155-22/+21
| |\
| | * no need to have this twicemarijus2014-06-141-1/+0
| | * fix active statemarijus2014-06-141-0/+1
| | * whitespacemarijus2014-06-142-3/+0
| | * unclutter menues a littlemarijus2014-06-143-21/+23
| |/
| * Merge pull request #491 from pixelroot/masterRedMatrix2014-06-142-2/+2
| |\
| * \ Merge pull request #489 from pixelroot/masterRedMatrix2014-06-142-3/+3
| |\ \
* | | | rev updatefriendica2014-06-141-1/+1
* | | | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-masterfriendica2014-06-142-7/+8
|\ \ \ \ | |/ / / |/| | |
| * | | modified: view/ru/strings.phppixelroot2014-06-141-0/+1
| * | | modified: .htaccesspixelroot2014-06-142-4/+8
| | |/ | |/|
| * | modified: view/ru/messages.popixelroot2014-06-142-2/+2
| |/
| * modified: view/ru/messages.popixelroot2014-06-142-3/+3
* | load main.js lastfriendica2014-06-132-1/+19
* | try to force the update mode to fix the "starting up browser, quickly loads p...friendica2014-06-138-43/+43
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-129-7692/+8117
|\ \
| * | Merge pull request #486 from pixelroot/masterRedMatrix2014-06-132-2134/+2307
| |\|
| | * modified: view/ru/messages.popixelroot2014-06-122-2134/+2307
| * | Merge pull request #487 from solstag/masterRedMatrix2014-06-132-5546/+5750
| |\ \
| | * | update pt-br translationAlexandre Hannud Abdo2014-06-122-5546/+5750
| |/ /
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-06-125-12/+53
| |\ \
| | * | update nl / dark schema: fixed prev/next buttons connections page and directo...jeroenpraat2014-06-115-12/+53
| * | | add hover effect to expand/collapsmarijus2014-06-121-0/+7
| |/ /
* / / send new connection notification even if auto-perms are setfriendica2014-06-122-2/+2
|/ /
* | move expand/collapse to the centermarijus2014-06-111-0/+7
* | update nljeroenpraat2014-06-112-30/+30
* | oops that's hex not decimalfriendica2014-06-101-1/+1
* | issue #433friendica2014-06-104-6/+6
* | merge the app menusfriendica2014-06-105-28/+35
* | syntax errorfriendica2014-06-101-1/+1
* | should really wait until after the first cuppafriendica2014-06-101-4/+5
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-102-154/+154
|\ \
| * | update nl - there was an odd syntax error in strings.phpjeroenpraat2014-06-102-2/+2
| * | Update nljeroenpraat2014-06-102-130/+130
| * | Update nljeroenpraat2014-06-102-24/+24
* | | remote install app (untested)friendica2014-06-104-4/+17
|/ /
* | notify tweaksfriendica2014-06-091-0/+2
* | allow rpost to take a channel argument (the channel nickname) and change chan...friendica2014-06-091-0/+11
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-092-5516/+5720
|\ \
| * | update nljeroenpraat2014-06-091-4/+4
| * | update nljeroenpraat2014-06-091-4/+4
| * | update nljeroenpraat2014-06-092-5515/+5719
* | | post appfriendica2014-06-093-1/+5
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-062-5681/+5508
|\ \
| * \ Merge pull request #481 from tuscanhobbit/masterPaolo T2014-06-062-5681/+5508
| |\ \