aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | remove some design fixes which got fixed in bootstrap 3.1.1marijus2014-02-212-4/+1
| | * | | | | | | | | dont allow bootstrap to mess with blockquote font-sizemarijus2014-02-211-0/+5
| | * | | | | | | | | quickfix for edit profile dropdownmarijus2014-02-211-2/+2
| | * | | | | | | | | oups... to much cleaning...marijus2014-02-211-0/+58
| | * | | | | | | | | update to bootstrap version 3.1.1 which is now completely MIT licensedmarijus2014-02-2110-3105/+1666
| * | | | | | | | | | Merge pull request #330 from git-marijus/masterfriendica2014-02-212-270/+3
| |\| | | | | | | | | | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | cleanup style.cssmarijus2014-02-212-270/+3
| |/ / / / / / / /
* | | | | | | | | 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 web...friendica2014-02-202-1/+10
* | | | | | | | 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 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 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 s...friendica2014-02-201-1/+1
* | | | | | | | | fix the broken hublocs in an updatefriendica2014-02-202-2/+18
* | | | | | | | | believe i found the issue which was causing hundreds/thousands of identical h...friendica2014-02-203-11/+14
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #324 from tonybaldwin/masterfriendica2014-02-206-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | s/View remote profiles as webpages/Do not view remote profiles intony baldwin2014-02-196-6/+6
* | | | | | | | | use a "fullscreen" icon for chanview full screen mode; add channel_menu selec...friendica2014-02-196-5/+53
|/ / / / / / / /
* | | | | | | | Merge pull request #322 from dawnbreak/masterfriendica2014-02-201-70/+126
|\ \ \ \ \ \ \ \
| * | | | | | | | Doxygen include/attach.phpKlaus2014-02-191-70/+126
* | | | | | | | | Merge pull request #321 from git-marijus/masterfriendica2014-02-208-250/+308
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | 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 stringstuscanhobbit2014-02-192-929/+977
* | | | | | | introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is abl...friendica2014-02-186-22/+84
| |/ / / / / |/| | | | |
* | | | | | fix zrl bookmarks which broke with this checkin: c9192991c95a5145friendica2014-02-181-27/+6
* | | | | | 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 dialogueKlaus2014-02-181-2/+5
* | | | | | | change edit/delete to icons on filestorage pagefriendica2014-02-181-3/+4
|/ / / / / /
* | | | | | some more snakebite and fix up include/account - forgot about that inline arr...friendica2014-02-184-21/+57
* | | | | | service class downgrade to the default service class on account expiration if...friendica2014-02-182-10/+55
* | | | | | edit bookmarksfriendica2014-02-187-7/+18
* | | | | | get_theme_uid() - if no uid, look for a system channel and use that. This all...friendica2014-02-171-0/+5