Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into photothread | friendica | 2013-04-16 | 100 | -960/+1773 |
|\ | |||||
| * | 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. | Thomas Willingham | 2013-04-16 | 2 | -2/+12 |
| * | | Merge pull request #47 from beardy-unixer/master | friendica | 2013-04-15 | 3 | -8/+17 |
| |\| | |||||
| | * | 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 mean... | friendica | 2013-04-15 | 16 | -59/+60 |
| * | 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 privacy-... | friendica | 2013-04-14 | 5 | -12/+54 |
| * | 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 keeping o... | Olivier Migeot | 2013-04-10 | 10 | -601/+1131 |
| | |/ | |||||
| * | | 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 |
* | | | some work on updating photo threads for Red | friendica | 2013-04-08 | 1 | -100/+18 |
|/ / | |||||
* / | modify linkify to work correctly with Red mid's containing '@' | friendica | 2013-04-08 | 3 | -90/+98 |
|/ | |||||
* | wrapper function to create arbitrary activities (e.g. for plugins and apps) w... | friendica | 2013-04-04 | 3 | -1/+68 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-04-03 | 7 | -43/+42 |
|\ | |||||
| * | Merge pull request #45 from beardy-unixer/master | friendica | 2013-04-03 | 7 | -43/+42 |
| |\ | |||||
| | * | New mail_list template. | Thomas Willingham | 2013-03-31 | 2 | -36/+12 |
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-03-29 | 0 | -0/+0 |
| | |\ | |||||
| | * | | Typo in page_display | Thomas Willingham | 2013-03-29 | 2 | -2/+2 |
| | * | | Make prettyPhoto a feature, add slideshow for albums. | Thomas Willingham | 2013-03-29 | 5 | -7/+30 |
| | * | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-03-28 | 49 | -279/+361 |
| | |\ \ | |||||
* | | | | | liking comments were reverted to liking the parent after sending item to ano... | friendica | 2013-04-03 | 2 | -4/+5 |
|/ / / / | |||||
* | | | | missed channel_default_group key nrename | friendica | 2013-04-03 | 1 | -1/+1 |
* | | | | rev update | friendica | 2013-04-03 | 2 | -162/+162 |
| |_|/ |/| | | |||||
* | | | Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f454... | friendica | 2013-03-28 | 63 | -2344/+1 |
|\| | | |/ |/| | |||||
| * | Template clean up. | Thomas Willingham | 2013-03-28 | 63 | -2344/+1 |
* | | clarify | friendica | 2013-03-27 | 1 | -1/+1 |
* | | updated readme | friendica | 2013-03-27 | 1 | -9/+6 |
* | | add new connections to default group (if any) | friendica | 2013-03-27 | 5 | -62/+47 |
* | | update manage table and some documentation | friendica | 2013-03-27 | 46 | -210/+310 |
|/ | |||||
* | more doco | friendica | 2013-03-26 | 1 | -5/+8 |
* | set hidden flags on new directory entries, not just existing ones | friendica | 2013-03-26 | 3 | -6/+29 |
* | magic auth issue | friendica | 2013-03-26 | 2 | -4/+12 |
* | we don't need this any more | friendica | 2013-03-25 | 1 | -84/+0 |
* | doco | friendica | 2013-03-25 | 3 | -11/+106 |
* | uri to mid | friendica | 2013-03-25 | 2 | -2/+2 |
* | Merge pull request #43 from beardy-unixer/master | friendica | 2013-03-25 | 5 | -11/+9 |
|\ |