aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #500 from tuscanhobbit/masterPaolo T2014-06-222-1669/+1661
|\ | | | | IT: strings updated
| * IT: strings updatedtuscanhobbit2014-06-222-1669/+1661
| |
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-06-2281-4074/+4430
|\ \
| * \ Merge https://github.com/friendica/red into pending_mergefriendica2014-06-222-14/+27
| |\ \
| | * \ Merge pull request #499 from dawnbreak/masterRedMatrix2014-06-222-14/+27
| | |\ \ | | | | | | | | | | Add HTML5 datalist to edit photo album field.
| | | * | Add HTML5 datalist to edit photo album field.Klaus Weidenbach2014-06-222-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 commentsfriendica2014-06-224-3/+41
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-211-3/+1
| |\ \
| | * | correct a tiny syntax errorKlaus2014-06-221-3/+1
| | | | | | | | | | | | there was a space missing between two values
| * | | moods not working in other languages + doc updatesfriendica2014-06-2151-3789/+4098
| | | |
| * | | limited progress in providing a POST option to shredder, back to auth ↵friendica2014-06-192-26/+42
| |/ / | | | | | | | | | signature mismatches again, likely a quoting issue
| * | fix space around brackets changing.friendica2014-06-192-6/+14
| | |
| * | cleanupfriendica2014-06-194-19/+4
| | |
| * | Merge pull request #498 from solstag/perms_pendingRedMatrix2014-06-207-115/+132
| |\ \ | | | | | | | | Implements a new permission level PERMS_PENDING
| | * | Implements a new permission level PERMS_PENDINGAlexandre Hannud Abdo2014-06-197-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 ↵friendica2014-06-182-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 lightboxfriendica2014-06-182-3/+4
| | |
| * | stylistic improvements to the suggestions pagefriendica2014-06-182-10/+13
| | |
| * | reset timestamps when unarchiving a connectionfriendica2014-06-181-0/+13
| | |
| * | You'll need these to build jshon - warning these are typically blocked by ↵friendica2014-06-182-0/+0
| | | | | | | | | | | | .gitignore
| * | Turns out Linux has a shred command in /usr/bin and its purpose is to ↵friendica2014-06-184-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 ↵friendica2014-06-184-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 ↵friendica2014-06-182-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 crapfriendica2014-06-171-57/+4
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-171-3/+2
| |\ \
| * | | add photo count to photo album listfriendica2014-06-172-3/+6
| | | |
* | | | Minor docoThomas Willingham2014-06-222-49/+4
| |/ / |/| |
* | | Doco - update external resourcesThomas Willingham2014-06-181-3/+2
|/ /
* | access control modification functions (item specific - we may need these for ↵friendica2014-06-172-0/+36
| | | | | | | | several data types)
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-175-0/+1
|\ \
| * | Images resized to 330pxfor consistencyjeroenpraat2014-06-174-0/+0
| | |
| * | Merge pull request #497 from git-marijus/masterRedMatrix2014-06-171-0/+1
| |\ \ | | | | | | | | make maximum load average setting work again
| | * | make maximum load average setting work againmarijus2014-06-161-0/+1
| | | |
* | | | note work still remainingfriendica2014-06-171-0/+1
| | | |
* | | | sync profiles to nomadic clonesfriendica2014-06-173-2/+50
|/ / /
* | | more tweaksfriendica2014-06-161-1/+1
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-167-109/+54
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-163-208/+20
| |\ \ \
| * | | | Update nl / Dark schema: Some minor, but important fixesjeroenpraat2014-06-167-109/+54
| | | | |
* | | | | consistencyfriendica2014-06-161-2/+1
| |/ / / |/| | |
* | | | project homepage tweaksfriendica2014-06-163-208/+20
|/ / /
* | | Merge pull request #496 from tonybaldwin/masterRedMatrix2014-06-171-1/+1
|\ \ \ | |/ / |/| | added QR code instruction
| * | added QR code instructiontony baldwin2014-06-161-1/+1
| | |
* | | adjust expand/collapse speed to match jquery defaultmarijus2014-06-161-1/+1
| | |
* | | animate show/hide commentsmarijus2014-06-161-2/+2
| | |
* | | Cleaned out/updated images dir. So that we don't mix the old colour red with ↵jeroenpraat2014-06-169-3658/+3481
| | | | | | | | | | | | the new colour with. / Updated util/messages.po
* | | update nljeroenpraat2014-06-162-4/+4
| | |
* | | Hashlogo the same size as before (width 450px was still in home.html). Added ↵jeroenpraat2014-06-164-0/+132
|/ / | | | | | | svg and light text version for dark backgrount)
* | add assetsfriendica2014-06-163-0/+195
| |
* | remove overflow property on bannerfriendica2014-06-162-2/+2
| |