aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bring photo tagging back which hasn't worked since forking from Friendica - ↵friendica2014-01-192-184/+53
| | | | this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh.
* 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
| | | | | | | | block_public will block *only* searching without an observer.
* | 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 ↵friendica2014-01-191-0/+4
| | | | themselves with a bunch of unwanted uploads
* add the jquery file uploader. Have been suggesting this as a replacement for ↵friendica2014-01-1957-1/+10170
| | | | the valum uploaders for quite some time - as there is client resize ability and no license incompatibilities. It still requires integration.
* add ajaxchat library - needs a lot of integration work to handle ↵friendica2014-01-18197-0/+24150
| | | | decentralisation (e.g. chatroom@website) and zotid w/permissions (e.g. ACL controlled chatrooms); we can also rip out a lot of stuff we don't need.
* 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 ↵Thomas Willingham2014-01-181-0/+1
| | | | | | | | that calls it.
| * 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's
| | | * 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 accepted
| * prevent reload loop if JS is active, but no cookies acceptedzottel2014-01-161-1/+5
|/
* Update messages.pofabrixxm2014-01-161-1/+0
| | | should make transifex happy
* 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 ↵Thomas Willingham2014-01-162-293/+0
| | | | | | | | are cofigurable.
| * 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
|\ | | | | | | | | Conflicts: view/ru/strings.php
| * modified: view/ru/messages.popixelroot2014-01-132-1922/+1599
| | | | | | | | modified: view/ru/strings.php
| * modified: view/ru/messages.popixelroot2014-01-131-3661/+4094
| |
* | Merge pull request #272 from beardy-unixer/masterfriendica2014-01-152-4/+17
|\ \ | | | | | | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.
| * \ 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 ...
| | * | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ↵Christian Vogeley2014-01-131-3/+8
| | | | | | | | | | | | | | | | available
| * | | Merge pull request #269 from tobiasd/de20140113tobiasd2014-01-122-2239/+2388
| |\ \ \ | | | | | | | | | | DE update to the strings
| | * | | 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 layouts
| | * | 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 blocks
| | * | Do the same thang for webpage blocksChristian Vogeley2014-01-121-1/+6
| | | |
| * | | Merge pull request #266 from cvogeley/mastercvogeley2014-01-111-2/+7
| |\| | | | | | | | | | Fix webpage layout title editing
| | * | Fix webpage layout title editingChristian Vogeley2014-01-121-2/+7
| | | |
| * | | Merge pull request #265 from cvogeley/mastercvogeley2014-01-111-2/+2
|/| | | | |/ / | | | Fix page layout selector
| * | remove debug loggersChristian Vogeley2014-01-121-3/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 18:19:38 +0000