aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* reverting to fancybox for "save to file" selection box until we find a ↵friendica2013-04-214-7/+9
| | | | better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here.
* sql error on contact removalfriendica2013-04-193-1437/+1438
|
* more umbilical cuttingfriendica2013-04-18400-1257/+3316
|
* for directory sync, ensure we have a fallback master; even if we have ↵friendica2013-04-182-4/+54
| | | | nothing else
* small issue with zid returning incorrect result on your own channel linkfriendica2013-04-181-0/+3
|
* turn naked links in posts into zrl's if we've got a hubloc for the sitefriendica2013-04-185-3/+34
|
* move js from module to to module-specific js filefriendica2013-04-171-0/+13
|
* poke doco and cleanupfriendica2013-04-172-41/+22
|
* poke bugfixfriendica2013-04-171-2/+1
|
* basic poke workingfriendica2013-04-172-61/+47
|
* That was a bit premature. I'll hold these for now until they're more ↵friendica2013-04-173-133/+0
| | | | production ready.
* start of DB driver abstraction class (we'll need similar mechanisms for the ↵friendica2013-04-174-1/+134
| | | | GD/ImageMagick photo stuff and perhaps also for abstracting alternate "social networks")
* fix marking events seenfriendica2013-04-161-1/+1
|
* oopsfriendica2013-04-161-1/+1
|
* add Red detection to parse_urlfriendica2013-04-161-1/+9
|
* doc updatefriendica2013-04-162-2/+5
|
* more docofriendica2013-04-161-2/+20
|
* update docofriendica2013-04-1651-237/+416
|
* zid fixesfriendica2013-04-162-3/+16
|
* Merge pull request #48 from beardy-unixer/masterfriendica2013-04-152-2/+12
|\ | | | | Uncripple Zids
| * Uncripple zids.Thomas Willingham2013-04-162-2/+12
| |
* | Merge pull request #47 from beardy-unixer/masterfriendica2013-04-153-8/+17
|\| | | | | Quick Fix ACL
| * Fix aclThomas Willingham2013-04-163-8/+17
| |
* | fix settable page titles after Red page re-org long ago.friendica2013-04-151-3/+3
|/
* turn all Red links into zrls (not the old zrls, the new bbcode zrl which ↵friendica2013-04-1516-59/+60
| | | | means we can zidify them)
* more Friendica removalsfriendica2013-04-144-9/+8
|
* template updatefriendica2013-04-141-1/+1
|
* more cleanupfriendica2013-04-142-2/+1
|
* begin to cut the umbilicalfriendica2013-04-1419-35/+35
|
* IMPORTANT: magic-auth protocol update, plus 'zrl' bbcode tag for the ↵friendica2013-04-145-12/+54
| | | | privacy-is-more-important-than-ease-of-use folks.
* Merge https://github.com/friendica/red into zpullfriendica2013-04-1010-601/+1131
|\
| * Merge pull request #46 from omigeot/misc-fixesfriendica2013-04-1010-601/+1131
| |\ | | | | | | Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keep...
| | * Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping ↵Olivier Migeot2013-04-1010-601/+1131
| |/ | | | | | | old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him).
* | magic auth docofriendica2013-04-103-3/+3
| |
* | document the ability to provide a selective magic-auth filter as a plugin pluginfriendica2013-04-081-1/+3
| |
* | modify linkify to work correctly with Red mid's containing '@'friendica2013-04-083-90/+98
|/
* wrapper function to create arbitrary activities (e.g. for plugins and apps) ↵friendica2013-04-043-1/+68
| | | | with a minimal amount of fuss, though the amount of fuss could increase significantly depending on the nature of the activity. For a simple wall post, just set the $arr['body'] to the desired text and we'll do the rest. If the activity requires special verbs, objects or targets, these will all need to be constructed.
* Merge https://github.com/friendica/red into zpullfriendica2013-04-037-43/+42
|\
| * Merge pull request #45 from beardy-unixer/masterfriendica2013-04-037-43/+42
| |\ | | | | | | Album slideshows
| | * New mail_list template.Thomas Willingham2013-03-312-36/+12
| | |
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-290-0/+0
| | |\
| | * | Typo in page_displayThomas Willingham2013-03-292-2/+2
| | | |
| | * | Make prettyPhoto a feature, add slideshow for albums.Thomas Willingham2013-03-295-7/+30
| | | |
| | * | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-2849-279/+361
| | |\ \
* | | | | liking comments were reverted to liking the parent after sending item to ↵friendica2013-04-032-4/+5
|/ / / / | | | | | | | | | | | | another channel
* | | | missed channel_default_group key nrenamefriendica2013-04-031-1/+1
| | | |
* | | | rev updatefriendica2013-04-032-162/+162
| |_|/ |/| |
* | | Merge pull request #44 from ↵friendica2013-03-2863-2344/+1
|\| | | |/ |/| | | | | beardy-unixer/c8852d455e77624baf9e6ac852c1176f45462e70 Template cleanup
| * Template clean up.Thomas Willingham2013-03-2863-2344/+1
| |
* | clarifyfriendica2013-03-271-1/+1
| |