aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2014-06-243692-84893/+535272
|\
| * Merge pull request #503 from tuscanhobbit/masterRedMatrix2014-06-244-64/+74
| |\
| | * Oops I left some debug stuff aroundtuscanhobbit2014-06-242-6/+11
| | * Fixes to links and forward URLs in filestoragetuscanhobbit2014-06-244-64/+69
| |/
| * Doco - oops, forgot the indexThomas Willingham2014-06-241-1/+1
| * Doco - gnusocial doco from RandalThomas Willingham2014-06-242-0/+63
| * another one ticked offfriendica2014-06-232-4/+0
| * Merge pull request #501 from pixelroot/masterRedMatrix2014-06-242-1723/+1714
| |\
| | * modified: view/ru/messages.popixelroot2014-06-232-1723/+1714
| * | clean up the awful descriptive text on thing inputfriendica2014-06-232-4/+7
| * | move the reset of "in_progress" to after the page and structures have complet...friendica2014-06-231-1/+2
| * | block edit/delete ability for everybody but the ownerfriendica2014-06-231-7/+16
| * | Merge branch 'master' of https://github.com/tuscanhobbit/red into tuscanhobbi...friendica2014-06-231-27/+78
| |\ \
| | * | Dav file browser on a single pagetuscanhobbit2014-06-241-27/+78
| | |/
| * | ability to like thingsfriendica2014-06-239-12/+62
| * | language selector appfriendica2014-06-232-0/+3
| * | process profile like removals with normal low_level drop_itemfriendica2014-06-232-1/+10
| |/
| * profile likesfriendica2014-06-226-61/+229
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-06-224-1718/+1665
| |\
| | * Merge pull request #500 from tuscanhobbit/masterPaolo T2014-06-222-1669/+1661
| | |\
| | | * IT: strings updatedtuscanhobbit2014-06-222-1669/+1661
| | * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-06-2281-4074/+4430
| | |\ \
| | * | | Minor docoThomas Willingham2014-06-222-49/+4
| * | | | give the admin a link to view channels from the channel admin pagefriendica2014-06-221-1/+1
| * | | | when an admin censors a channel, we only need to notify the directory and not...friendica2014-06-222-6/+14
| * | | | honour the admin censored flag in the directory, and some slow progress on ex...friendica2014-06-225-61/+141
| | |/ / | |/| |
| * | | 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
| |\| |
| | * | Doco - update external resourcesThomas Willingham2014-06-181-3/+2
| * | | add photo count to photo album listfriendica2014-06-172-3/+6
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 20:25:00 +0000