aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Include zot for magicOlaf Conradi2012-12-261-0/+2
| | * Add permanent redirect (308) http codeOlaf Conradi2012-12-261-5/+7
| | * More whitespace fixesOlaf Conradi2012-12-261-9/+9
| | * Fix whitespaceOlaf Conradi2012-12-261-9/+9
* | | add keywords to zot-info profilefriendica2012-12-261-0/+10
* | | add important profile fields to zot-info if permitted - for directoryfriendica2012-12-262-13/+23
|/ /
* | remove the private keywords stuff to reduce directory and search complexityfriendica2012-12-2611-42/+34
* | include/follow cleanupfriendica2012-12-251-7/+5
* | prevent connecting to yourself or connecting to the same channel multiple timesfriendica2012-12-251-15/+40
|/
* Merge https://github.com/friendica/red into zpullfriendica2012-12-2514-632/+527
|\
| * Merge pull request #8 from oohlaf/fixesfriendica2012-12-251-2/+1
| |\
| | * Stringify groups before implodingOlaf Conradi2012-12-251-2/+1
| |/
| * Merge pull request #7 from beardy-unixer/masterThomas Willingham2012-12-2411-628/+524
| |\
| | * Un-make a mess of Redbasic CSS.Thomas Willingham2012-12-2511-628/+524
| * | Merge pull request #6 from oohlaf/themeThomas Willingham2012-12-242-2/+2
| |\ \
| | * | Forgot dir separatorOlaf Conradi2012-12-252-2/+2
| |/ /
| * | Merge pull request #5 from oohlaf/themeThomas Willingham2012-12-242-2/+2
| |\ \
| | * | Fix theme config pathsOlaf Conradi2012-12-252-2/+2
| |/ /
* / / allow toplevel domain redirects for zot-infofriendica2012-12-252-1/+12
|/ /
* | profile messages for directory synchronisationfriendica2012-12-222-1/+114
* | When is a channel not a person (or a group/forum or blog or product page or w...friendica2012-12-221-0/+1
* | add permission controls to "storage" objects such as attachments or other sto...friendica2012-12-227-5/+27
* | cleanup editpostfriendica2012-12-214-26/+15
* | directory structuresfriendica2012-12-214-6/+76
* | more DB cleanupfriendica2012-12-206-775/+12
* | mod_display - now barely functional but that's a lot better than being totall...friendica2012-12-201-43/+51
* | removing dfrn stufffriendica2012-12-205-2494/+1
* | Merge pull request #4 from beardy-unixer/masterfriendica2012-12-2031-0/+4287
|\|
| * Don't need these images anymore - we use opacity for shiny instead.Thomas Willingham2012-12-203-0/+0
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-2016-160/+249
| |\ | |/ |/|
* | wrong constantfriendica2012-12-202-3/+3
* | directory discoveryfriendica2012-12-201-0/+14
* | update README - it isn't completely horked anymore. Some stuff works. Some do...friendica2012-12-191-2/+3
* | some changes for directory servicesfriendica2012-12-194-4/+45
* | directory page still needs a lot of work, look up locally if local master or ...friendica2012-12-196-130/+157
* | add mod_profile_photo.cssfriendica2012-12-191-0/+12
* | get notification backend working againfriendica2012-12-191-1/+1
* | set_baseurl issue, more cleanupfriendica2012-12-196-22/+16
| * Make showmore irritating.Thomas Willingham2012-12-201-0/+24
| * But...git add *all* the files.Thomas Willingham2012-12-191-1/+1
| * Leave Mike's nav.tpl as the default, stick mine in the theme /tpl for now, at...Thomas Willingham2012-12-191-0/+111
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-1912-477/+109
| |\ | |/ |/|
* | send stuff to zothub as a fallback directory master for nowfriendica2012-12-183-18/+46
* | cleanup more obsolete stufffriendica2012-12-186-446/+13
* | modularise the notification popupsfriendica2012-12-185-11/+48
| * Ooops, made a shite of that - put redbasic back. Still need to put the mods ...Thomas Willingham2012-12-1811-0/+3872
| * FancyredThomas Willingham2012-12-1828-0/+4152
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-1816-3893/+70
| |\ | |/ |/|
* | several small fixes and adjustmentsfriendica2012-12-1610-25/+79
* | some cleanup - Thomas we can put the radius/shadow stuff back later for the h...friendica2012-12-167-20/+40