aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added buttons to perform later hubloc actionsMichael Meer2014-01-203-3/+7
* 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
|\
| * modified: view/ru/messages.popixelroot2014-01-132-1922/+1599
| * modified: view/ru/messages.popixelroot2014-01-131-3661/+4094
* | Merge pull request #272 from beardy-unixer/masterfriendica2014-01-152-4/+17
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-01-1510-31/+81
| |\ \ | |/ / |/| |
* | | allow menus to have special rolesfriendica2014-01-153-4/+19
* | | fix folder timestamps and change them when a child DAV file is written tofriendica2014-01-151-5/+31
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-156-2252/+2418
|\ \ \
* | | | dav: throw exception if channel for requested DAV directory is deletedfriendica2014-01-157-22/+31
| | * | Log failed auth to it's own file so fail2ban doesn't have to parse MB of textThomas Willingham2014-01-151-2/+15
| | * | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.Thomas Willingham2014-01-141-2/+2
| |/ /
| * | Merge pull request #271 from cvogeley/mastercvogeley2014-01-131-3/+8
| |\ \
| | * | Confirm box: fall back to standard js confirm dialog if bootstrap isn't avail...Christian Vogeley2014-01-131-3/+8
| * | | Merge pull request #269 from tobiasd/de20140113tobiasd2014-01-122-2239/+2388
| |\ \ \
| | * | | DE: update to the stringsTobias Diekershoff2014-01-132-2239/+2388
| |/ / /
| * | | Merge pull request #268 from cvogeley/mastercvogeley2014-01-113-5/+7
| |\| |
| | * | delete confirmation popup for blocks and layoutsChristian Vogeley2014-01-123-5/+7
| * | | Merge pull request #267 from cvogeley/mastercvogeley2014-01-111-1/+6
| |\| |
| | * | Do the same thang for webpage blocksChristian Vogeley2014-01-121-1/+6
| * | | Merge pull request #266 from cvogeley/mastercvogeley2014-01-111-2/+7
| |\| |