Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-04-28 | 1 | -11/+0 | |
|\ \ \ | ||||||
| * | | | Redundant CSS | Thomas Willingham | 2013-04-27 | 1 | -11/+0 | |
| | | | | ||||||
* | | | | port superblock core code (except Red will use an xchan instead of a URL) | friendica | 2013-04-28 | 2 | -1/+44 | |
|/ / / | ||||||
* | | | doc update | friendica | 2013-04-26 | 109 | -915/+3972 | |
| | | | ||||||
* | | | rev update | friendica | 2013-04-26 | 2 | -90/+89 | |
| | | | ||||||
* | | | Merge pull request #49 from beardy-unixer/master | friendica | 2013-04-26 | 69 | -19/+4116 | |
|\ \ \ | | | | | | | | | Add colorbox | |||||
| * | | | Unbork smarty templates. | Thomas Willingham | 2013-04-26 | 3 | -10/+5 | |
| | | | | ||||||
| * | | | Stupid mistake | Thomas Willingham | 2013-04-26 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Colorbox | Thomas Willingham | 2013-04-26 | 72 | -25/+4125 | |
|/ / / | ||||||
* | | | photo driver abstraction | friendica | 2013-04-25 | 15 | -471/+436 | |
| | | | ||||||
* | | | odds and ends in prepearation for photo abstraction, plus red-to-friendica addon | friendica | 2013-04-25 | 6 | -37/+154 | |
| | | | ||||||
* | | | dba driver cleanup | friendica | 2013-04-23 | 2 | -15/+9 | |
| | | | ||||||
* | | | remove old driver | friendica | 2013-04-22 | 2 | -193/+10 | |
| | | | ||||||
* | | | cleanup debugging code in abstracted db driver | friendica | 2013-04-22 | 1 | -6/+15 | |
| | | | ||||||
* | | | db abstraction layer | friendica | 2013-04-22 | 77 | -842/+963 | |
| | | | ||||||
* | | | reverting to fancybox for "save to file" selection box until we find a ↵ | friendica | 2013-04-21 | 4 | -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 removal | friendica | 2013-04-19 | 3 | -1437/+1438 | |
| | | | ||||||
* | | | more umbilical cutting | friendica | 2013-04-18 | 400 | -1257/+3316 | |
| | | | ||||||
* | | | for directory sync, ensure we have a fallback master; even if we have ↵ | friendica | 2013-04-18 | 2 | -4/+54 | |
| | | | | | | | | | | | | nothing else | |||||
* | | | small issue with zid returning incorrect result on your own channel link | friendica | 2013-04-18 | 1 | -0/+3 | |
| | | | ||||||
* | | | turn naked links in posts into zrl's if we've got a hubloc for the site | friendica | 2013-04-18 | 5 | -3/+34 | |
| | | | ||||||
* | | | move js from module to to module-specific js file | friendica | 2013-04-17 | 1 | -0/+13 | |
| | | | ||||||
* | | | poke doco and cleanup | friendica | 2013-04-17 | 2 | -41/+22 | |
| | | | ||||||
* | | | poke bugfix | friendica | 2013-04-17 | 1 | -2/+1 | |
| | | | ||||||
* | | | basic poke working | friendica | 2013-04-17 | 2 | -61/+47 | |
| | | | ||||||
* | | | That was a bit premature. I'll hold these for now until they're more ↵ | friendica | 2013-04-17 | 3 | -133/+0 | |
| | | | | | | | | | | | | production ready. | |||||
* | | | start of DB driver abstraction class (we'll need similar mechanisms for the ↵ | friendica | 2013-04-17 | 4 | -1/+134 | |
| |/ |/| | | | | | GD/ImageMagick photo stuff and perhaps also for abstracting alternate "social networks") | |||||
* | | fix marking events seen | friendica | 2013-04-16 | 1 | -1/+1 | |
| | | ||||||
* | | oops | friendica | 2013-04-16 | 1 | -1/+1 | |
| | | ||||||
* | | add Red detection to parse_url | friendica | 2013-04-16 | 1 | -1/+9 | |
| | | ||||||
* | | doc update | friendica | 2013-04-16 | 2 | -2/+5 | |
| | | ||||||
* | | more doco | friendica | 2013-04-16 | 1 | -2/+20 | |
| | | ||||||
* | | update doco | friendica | 2013-04-16 | 51 | -237/+416 | |
| | | ||||||
* | | zid fixes | friendica | 2013-04-16 | 2 | -3/+16 | |
| | | ||||||
* | | Merge pull request #48 from beardy-unixer/master | friendica | 2013-04-15 | 2 | -2/+12 | |
|\ \ | | | | | | | Uncripple Zids | |||||
| * | | Uncripple zids. | Thomas Willingham | 2013-04-16 | 2 | -2/+12 | |
| | | | ||||||
* | | | Merge pull request #47 from beardy-unixer/master | friendica | 2013-04-15 | 3 | -8/+17 | |
|\| | | | | | | | | Quick Fix ACL | |||||
| * | | Fix acl | Thomas Willingham | 2013-04-16 | 3 | -8/+17 | |
| | | | ||||||
* | | | fix settable page titles after Red page re-org long ago. | friendica | 2013-04-15 | 1 | -3/+3 | |
|/ / | ||||||
* | | turn all Red links into zrls (not the old zrls, the new bbcode zrl which ↵ | friendica | 2013-04-15 | 16 | -59/+60 | |
| | | | | | | | | means we can zidify them) | |||||
* | | more Friendica removals | friendica | 2013-04-14 | 4 | -9/+8 | |
| | | ||||||
* | | template update | friendica | 2013-04-14 | 1 | -1/+1 | |
| | | ||||||
* | | more cleanup | friendica | 2013-04-14 | 2 | -2/+1 | |
| | | ||||||
* | | begin to cut the umbilical | friendica | 2013-04-14 | 19 | -35/+35 | |
| | | ||||||
* | | IMPORTANT: magic-auth protocol update, plus 'zrl' bbcode tag for the ↵ | friendica | 2013-04-14 | 5 | -12/+54 | |
| | | | | | | | | privacy-is-more-important-than-ease-of-use folks. | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-04-10 | 10 | -601/+1131 | |
|\ \ | ||||||
| * \ | Merge pull request #46 from omigeot/misc-fixes | friendica | 2013-04-10 | 10 | -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 Migeot | 2013-04-10 | 10 | -601/+1131 | |
| |/ / | | | | | | | | | | old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him). | |||||
* | | | magic auth doco | friendica | 2013-04-10 | 3 | -3/+3 | |
| | | | ||||||
* | | | document the ability to provide a selective magic-auth filter as a plugin plugin | friendica | 2013-04-08 | 1 | -1/+3 | |
| |/ |/| |