aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #596 from beardy-unixer/masterRedMatrix2014-09-193-3/+16
|\
| * Catch the settings tooThomas Willingham2014-09-181-1/+1
| * If a short ping causes lots of issues, and anyone who has been hereThomas Willingham2014-09-181-2/+2
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-1840-198/+5619
| |\ | |/ |/|
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-188-11/+71
|\ \
| * | keep the language consistentfriendica2014-09-171-1/+1
| * | typofriendica2014-09-171-1/+1
| * | use 24-hour clock for non-American datesfriendica2014-09-171-0/+2
| * | forgot this one...friendica2014-09-171-0/+2
| * | usability tweaksfriendica2014-09-172-2/+15
| * | add a spinner or two to the new channel page so folks have a clue that we're ...friendica2014-09-172-0/+6
| * | channel permission rolesfriendica2014-09-175-9/+46
* | | Doco - permissions needs some work, but this is a relative whopper.Thomas Willingham2014-09-181-1/+1
|/ /
* | defined several permission roles - these will probably require some review an...friendica2014-09-171-0/+245
* | make the output a bit more readablefriendica2014-09-171-2/+2
* | let the xchan diagnostic accept a webbiefriendica2014-09-171-14/+14
* | implement permission roles - the backend should be done except for maybe a co...friendica2014-09-177-16/+122
* | no sense maintaining 2 to-do files. I think the one I'm removing is reference...friendica2014-09-162-83/+0
* | Merge pull request #595 from solstag/masterRedMatrix2014-09-172-2/+2
|\ \
| * | Fix name attribute of button elements so jquery '.submit()' doesn't breakAlexandre Hannud Abdo2014-09-162-2/+2
* | | that's why bb2diaspora_itemwallwall() wasn't doing its thang.friendica2014-09-161-3/+3
* | | still some old Friendica database queries in diaspora_signed_retractionfriendica2014-09-161-17/+15
* | | z_post_url_json() added to easily deal with JSON post APIs; without getting c...friendica2014-09-161-0/+17
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-161-2/+2
|\| |
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-161-9/+4
| |\ \
| * | | this still has less issuesmarijus2014-09-161-2/+2
* | | | just mark dead hubloc deleted - don't remove them. This could cause problems....friendica2014-09-163-13/+9
| |/ / |/| |
* | | when importing channels - use the new location notification message to tell y...friendica2014-09-161-9/+4
|/ /
* | use the more portable encoded_item format for exported items - but with added...friendica2014-09-163-16/+32
* | push individual block to directoryfriendica2014-09-151-0/+1
* | fat finger - must have been here a whilefriendica2014-09-151-1/+1
* | change platform name to redmatrix (lowercase, one word) for use in meta tags ...friendica2014-09-156-1/+4949
* | channel export with itemsfriendica2014-09-154-7/+47
* | additions and edits to the faqfriendica2014-09-151-5/+8
* | couple of edits to make this more currentfriendica2014-09-151-7/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-152-2/+2
|\ \
| * | Trivial typo - concatenated string that should be. Doesn't reallyThomas Willingham2014-09-162-2/+2
* | | honour service class restrictions for total_identities, total_channels ("frie...friendica2014-09-153-5/+87
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-152-8/+20
|\ \
* | | final piece of the mrjive delivery puzzle, and now we've got most all the too...friendica2014-09-151-3/+6
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-151-2/+2
|\ \ \
* | | | rev updatefriendica2014-09-151-1/+1
| | | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-1510-25/+103
| | | |\ | | | |/ | | |/|
| | * | See comments on commit 5ab85b0. Also fixed some bb typo's in docu index.Jeroen2014-09-152-8/+20
| |/ /
| * / heading font-size should not be tied to font-size for posts and commentsmarijus2014-09-151-2/+2
|/ /
* | this is probably better in most casesmarijus2014-09-151-1/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-140-0/+0
|\ \
* | | allow the site to designate an admin channel that's visible to the outside wo...friendica2014-09-142-2/+9
* | | provide a way to sync locations and get rid of bogus hublocs, now implementedfriendica2014-09-145-14/+73
| | * Very, very cautiously let a developer switch to the sys chan ifThomas Willingham2014-09-151-0/+13
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 07:19:19 +0000