aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | doing something in the background - trying to complete the nick field for them (and then check it before they submit).
| | * 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 ↵friendica2014-09-171-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox
| * 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 ↵friendica2014-09-177-16/+122
| | | | | | | | couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone.
| * no sense maintaining 2 to-do files. I think the one I'm removing is ↵friendica2014-09-162-83/+0
| | | | | | | | referenced online somewhere - which is why it wasn't done earlier. Can't find it, so just note that somebody will complain and we'll have to edit the pointer someday.
| * Merge pull request #595 from solstag/masterRedMatrix2014-09-172-2/+2
| |\ | | | | | | Fix name attribute of button elements so jquery '.submit()' doesn't brea...
| | * Fix name attribute of button elements so jquery '.submit()' doesn't breakAlexandre Hannud Abdo2014-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | According to "Additional notes" in: http://api.jquery.com/submit/ Not fixing buttons created with 'input' tags.
| * | 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 ↵friendica2014-09-161-0/+17
| | | | | | | | | | | | content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers.
| * | 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 ↵friendica2014-09-163-13/+9
| | |/ | |/| | | | | | | problems. Also clean up fetch_url/post_url header option
| * | when importing channels - use the new location notification message to tell ↵friendica2014-09-161-9/+4
| |/ | | | | | | your original site where it sits in terms of primary.
| * use the more portable encoded_item format for exported items - but with ↵friendica2014-09-163-16/+32
| | | | | | | | added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this.
| * 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
| | | | | | | | and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do.
| * 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
| | | | | | | | | | | | | | | deserve it's own commit, but if I don't fix it now, nobody will notice for another18 months.
| * | honour service class restrictions for total_identities, total_channels ↵friendica2014-09-153-5/+87
| |/ | | | | | | ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
| * 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 ↵friendica2014-09-151-3/+6
| | | | | | | | | | | | tools to implement mod_hubman
| * | 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 ↵friendica2014-09-142-2/+9
| | | | | | | | | | | | world (via siteinfo/json). Otherwise we'll use the default channel of any accounts that have the account admin role.
| * | 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
| |/ |/| | | | | they're also an administrator.
* | Bugger, revert - not only a dodgy cut and paste between terminals, butThomas Willingham2014-09-151-14/+0
| | | | | | | | also pushed to the wrong repo
* | Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
|/ | | | they're also an admin.
* that won't work...friendica2014-09-141-1/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 18:44:40 +0000