aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #278 from zzottel/masterfriendica2014-01-211-1/+1
|\
| * added feed2red.plzottel2014-01-211-1/+1
* | sql errorfriendica2014-01-211-1/+1
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-213-1/+12
|\ \
| * \ Merge pull request #277 from git-marijus/masterfriendica2014-01-201-1/+1
| |\ \ | | |/ | |/|
| | * lighttpd sample conf updatemarijus2014-01-211-1/+1
| |/
| * Nginx conf updateThomas Willingham2014-01-211-0/+8
| * Debian install script docoThomas Willingham2014-01-211-0/+3
* | move some store thingsfriendica2014-01-214-3/+9
* | create store directory if it's missing before initialising DAVfriendica2014-01-211-1/+4
|/
* Merge https://github.com/friendica/red into zpullfriendica2014-01-201-0/+1
|\
| * Add BBCode extensions to docoThomas Willingham2014-01-201-0/+1
* | when loading a single thread on the channel page, tell JS that there isn't an...friendica2014-01-201-2/+6
|/
* Merge https://github.com/friendica/red into zpullfriendica2014-01-203-3/+8
|\
| * Merge pull request #276 from MicMee/masterfriendica2014-01-201-2/+3
| |\
| | * no need to have a doule hublocidMichael Meer2014-01-201-2/+3
| * | Merge pull request #275 from MicMee/masterfriendica2014-01-203-3/+7
| |\|
| | * added buttons to perform later hubloc actionsMichael Meer2014-01-203-3/+7
* | | Add external resource list so this stuff doesn't get lost. Please update it i...friendica2014-01-202-1/+23
|/ /
* / transifex didn't like plural-forms and now they don't like it commented out. ...friendica2014-01-202-225/+220
|/
* zidify audio/video linksfriendica2014-01-201-7/+14
* catch auth exceptionsfriendica2014-01-202-3/+8
* bring photo tagging back which hasn't worked since forking from Friendica - t...friendica2014-01-192-184/+53
* revert 26dfcecf054e1friendica2014-01-191-6/+2
* Merge https://github.com/friendica/red into zpullfriendica2014-01-192-3/+7
|\
| * Prevent zids messing up davThomas Willingham2014-01-201-3/+5
| * Fix dav directory creation.Thomas Willingham2014-01-201-2/+3
| * Stop Google DDoSing me by providing block_public_search, which unlikeThomas Willingham2014-01-191-3/+4
* | strip zid= from REQUEST_URI as well as QUERY_STRING - sabre uses bothfriendica2014-01-191-0/+3
|/
* don't allow the demo upload server to operate - otherwise one could find them...friendica2014-01-191-0/+4
* add the jquery file uploader. Have been suggesting this as a replacement for ...friendica2014-01-1957-1/+10170
* add ajaxchat library - needs a lot of integration work to handle decentralisa...friendica2014-01-18197-0/+24150
* Merge https://github.com/friendica/red into zpullfriendica2014-01-186-5/+25
|\
| * vcard widget needs to include Contact if it's not included from the module th...Thomas Willingham2014-01-181-0/+1
| * Doco - s/chown/chmodThomas Willingham2014-01-181-2/+2
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-01-171-0/+9
| |\
| | * Merge pull request #274 from zzottel/masterfriendica2014-01-171-0/+9
| | |\
| | | * set jsAvailable cookie expire time to match PHPSESSID'szottel2014-01-171-0/+9
| * | | Missed these from git add...a year agoThomas Willingham2014-01-172-0/+9
| |/ /
| * / Un-break dav auth.Thomas Willingham2014-01-171-3/+4
| |/
* / some more bookmark infrastructure plus a doc updatefriendica2014-01-1837-553/+690
|/
* kill the ummagumma effectfriendica2014-01-162-3/+5
* Merge pull request #273 from zzottel/masterfriendica2014-01-161-1/+5
|\
| * prevent reload loop if JS is active, but no cookies acceptedzottel2014-01-161-1/+5
|/
* Update messages.pofabrixxm2014-01-161-1/+0
* Merge https://github.com/friendica/red into zpullfriendica2014-01-163-296/+3
|\
| * Remove deprecated CSS - there is a dark schema now, and shadows and stuff are...Thomas Willingham2014-01-162-293/+0
| * Tweak "typical" perms macroThomas Willingham2014-01-161-3/+3
* | prevent zid's from reaching the DAV core code.friendica2014-01-163-2/+5
|/
* Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-masterfriendica2014-01-152-4537/+5082
|\