aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into neweventfriendica2014-05-29236-19655/+23763
|\ | | | | | | | | Conflicts: include/zot.php
| * this is an important bit - only mark dead hubs on directory servers. They ↵friendica2014-05-292-1/+5
| | | | | | | | shouldn't matter anywhere else.
| * cleanup dead directory entries. This was a real b#tch, so keep your eye out ↵friendica2014-05-285-19/+109
| | | | | | | | for issues - which you shouldn't see until next weekend when this is scheduled to run. We're only setting flags, so if anything goes wrong we should be able to recover without too much pain.
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-05-282-1/+2
| |\
| | * Merge pull request #474 from solstag/masterRedMatrix2014-05-292-1/+2
| | |\ | | | | | | | | fix links to doco regarding translation
| | | * fix links to doco regarding translationAlexandre Hannud Abdo2014-05-282-1/+2
| | |/
| * / moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is ↵friendica2014-05-283-10/+3
| |/ | | | | | | possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'.
| * logging: include target url when reporting z_fetch_url and z_post_url errors.friendica2014-05-271-4/+4
| |
| * added note about the chunked-encoding fiasco.friendica2014-05-271-0/+5
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-05-273-26/+8
| |\
| | * some fixes and cleanupmarijus2014-05-273-26/+8
| | |
| * | give the cloud file list a bit of paddingfriendica2014-05-274-24/+29
| |/
| * Still a bit of work on remote app install, but we can check that one off the ↵friendica2014-05-262-4/+0
| | | | | | | | list.
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-05-266-10/+11
| |\
| | * fix one more bootstrap override regression - addendummarijus2014-05-261-0/+1
| | |
| | * fix one more bootstrap override regressionmarijus2014-05-264-6/+5
| | |
| | * divide autodate from item.app23n2014-05-261-1/+1
| | |
| | * Collapsed textareas are like buttons. They should not grow/shrink in size if ↵marijus2014-05-262-3/+4
| | | | | | | | | | | | app font-size changes.
| * | move some zot doco to our doc area and start on zot_structuresfriendica2014-05-264-1/+571
| |/
| * filter randprof results to avoid channels that are known to be deceased.friendica2014-05-251-1/+1
| |
| * auto-highlight app embed code on clickfriendica2014-05-252-2/+2
| |
| * missing "app installed" info msgfriendica2014-05-251-0/+4
| |
| * icon for randproffriendica2014-05-252-0/+1
| |
| * fix the intermittent theme previewfriendica2014-05-253-5/+3
| |
| * Merge pull request #473 from git-marijus/masterRedMatrix2014-05-253-13/+30
| |\ | | | | | | possible fix for empty commentbox collapsing on tool-button click
| | * for some reason this is also needed to make it work reliable in webkit browsersmarijus2014-05-242-1/+11
| | |
| | * should be redbasic not redmarijus2014-05-242-2/+2
| | |
| | * possible fix for empty commentbox colapsing on tool-button clickmarijus2014-05-243-13/+20
| |/
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-05-242-5/+3
| |\
| | * Merge pull request #471 from solstag/masterRedMatrix2014-05-242-5/+3
| | |\ | | | | | | | | Language selection: case-insensitive and system language
| | | * Language selection: case-insensitive and system languageAlexandre Hannud Abdo2014-05-232-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ignoring HTTP_ACCEPT_LANGUAGE tags that had uppercase characters. Fixed defining a->language too soon to ever get the system lang
| * | | app basic stylefriendica2014-05-242-1/+7
| |/ /
| * | add randprof app and do away with the universally hated chanview-iframe ↵friendica2014-05-235-13/+18
| | | | | | | | | | | | mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix.
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-232-5322/+5214
| |\|
| | * Merge pull request #470 from solstag/masterRedMatrix2014-05-232-5322/+5214
| | |\ | | | | | | | | update pt-br translation
| | | * update pt-br translationAlexandre Hannud Abdo2014-05-232-5322/+5214
| | |/
| * | doc additionsfriendica2014-05-232-0/+160
| | |
| * | add profile photo app because it is sometimes hard to find. Also doc updatesfriendica2014-05-2357-3977/+4650
| |/
| * fix search to use in appfriendica2014-05-225-5/+12
| |
| * more appsfriendica2014-05-225-0/+10
| |
| * implement 'requires' on personal appsfriendica2014-05-224-8/+53
| |
| * couple more appsfriendica2014-05-224-0/+8
| |
| * replace photos app iconfriendica2014-05-221-0/+0
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-05-224-5328/+5220
| |\
| | * Fix photo updates in appman.Thomas Willingham2014-05-221-2/+2
| | |
| | * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-05-2247-10641/+11090
| | |\
| | | * Merge pull request #469 from tuscanhobbit/masterPaolo T2014-05-222-2440/+3
| | | |\ | | | | | | | | | | IT: strings fixed
| | | | * IT: strings fixedPaolo Tacconi2014-05-222-2440/+3
| | | | |
| | | * | Merge pull request #468 from tuscanhobbit/masterPaolo T2014-05-222-4126/+6455
| | | |\| | | | | | | | | | | IT: updated strings
| | | | * IT: updated stringsPaolo Tacconi2014-05-222-4126/+6455
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:42:51 +0000