aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Add option for narrow navbar instead of the bootstrap defaultChristian Vogeley2014-02-224-0/+35
* | | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable b...friendica2014-02-223-5/+2
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2014-02-222-876/+923
|\| |
| * | Merge pull request #333 from tobiasd/20140222tobiasd2014-02-222-876/+923
| |\ \
| | * | DE: update to the stringsTobias Diekershoff2014-02-222-876/+923
| |/ /
* / / This should resolve the dav authentication loop (correctly)friendica2014-02-224-9/+23
|/ /
* | prevent mod/cloud looping (ping gets a new session on each call [wtf?] which ...friendica2014-02-222-2/+2
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-2119-3404/+1958
|\ \
| * \ Merge pull request #332 from zzottel/masterfriendica2014-02-225-23/+223
| |\ \
| | * | changed old Friendica stuff to what we have now in Redzottel2014-02-211-21/+9
| | * | small correctionszottel2014-02-211-2/+2
| | * | first few German help fileszottel2014-02-213-0/+212
| | * | Merge remote-tracking branch 'upstream/master'zottel2014-02-212-270/+3
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-2120-4562/+9069
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-206-14/+33
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-2020-1258/+1468
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1933-349/+1949
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1716-1603/+1674
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1575-930/+1258
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge pull request #331 from git-marijus/masterfriendica2014-02-2213-3111/+1732
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | 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