Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | More whitespace fixes | Olaf Conradi | 2012-12-26 | 1 | -9/+9 | |
| | | | ||||||
| | * | Fix whitespace | Olaf Conradi | 2012-12-26 | 1 | -9/+9 | |
| | | | ||||||
* | | | add keywords to zot-info profile | friendica | 2012-12-26 | 1 | -0/+10 | |
| | | | ||||||
* | | | add important profile fields to zot-info if permitted - for directory | friendica | 2012-12-26 | 2 | -13/+23 | |
|/ / | ||||||
* | | remove the private keywords stuff to reduce directory and search complexity | friendica | 2012-12-26 | 11 | -42/+34 | |
| | | ||||||
* | | include/follow cleanup | friendica | 2012-12-25 | 1 | -7/+5 | |
| | | ||||||
* | | prevent connecting to yourself or connecting to the same channel multiple times | friendica | 2012-12-25 | 1 | -15/+40 | |
|/ | ||||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2012-12-25 | 14 | -632/+527 | |
|\ | ||||||
| * | Merge pull request #8 from oohlaf/fixes | friendica | 2012-12-25 | 1 | -2/+1 | |
| |\ | | | | | | | Stringify groups before imploding | |||||
| | * | Stringify groups before imploding | Olaf Conradi | 2012-12-25 | 1 | -2/+1 | |
| |/ | ||||||
| * | Merge pull request #7 from beardy-unixer/master | Thomas Willingham | 2012-12-24 | 11 | -628/+524 | |
| |\ | | | | | | | Un-mess up the Redbasic CSS | |||||
| | * | Un-make a mess of Redbasic CSS. | Thomas Willingham | 2012-12-25 | 11 | -628/+524 | |
| | | | ||||||
| * | | Merge pull request #6 from oohlaf/theme | Thomas Willingham | 2012-12-24 | 2 | -2/+2 | |
| |\ \ | | | | | | | | | Forgot dir separator | |||||
| | * | | Forgot dir separator | Olaf Conradi | 2012-12-25 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #5 from oohlaf/theme | Thomas Willingham | 2012-12-24 | 2 | -2/+2 | |
| |\ \ | | | | | | | | | Fix theme config paths | |||||
| | * | | Fix theme config paths | Olaf Conradi | 2012-12-25 | 2 | -2/+2 | |
| |/ / | ||||||
* / / | allow toplevel domain redirects for zot-info | friendica | 2012-12-25 | 2 | -1/+12 | |
|/ / | ||||||
* | | profile messages for directory synchronisation | friendica | 2012-12-22 | 2 | -1/+114 | |
| | | ||||||
* | | When is a channel not a person (or a group/forum or blog or product page or ↵ | friendica | 2012-12-22 | 1 | -0/+1 | |
| | | | | | | | | whatever)? When it's something else completely. | |||||
* | | add permission controls to "storage" objects such as attachments or other ↵ | friendica | 2012-12-22 | 7 | -5/+27 | |
| | | | | | | | | stored files | |||||
* | | cleanup editpost | friendica | 2012-12-21 | 4 | -26/+15 | |
| | | ||||||
* | | directory structures | friendica | 2012-12-21 | 4 | -6/+76 | |
| | | ||||||
* | | more DB cleanup | friendica | 2012-12-20 | 6 | -775/+12 | |
| | | ||||||
* | | mod_display - now barely functional but that's a lot better than being ↵ | friendica | 2012-12-20 | 1 | -43/+51 | |
| | | | | | | | | totally buggered. | |||||
* | | removing dfrn stuff | friendica | 2012-12-20 | 5 | -2494/+1 | |
| | | ||||||
* | | Merge pull request #4 from beardy-unixer/master | friendica | 2012-12-20 | 31 | -0/+4287 | |
|\| | | | | | Fancyred | |||||
| * | Don't need these images anymore - we use opacity for shiny instead. | Thomas Willingham | 2012-12-20 | 3 | -0/+0 | |
| | | ||||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-20 | 16 | -160/+249 | |
| |\ | |/ |/| | ||||||
* | | wrong constant | friendica | 2012-12-20 | 2 | -3/+3 | |
| | | ||||||
* | | directory discovery | friendica | 2012-12-20 | 1 | -0/+14 | |
| | | ||||||
* | | update README - it isn't completely horked anymore. Some stuff works. Some ↵ | friendica | 2012-12-19 | 1 | -2/+3 | |
| | | | | | | | | doesn't. | |||||
* | | some changes for directory services | friendica | 2012-12-19 | 4 | -4/+45 | |
| | | ||||||
* | | directory page still needs a lot of work, look up locally if local master or ↵ | friendica | 2012-12-19 | 6 | -130/+157 | |
| | | | | | | | | standalone, need to put some basic profile info in discovery page and direct to local directory master | |||||
* | | add mod_profile_photo.css | friendica | 2012-12-19 | 1 | -0/+12 | |
| | | ||||||
* | | get notification backend working again | friendica | 2012-12-19 | 1 | -1/+1 | |
| | | ||||||
* | | set_baseurl issue, more cleanup | friendica | 2012-12-19 | 6 | -22/+16 | |
| | | ||||||
| * | Make showmore irritating. | Thomas Willingham | 2012-12-20 | 1 | -0/+24 | |
| | | ||||||
| * | But...git add *all* the files. | Thomas Willingham | 2012-12-19 | 1 | -1/+1 | |
| | | ||||||
| * | Leave Mike's nav.tpl as the default, stick mine in the theme /tpl for now, ↵ | Thomas Willingham | 2012-12-19 | 1 | -0/+111 | |
| | | | | | | | | at least. | |||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-19 | 12 | -477/+109 | |
| |\ | |/ |/| | | | | | Conflicts: view/tpl/nav.tpl | |||||
* | | send stuff to zothub as a fallback directory master for now | friendica | 2012-12-18 | 3 | -18/+46 | |
| | | ||||||
* | | cleanup more obsolete stuff | friendica | 2012-12-18 | 6 | -446/+13 | |
| | | ||||||
* | | modularise the notification popups | friendica | 2012-12-18 | 5 | -11/+48 | |
| | | ||||||
| * | Ooops, made a shite of that - put redbasic back. Still need to put the mods ↵ | Thomas Willingham | 2012-12-18 | 11 | -0/+3872 | |
| | | | | | | | | back. | |||||
| * | Fancyred | Thomas Willingham | 2012-12-18 | 28 | -0/+4152 | |
| | | ||||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-18 | 16 | -3893/+70 | |
| |\ | |/ |/| | | | | | Conflicts: view/theme/redbasic/css/style.css | |||||
* | | several small fixes and adjustments | friendica | 2012-12-16 | 10 | -25/+79 | |
| | | ||||||
* | | some cleanup - Thomas we can put the radius/shadow stuff back later for the ↵ | friendica | 2012-12-16 | 7 | -20/+40 | |
| | | | | | | | | hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting. | |||||
| * | More plodding along with redbasic, notably, adding some icons. | Thomas Willingham | 2012-12-17 | 6 | -27/+65 | |
| | | ||||||
| * | Unplug the lifesupport, the background snake is dead. | Thomas Willingham | 2012-12-17 | 1 | -0/+0 | |
| | |