| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | Merge pull request #278 from zzottel/master | friendica | 2014-01-21 | 1 | -1/+1 |
| |\ |
|
| | * | added feed2red.pl | zottel | 2014-01-21 | 1 | -1/+1 |
* | | | fix the admin interface to pending registrations | friendica | 2014-01-21 | 3 | -6/+5 |
|/ / |
|
* | | sql error | friendica | 2014-01-21 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-21 | 3 | -1/+12 |
|\ \ |
|
| * \ | Merge pull request #277 from git-marijus/master | friendica | 2014-01-20 | 1 | -1/+1 |
| |\ \
| | |/
| |/| |
|
| | * | lighttpd sample conf update | marijus | 2014-01-21 | 1 | -1/+1 |
| |/ |
|
| * | Nginx conf update | Thomas Willingham | 2014-01-21 | 1 | -0/+8 |
| * | Debian install script doco | Thomas Willingham | 2014-01-21 | 1 | -0/+3 |
* | | move some store things | friendica | 2014-01-21 | 4 | -3/+9 |
* | | create store directory if it's missing before initialising DAV | friendica | 2014-01-21 | 1 | -1/+4 |
|/ |
|
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-20 | 1 | -0/+1 |
|\ |
|
| * | Add BBCode extensions to doco | Thomas Willingham | 2014-01-20 | 1 | -0/+1 |
* | | when loading a single thread on the channel page, tell JS that there isn't an... | friendica | 2014-01-20 | 1 | -2/+6 |
|/ |
|
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-20 | 3 | -3/+8 |
|\ |
|
| * | Merge pull request #276 from MicMee/master | friendica | 2014-01-20 | 1 | -2/+3 |
| |\ |
|
| | * | no need to have a doule hublocid | Michael Meer | 2014-01-20 | 1 | -2/+3 |
| * | | Merge pull request #275 from MicMee/master | friendica | 2014-01-20 | 3 | -3/+7 |
| |\| |
|
| | * | added buttons to perform later hubloc actions | Michael Meer | 2014-01-20 | 3 | -3/+7 |
* | | | Add external resource list so this stuff doesn't get lost. Please update it i... | friendica | 2014-01-20 | 2 | -1/+23 |
|/ / |
|
* / | transifex didn't like plural-forms and now they don't like it commented out. ... | friendica | 2014-01-20 | 2 | -225/+220 |
|/ |
|
* | zidify audio/video links | friendica | 2014-01-20 | 1 | -7/+14 |
* | catch auth exceptions | friendica | 2014-01-20 | 2 | -3/+8 |
* | bring photo tagging back which hasn't worked since forking from Friendica - t... | friendica | 2014-01-19 | 2 | -184/+53 |
* | revert 26dfcecf054e1 | friendica | 2014-01-19 | 1 | -6/+2 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-19 | 2 | -3/+7 |
|\ |
|
| * | Prevent zids messing up dav | Thomas Willingham | 2014-01-20 | 1 | -3/+5 |
| * | Fix dav directory creation. | Thomas Willingham | 2014-01-20 | 1 | -2/+3 |
| * | Stop Google DDoSing me by providing block_public_search, which unlike | Thomas Willingham | 2014-01-19 | 1 | -3/+4 |
* | | strip zid= from REQUEST_URI as well as QUERY_STRING - sabre uses both | friendica | 2014-01-19 | 1 | -0/+3 |
|/ |
|
* | don't allow the demo upload server to operate - otherwise one could find them... | friendica | 2014-01-19 | 1 | -0/+4 |
* | add the jquery file uploader. Have been suggesting this as a replacement for ... | friendica | 2014-01-19 | 57 | -1/+10170 |
* | add ajaxchat library - needs a lot of integration work to handle decentralisa... | friendica | 2014-01-18 | 197 | -0/+24150 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-18 | 6 | -5/+25 |
|\ |
|
| * | vcard widget needs to include Contact if it's not included from the module th... | Thomas Willingham | 2014-01-18 | 1 | -0/+1 |
| * | Doco - s/chown/chmod | Thomas Willingham | 2014-01-18 | 1 | -2/+2 |
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-01-17 | 1 | -0/+9 |
| |\ |
|
| | * | Merge pull request #274 from zzottel/master | friendica | 2014-01-17 | 1 | -0/+9 |
| | |\ |
|
| | | * | set jsAvailable cookie expire time to match PHPSESSID's | zottel | 2014-01-17 | 1 | -0/+9 |
| * | | | Missed these from git add...a year ago | Thomas Willingham | 2014-01-17 | 2 | -0/+9 |
| |/ / |
|
| * / | Un-break dav auth. | Thomas Willingham | 2014-01-17 | 1 | -3/+4 |
| |/ |
|
* / | some more bookmark infrastructure plus a doc update | friendica | 2014-01-18 | 37 | -553/+690 |
|/ |
|
* | kill the ummagumma effect | friendica | 2014-01-16 | 2 | -3/+5 |
* | Merge pull request #273 from zzottel/master | friendica | 2014-01-16 | 1 | -1/+5 |
|\ |
|
| * | prevent reload loop if JS is active, but no cookies accepted | zottel | 2014-01-16 | 1 | -1/+5 |
|/ |
|
* | Update messages.po | fabrixxm | 2014-01-16 | 1 | -1/+0 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-16 | 3 | -296/+3 |
|\ |
|
| * | Remove deprecated CSS - there is a dark schema now, and shadows and stuff are... | Thomas Willingham | 2014-01-16 | 2 | -293/+0 |
| * | Tweak "typical" perms macro | Thomas Willingham | 2014-01-16 | 1 | -3/+3 |
* | | prevent zid's from reaching the DAV core code. | friendica | 2014-01-16 | 3 | -2/+5 |
|/ |
|