Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2014-06-24 | 3692 | -84893/+535272 |
|\ | |||||
| * | Merge pull request #503 from tuscanhobbit/master | RedMatrix | 2014-06-24 | 4 | -64/+74 |
| |\ | | | | | | | Fixes to links and forward URLs in filestorage | ||||
| | * | Oops I left some debug stuff around | tuscanhobbit | 2014-06-24 | 2 | -6/+11 |
| | | | |||||
| | * | Fixes to links and forward URLs in filestorage | tuscanhobbit | 2014-06-24 | 4 | -64/+69 |
| |/ | |||||
| * | Doco - oops, forgot the index | Thomas Willingham | 2014-06-24 | 1 | -1/+1 |
| | | |||||
| * | Doco - gnusocial doco from Randal | Thomas Willingham | 2014-06-24 | 2 | -0/+63 |
| | | |||||
| * | another one ticked off | friendica | 2014-06-23 | 2 | -4/+0 |
| | | |||||
| * | Merge pull request #501 from pixelroot/master | RedMatrix | 2014-06-24 | 2 | -1723/+1714 |
| |\ | | | | | | | modified: view/ru/messages.po | ||||
| | * | modified: view/ru/messages.po | pixelroot | 2014-06-23 | 2 | -1723/+1714 |
| | | | | | | | | | | | | modified: view/ru/strings.php | ||||
| * | | clean up the awful descriptive text on thing input | friendica | 2014-06-23 | 2 | -4/+7 |
| | | | |||||
| * | | move the reset of "in_progress" to after the page and structures have ↵ | friendica | 2014-06-23 | 1 | -1/+2 |
| | | | | | | | | | | | | completed updating | ||||
| * | | block edit/delete ability for everybody but the owner | friendica | 2014-06-23 | 1 | -7/+16 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/tuscanhobbit/red into ↵ | friendica | 2014-06-23 | 1 | -27/+78 |
| |\ \ | | | | | | | | | | | | | tuscanhobbit-master | ||||
| | * | | Dav file browser on a single page | tuscanhobbit | 2014-06-24 | 1 | -27/+78 |
| | |/ | |||||
| * | | ability to like things | friendica | 2014-06-23 | 9 | -12/+62 |
| | | | |||||
| * | | language selector app | friendica | 2014-06-23 | 2 | -0/+3 |
| | | | |||||
| * | | process profile like removals with normal low_level drop_item | friendica | 2014-06-23 | 2 | -1/+10 |
| |/ | |||||
| * | profile likes | friendica | 2014-06-22 | 6 | -61/+229 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-22 | 4 | -1718/+1665 |
| |\ | |||||
| | * | Merge pull request #500 from tuscanhobbit/master | Paolo T | 2014-06-22 | 2 | -1669/+1661 |
| | |\ | | | | | | | | | IT: strings updated | ||||
| | | * | IT: strings updated | tuscanhobbit | 2014-06-22 | 2 | -1669/+1661 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-06-22 | 81 | -4074/+4430 |
| | |\ \ | |||||
| | * | | | Minor doco | Thomas Willingham | 2014-06-22 | 2 | -49/+4 |
| | | | | | |||||
| * | | | | give the admin a link to view channels from the channel admin page | friendica | 2014-06-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | when an admin censors a channel, we only need to notify the directory and ↵ | friendica | 2014-06-22 | 2 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | not all the connections. | ||||
| * | | | | honour the admin censored flag in the directory, and some slow progress on ↵ | friendica | 2014-06-22 | 5 | -61/+141 |
| | |/ / | |/| | | | | | | | | | | extended likes | ||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-22 | 2 | -14/+27 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #499 from dawnbreak/master | RedMatrix | 2014-06-22 | 2 | -14/+27 |
| | |\ \ \ | | | | | | | | | | | | | Add HTML5 datalist to edit photo album field. | ||||
| | | * | | | Add HTML5 datalist to edit photo album field. | Klaus Weidenbach | 2014-06-22 | 2 | -14/+27 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a datalist for the edit photo album field. This makes it easier to move a picture to another existing folder in the way that it provides a list of all available albums as values for the album field. | ||||
| * / / / | likes table for liking things besides posts and comments | friendica | 2014-06-22 | 4 | -3/+41 |
| |/ / / | |||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-21 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * | | | correct a tiny syntax error | Klaus | 2014-06-22 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | there was a space missing between two values | ||||
| * | | | | moods not working in other languages + doc updates | friendica | 2014-06-21 | 51 | -3789/+4098 |
| | | | | | |||||
| * | | | | limited progress in providing a POST option to shredder, back to auth ↵ | friendica | 2014-06-19 | 2 | -26/+42 |
| |/ / / | | | | | | | | | | | | | signature mismatches again, likely a quoting issue | ||||
| * | | | fix space around brackets changing. | friendica | 2014-06-19 | 2 | -6/+14 |
| | | | | |||||
| * | | | cleanup | friendica | 2014-06-19 | 4 | -19/+4 |
| | | | | |||||
| * | | | Merge pull request #498 from solstag/perms_pending | RedMatrix | 2014-06-20 | 7 | -115/+132 |
| |\ \ \ | | | | | | | | | | | Implements a new permission level PERMS_PENDING | ||||
| | * | | | Implements a new permission level PERMS_PENDING | Alexandre Hannud Abdo | 2014-06-19 | 7 | -115/+132 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel. | ||||
| * | | | wherein I revive some of my 30+year old shell scripting skills so that we ↵ | friendica | 2014-06-18 | 2 | -5/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can process arbitrary api endpoints which generate arbitrary json and be able to crunch all of these on the command line. Getting the arbitrary query arguments into a form where they could be signed as part of the oauth packet was a challenge. (It still might be - I haven't tried querying any Chinese photo album names yet). But you can now do something like for a in `util/shredder/shredder -c red/photos -q album=2013 | jshon -e photos -a -e src` ; do wget $a; done and download all the photos in your 2013 album | ||||
| * | | | put viewsrc back in a lightbox | friendica | 2014-06-18 | 2 | -3/+4 |
| | | | | |||||
| * | | | stylistic improvements to the suggestions page | friendica | 2014-06-18 | 2 | -10/+13 |
| | | | | |||||
| * | | | reset timestamps when unarchiving a connection | friendica | 2014-06-18 | 1 | -0/+13 |
| | | | | |||||
| * | | | You'll need these to build jshon - warning these are typically blocked by ↵ | friendica | 2014-06-18 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | .gitignore | ||||
| * | | | Turns out Linux has a shred command in /usr/bin and its purpose is to ↵ | friendica | 2014-06-18 | 4 | -1/+2 |
| | | | | | | | | | | | | | | | | over-write files so we don't want to invoke it accidentally. So as not to cause confusion and issues we will rename ours to "shredder". Aussies are of course allowed to alias this to "shredda". | ||||
| * | | | oh this is nice... http://kmkeen.com/jshon - this is what we need to make ↵ | friendica | 2014-06-18 | 4 | -12/+17 |
| | | | | | | | | | | | | | | | | shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files. | ||||
| * | | | now we should be able to remove the function check. Revert if live updates ↵ | friendica | 2014-06-18 | 2 | -28/+8 |
| | | | | | | | | | | | | | | | | or page loads go weird. I've tested, but it went weird on me last time I tried this a week or so ago so I'm crossing fingers. | ||||
| * | | | get rid of some old crap | friendica | 2014-06-17 | 1 | -57/+4 |
| | | | | |||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-17 | 1 | -3/+2 |
| |\| | | |||||
| | * | | Doco - update external resources | Thomas Willingham | 2014-06-18 | 1 | -3/+2 |
| | | | | |||||
| * | | | add photo count to photo album list | friendica | 2014-06-17 | 2 | -3/+6 |
| |/ / |