aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Doco - update external resourcesThomas Willingham2014-06-181-3/+2
| |
* | add photo count to photo album listfriendica2014-06-172-3/+6
|/
* 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
|
* document why this worksfriendica2014-06-151-0/+3
|
* sort out the unobscure messfriendica2014-06-153-2/+5
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-156-5534/+5749
|\
| * Merge pull request #495 from tuscanhobbit/masterPaolo T2014-06-152-5526/+5730
| |\ | | | | | | IT: updated strings
| | * IT: updated stringstuscanhobbit2014-06-152-5526/+5730
| | |
| * | move hide-comments to center and change its appearence a littlemarijus2014-06-154-8/+19
| | |
* | | issues with editing webpage permissionsfriendica2014-06-153-7/+15
|/ /
* | ensure item_private tracks acl fields on editfriendica2014-06-152-2/+11
| |
* | only show jotnets when posting conversation itemsfriendica2014-06-1413-17/+22
| |
* | webpage permissions weirdnessfriendica2014-06-142-15/+22
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-145-22/+21
|\ \
| * \ Merge pull request #494 from git-marijus/masterRedMatrix2014-06-155-22/+21
| |\ \ | | | | | | | | unclutter menus a little
| | * | no need to have this twicemarijus2014-06-141-1/+0
| | | |
| | * | fix active statemarijus2014-06-141-0/+1
| | | |
| | * | whitespacemarijus2014-06-142-3/+0
| | | |
| | * | unclutter menues a littlemarijus2014-06-143-21/+23
| |/ /
| * | Merge pull request #491 from pixelroot/masterRedMatrix2014-06-142-2/+2
| |\ \ | | | | | | | | modified: view/ru/messages.po
| * \ \ Merge pull request #489 from pixelroot/masterRedMatrix2014-06-142-3/+3
| |\ \ \ | | | | | | | | | | modified: view/ru/messages.po
* | | | | rev updatefriendica2014-06-141-1/+1
| | | | |
* | | | | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-masterfriendica2014-06-142-7/+8
|\ \ \ \ \ | |/ / / / |/| | | |