aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'photothread'friendica2013-04-291-100/+18
|\
| * Merge branch 'master' into photothreadfriendica2013-04-16100-960/+1773
| |\
| * | some work on updating photo threads for Redfriendica2013-04-081-100/+18
* | | don't try and load an empty string as a photofriendica2013-04-292-1/+8
* | | fix broken profile syncingfriendica2013-04-291-2/+4
* | | add some debugging - update times are changing much faster than they're suppo...friendica2013-04-292-1/+8
* | | more directory sync stufffriendica2013-04-281-11/+20
* | | Merge https://github.com/friendica/red into zpullfriendica2013-04-281-11/+0
|\ \ \
| * | | Redundant CSSThomas Willingham2013-04-271-11/+0
* | | | port superblock core code (except Red will use an xchan instead of a URL)friendica2013-04-282-1/+44
|/ / /
* | | doc updatefriendica2013-04-26109-915/+3972
* | | rev updatefriendica2013-04-262-90/+89
* | | Merge pull request #49 from beardy-unixer/masterfriendica2013-04-2669-19/+4116
|\ \ \
| * | | Unbork smarty templates.Thomas Willingham2013-04-263-10/+5
| * | | Stupid mistakeThomas Willingham2013-04-261-0/+2
| * | | ColorboxThomas Willingham2013-04-2672-25/+4125
|/ / /
* | | photo driver abstractionfriendica2013-04-2515-471/+436
* | | odds and ends in prepearation for photo abstraction, plus red-to-friendica addonfriendica2013-04-256-37/+154
* | | dba driver cleanupfriendica2013-04-232-15/+9
* | | remove old driverfriendica2013-04-222-193/+10
* | | cleanup debugging code in abstracted db driverfriendica2013-04-221-6/+15
* | | db abstraction layerfriendica2013-04-2277-842/+963
* | | reverting to fancybox for "save to file" selection box until we find a better...friendica2013-04-214-7/+9
* | | 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 nothing...friendica2013-04-182-4/+54
* | | 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 producti...friendica2013-04-173-133/+0
* | | start of DB driver abstraction class (we'll need similar mechanisms for the G...friendica2013-04-174-1/+134
| |/ |/|
* | 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.Thomas Willingham2013-04-162-2/+12
* | | Merge pull request #47 from beardy-unixer/masterfriendica2013-04-153-8/+17
|\| |
| * | 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 mean...friendica2013-04-1516-59/+60
* | more Friendica removalsfriendica2013-04-144-9/+8
* | template updatefriendica2013-04-141-1/+1
* | more cleanupfriendica2013-04-142-2/+1