aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/friendica/red into zpullfriendica2012-12-2818-282/+166
|\
| * Merge pull request #10 from beardy-unixer/masterfriendica2012-12-2718-282/+166
| |\
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-287-141/+177
| | |\
| | * | More fancyred progressThomas Willingham2012-12-281-44/+49
| | * | Move like wrapper. Keep template theme specific while, at least while it's s...Thomas Willingham2012-12-271-0/+117
| | * | Another diaspora templateThomas Willingham2012-12-271-3/+0
| | * | Pretty sure we don't need Diaspora templates.Thomas Willingham2012-12-2715-235/+0
* | | | bypass replace_macros and use template processor directly for theme includesfriendica2012-12-282-2/+4
|/ / /
* | / This was bloody hard to sort out.... but now it's sorted and we can move forw...friendica2012-12-277-16/+94
| |/ |/|
* | get rid of xtagfriendica2012-12-272-100/+14
* | put keywords back in xprof - too messy to search and join from a separate tablefriendica2012-12-273-2/+12
* | directory server json search modulefriendica2012-12-271-0/+116
* | will have to search tags/keywords another wayfriendica2012-12-261-4/+4
* | local search against the directory - need to convert this to client/server rolefriendica2012-12-261-38/+34
|/
* master/standalone directory profile updatefriendica2012-12-263-1/+53
* more progress on directory importfriendica2012-12-261-0/+118
* provide a default directory configuration (client)friendica2012-12-262-9/+16
* typo in mod_matchfriendica2012-12-261-1/+1
* Merge https://github.com/friendica/red into zpullfriendica2012-12-262-22/+34
|\
| * Merge pull request #9 from oohlaf/fixesfriendica2012-12-262-22/+34
| |\
| | * Tweak behavior of redirect for http codesOlaf Conradi2012-12-261-7/+6
| | * Same applies for 307Olaf Conradi2012-12-261-2/+3
| | * POST redirects to POST on 308 onlyOlaf Conradi2012-12-261-2/+10
| | * 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