aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.Klaus Weidenbach2014-06-222-14/+27
| | |/
| * / 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
| * | moods not working in other languages + doc updatesfriendica2014-06-2151-3789/+4098
| * | limited progress in providing a POST option to shredder, back to auth signatu...friendica2014-06-192-26/+42
| |/
| * 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_PENDINGAlexandre Hannud Abdo2014-06-197-115/+132
| |/
| * wherein I revive some of my 30+year old shell scripting skills so that we can...friendica2014-06-182-5/+24
| * 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 .gi...friendica2014-06-182-0/+0
| * Turns out Linux has a shred command in /usr/bin and its purpose is to over-wr...friendica2014-06-184-1/+2
| * oh this is nice... http://kmkeen.com/jshon - this is what we need to make shr...friendica2014-06-184-12/+17
| * now we should be able to remove the function check. Revert if live updates or...friendica2014-06-182-28/+8
| * 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
* 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 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 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
* | 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
|/
* 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