Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | missing filename in uploaded photos (we don't really use this, but we will ↵ | friendica | 2014-01-22 | 2 | -1/+2 |
| | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice). | ||||
* | fix api/red/photos when supplied with an album name | friendica | 2014-01-22 | 1 | -1/+1 |
| | |||||
* | API: provide a link to photo albums in api/red/albums | friendica | 2014-01-22 | 1 | -1/+5 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-22 | 2 | -7/+10 |
|\ | |||||
| * | Merge pull request #279 from git-marijus/master | friendica | 2014-01-22 | 2 | -5/+5 |
| |\ | | | | | | | make network tabs regard selected group (collection) and vice versa | ||||
| | * | update argument ?f= | marijus | 2014-01-22 | 1 | -2/+2 |
| | | | |||||
| | * | make network tabs regard selected group (collection) and vice versa | marijus | 2014-01-22 | 2 | -4/+4 |
| | | | |||||
| * | | Merge pull request #280 from beardy-unixer/master | friendica | 2014-01-22 | 1 | -2/+5 |
| |\ \ | | |/ | |/| | Give pages enough to construct a share button. | ||||
| | * | Give pages enough to construct a share button. | Thomas Willingham | 2014-01-22 | 1 | -2/+5 |
| |/ | |||||
* / | try to reduce the number of simulaneous deliveries of the same post when ↵ | friendica | 2014-01-22 | 2 | -15/+42 |
|/ | | | | dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. | ||||
* | simplify chanview authentication and make sure it carries through multiple ↵ | friendica | 2014-01-22 | 2 | -9/+5 |
| | | | | generations | ||||
* | remove debugging | friendica | 2014-01-21 | 1 | -1/+0 |
| | |||||
* | fix location of string file in Translations.md, fix some permissions and ↵ | friendica | 2014-01-21 | 3 | -18/+28 |
| | | | | owner vagueness (potential bugs) in profile_tabs() | ||||
* | seems you can't easily have a blank password for DAV guests, so the guest ↵ | friendica | 2014-01-21 | 2 | -2/+10 |
| | | | | password is now +++ | ||||
* | text - change remove account button to remove channel | friendica | 2014-01-21 | 1 | -1/+1 |
| | |||||
* | add primary webbie to directory popup | friendica | 2014-01-21 | 3 | -0/+6 |
| | |||||
* | push new messages.po | friendica | 2014-01-21 | 2 | -86/+84 |
| | |||||
* | add the quota and volume size code | friendica | 2014-01-21 | 1 | -1/+29 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-21 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #278 from zzottel/master | friendica | 2014-01-21 | 1 | -1/+1 |
| |\ | | | | | | | added feed2red.pl | ||||
| | * | 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 | ||||
| | * | 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 ↵ | friendica | 2014-01-20 | 1 | -2/+6 |
|/ | | | | any more content to load. | ||||
* | 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 | ||||
| | * | 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 | ||||
| | * | 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 ↵ | friendica | 2014-01-20 | 2 | -1/+23 |
|/ / | | | | | | | if you know of other related projects. | ||||
* / | transifex didn't like plural-forms and now they don't like it commented out. ↵ | friendica | 2014-01-20 | 2 | -225/+220 |
|/ | | | | So we'll try uncommenting the sucker and see if they like it again. | ||||
* | 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 - ↵ | friendica | 2014-01-19 | 2 | -184/+53 |
| | | | | this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh. | ||||
* | 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 |
| | | | | | | | | block_public will block *only* searching without an observer. | ||||
* | | 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 ↵ | friendica | 2014-01-19 | 1 | -0/+4 |
| | | | | themselves with a bunch of unwanted uploads |