aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* strings/version updatefriendica2014-02-212-753/+792
|
* doc updatefriendica2014-02-2189-546/+1170
|
* SECURITY: do not automatically open an iframe which points into the local ↵friendica2014-02-202-1/+10
| | | | website.
* move jgrowl (alert popup) out of the now taller navbarfriendica2014-02-201-1/+1
|
* fix login weirdness for accounts that need to be approvedfriendica2014-02-202-5/+11
|
* small changes to a couple of lookup functions which we need to use a bit morefriendica2014-02-204-5/+9
|
* Merge https://github.com/friendica/red into zpullfriendica2014-02-201-1/+1
|\
| * Merge pull request #327 from git-marijus/masterfriendica2014-02-211-1/+1
| |\ | | | | | | fixes issue #326 initial scale to big
| | * fixes issue #326 initial scale to bigmarijus2014-02-201-1/+1
| | |
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-2012-81/+185
| | |\
| | * \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-202-929/+977
| | |\ \
* | | | | code cleanupfriendica2014-02-203-23/+14
|/ / / /
* | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-202-3543/+7994
|\ \ \ \
| * \ \ \ Merge pull request #328 from tuscanhobbit/masterPaolo T2014-02-202-3543/+7994
| |\ \ \ \ | | | | | | | | | | | | PT-BR: update to the strings
| | * | | | PT-BR: update to the stringstuscanhobbit2014-02-202-3543/+7994
| | | | | |
* | | | | | title missing in private mention postsfriendica2014-02-202-4/+2
|/ / / / /
* | | | | updated fr translationfriendica2014-02-202-976/+1024
| | | | |
* | | | | vsprintf error on updatefriendica2014-02-202-3/+3
| | | | |
* | | | | use the medium size photo on the nav bar if that photo stays larger, as the ↵friendica2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | small one usually looks awful when you scale it up.
* | | | | fix the broken hublocs in an updatefriendica2014-02-202-2/+18
| | | | |
* | | | | believe i found the issue which was causing hundreds/thousands of identical ↵friendica2014-02-203-11/+14
| |_|_|/ |/| | | | | | | | | | | hublocs to be created
* | | | Merge pull request #324 from tonybaldwin/masterfriendica2014-02-206-6/+6
|\ \ \ \ | | | | | | | | | | Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
| * | | | s/View remote profiles as webpages/Do not view remote profiles intony baldwin2014-02-196-6/+6
| | | | | | | | | | | | | | | | | | | | frames/g
* | | | | use a "fullscreen" icon for chanview full screen mode; add channel_menu ↵friendica2014-02-196-5/+53
|/ / / / | | | | | | | | | | | | selection and setting to the settings page.
* | | | Merge pull request #322 from dawnbreak/masterfriendica2014-02-201-70/+126
|\ \ \ \ | | | | | | | | | | Doxygen include/attach.php
| * | | | Doxygen include/attach.phpKlaus2014-02-191-70/+126
| | | | | | | | | | | | | | | Some Doxygen as far as I understood and some styleguides.
* | | | | Merge pull request #321 from git-marijus/masterfriendica2014-02-208-250/+308
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | bootstrapify the nav
| * | | another correctionmarijus2014-02-191-1/+1
| | | |
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-196-22/+84
| |\ \ \
| * | | | one pixel to much...marijus2014-02-191-1/+1
| | | | |
| * | | | bootstrapify the navmarijus2014-02-198-250/+308
| | | | |
* | | | | Merge pull request #323 from tuscanhobbit/masterPaolo T2014-02-192-929/+977
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | IT: update to the strings
| * | | IT: update to the stringstuscanhobbit2014-02-192-929/+977
| | | |
* | | | introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is ↵friendica2014-02-186-22/+84
| |/ / |/| | | | | | | | able to successfully authenticate (but is not necessarily in this network).
* | | fix zrl bookmarks which broke with this checkin: c9192991c95a5145friendica2014-02-181-27/+6
| | | | | | | | | | | | | | | | | | It was documented that: Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible. but as that was in a different function it was easy to overlook.
* | | Merge https://github.com/friendica/red into zpullfriendica2014-02-181-2/+5
|\ \ \
| * \ \ Merge pull request #320 from dawnbreak/masterfriendica2014-02-191-2/+5
| |\ \ \ | | | |/ | | |/| Let user cancel the red_encrypt dialogue
| | * | Let user cancel the red_encrypt dialogueKlaus2014-02-181-2/+5
| | | | | | | | | | | | If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
* | | | change edit/delete to icons on filestorage pagefriendica2014-02-181-3/+4
|/ / /
* | | some more snakebite and fix up include/account - forgot about that inline ↵friendica2014-02-184-21/+57
| | | | | | | | | | | | array stuff
* | | service class downgrade to the default service class on account expiration ↵friendica2014-02-182-10/+55
| | | | | | | | | | | | if using a non-default service class and account has expired.
* | | edit bookmarksfriendica2014-02-187-7/+18
| | |
* | | get_theme_uid() - if no uid, look for a system channel and use that. This ↵friendica2014-02-171-0/+5
| | | | | | | | | | | | allows default theme/scheme tweaks at the server level.
* | | update the donation linkfriendica2014-02-172-4/+4
| | |
* | | remove the exit clausefriendica2014-02-171-6/+0
| | |
* | | snakebite, cont. magic-auth via openid is now possible, with the caveat that ↵friendica2014-02-172-3/+21
| | | | | | | | | | | | one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this.
* | | operation snakebite continued. openid now works for local accounts using the ↵friendica2014-02-174-2/+125
| | | | | | | | | | | | rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet.
* | | update openid for snakebitefriendica2014-02-177-106/+1350
| | |
* | | more snakebite stufffriendica2014-02-172-25/+40
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2014-02-171-84/+87
|\ \ \