aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* | begin to cut the umbilicalfriendica2013-04-1419-35/+35
* | IMPORTANT: magic-auth protocol update, plus 'zrl' bbcode tag for the privacy-...friendica2013-04-145-12/+54
* | 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 keeping o...Olivier Migeot2013-04-1010-601/+1131
| |/ /
* | | 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) w...friendica2013-04-043-1/+68
* Merge https://github.com/friendica/red into zpullfriendica2013-04-037-43/+42
|\
| * Merge pull request #45 from beardy-unixer/masterfriendica2013-04-037-43/+42
| |\
| | * 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 ano...friendica2013-04-032-4/+5
|/ / / /
* | | | missed channel_default_group key nrenamefriendica2013-04-031-1/+1
* | | | rev updatefriendica2013-04-032-162/+162
| |_|/ |/| |
* | | Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f454...friendica2013-03-2863-2344/+1
|\| | | |/ |/|
| * Template clean up.Thomas Willingham2013-03-2863-2344/+1
* | clarifyfriendica2013-03-271-1/+1
* | updated readmefriendica2013-03-271-9/+6
* | add new connections to default group (if any)friendica2013-03-275-62/+47
* | update manage table and some documentationfriendica2013-03-2746-210/+310
|/
* more docofriendica2013-03-261-5/+8
* set hidden flags on new directory entries, not just existing onesfriendica2013-03-263-6/+29
* magic auth issuefriendica2013-03-262-4/+12
* we don't need this any morefriendica2013-03-251-84/+0
* docofriendica2013-03-253-11/+106
* uri to midfriendica2013-03-252-2/+2
* Merge pull request #43 from beardy-unixer/masterfriendica2013-03-255-11/+9
|\
| * Updated build_query for midThomas Willingham2013-03-255-11/+9
|/
* fix mod_display breakage.friendica2013-03-242-3/+10
* descriptive textfriendica2013-03-231-0/+23
* Merge https://github.com/friendica/red into zpullfriendica2013-03-2348-5/+429
|\
| * Merge pull request #42 from beardy-unixer/masterfriendica2013-03-2347-2/+427
| |\
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-231-3/+2
| | |\ | | |/ | |/|
| * | Redbasic - get rid of max-height for images (got lost in the merge last time ...Thomas Willingham2013-03-231-3/+2
| | * Implement prettyPhoto (somewhat).Thomas Willingham2013-03-233-2/+16
| | * Remove Twatter/Facebook shit.Thomas Willingham2013-03-231-1/+1
| | * Add prettyPhoto library.Thomas Willingham2013-03-2344-0/+411
| |/
* / rev updatefriendica2013-03-233-1535/+1560
|/