| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | Merge pull request #334 from cvogeley/master | friendica | 2014-02-23 | 4 | -0/+35 |
| |\ \ |
|
| | * | | little tweaks | Christian Vogeley | 2014-02-22 | 1 | -2/+2 |
| | * | | Add option for narrow navbar instead of the bootstrap default | Christian Vogeley | 2014-02-22 | 4 | -0/+35 |
* | | | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable b... | friendica | 2014-02-22 | 3 | -5/+2 |
|/ / / |
|
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-22 | 2 | -876/+923 |
|\| | |
|
| * | | Merge pull request #333 from tobiasd/20140222 | tobiasd | 2014-02-22 | 2 | -876/+923 |
| |\ \ |
|
| | * | | DE: update to the strings | Tobias Diekershoff | 2014-02-22 | 2 | -876/+923 |
| |/ / |
|
* / / | This should resolve the dav authentication loop (correctly) | friendica | 2014-02-22 | 4 | -9/+23 |
|/ / |
|
* | | prevent mod/cloud looping (ping gets a new session on each call [wtf?] which ... | friendica | 2014-02-22 | 2 | -2/+2 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-21 | 19 | -3404/+1958 |
|\ \ |
|
| * \ | Merge pull request #332 from zzottel/master | friendica | 2014-02-22 | 5 | -23/+223 |
| |\ \ |
|
| | * | | changed old Friendica stuff to what we have now in Red | zottel | 2014-02-21 | 1 | -21/+9 |
| | * | | small corrections | zottel | 2014-02-21 | 1 | -2/+2 |
| | * | | first few German help files | zottel | 2014-02-21 | 3 | -0/+212 |
| | * | | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-21 | 2 | -270/+3 |
| | |\ \ |
|
| | * \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-21 | 20 | -4562/+9069 |
| | |\ \ \ |
|
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-20 | 6 | -14/+33 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-20 | 20 | -1258/+1468 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-19 | 33 | -349/+1949 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-17 | 16 | -1603/+1674 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-15 | 75 | -930/+1258 |
| | |\ \ \ \ \ \ \ \ |
|
| * | \ \ \ \ \ \ \ \ | Merge pull request #331 from git-marijus/master | friendica | 2014-02-22 | 13 | -3111/+1732 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | remove some design fixes which got fixed in bootstrap 3.1.1 | marijus | 2014-02-21 | 2 | -4/+1 |
| | * | | | | | | | | | dont allow bootstrap to mess with blockquote font-size | marijus | 2014-02-21 | 1 | -0/+5 |
| | * | | | | | | | | | quickfix for edit profile dropdown | marijus | 2014-02-21 | 1 | -2/+2 |
| | * | | | | | | | | | oups... to much cleaning... | marijus | 2014-02-21 | 1 | -0/+58 |
| | * | | | | | | | | | update to bootstrap version 3.1.1 which is now completely MIT licensed | marijus | 2014-02-21 | 10 | -3105/+1666 |
| * | | | | | | | | | | Merge pull request #330 from git-marijus/master | friendica | 2014-02-21 | 2 | -270/+3 |
| |\| | | | | | | | |
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
| | * | | | | | | | | cleanup style.css | marijus | 2014-02-21 | 2 | -270/+3 |
| |/ / / / / / / / |
|
* | | | | | | | | | strings/version update | friendica | 2014-02-21 | 2 | -753/+792 |
* | | | | | | | | | doc update | friendica | 2014-02-21 | 89 | -546/+1170 |
|/ / / / / / / / |
|
* | | | | | | | | SECURITY: do not automatically open an iframe which points into the local web... | friendica | 2014-02-20 | 2 | -1/+10 |
* | | | | | | | | move jgrowl (alert popup) out of the now taller navbar | friendica | 2014-02-20 | 1 | -1/+1 |
* | | | | | | | | fix login weirdness for accounts that need to be approved | friendica | 2014-02-20 | 2 | -5/+11 |
* | | | | | | | | small changes to a couple of lookup functions which we need to use a bit more | friendica | 2014-02-20 | 4 | -5/+9 |
* | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge pull request #327 from git-marijus/master | friendica | 2014-02-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | fixes issue #326 initial scale to big | marijus | 2014-02-20 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-20 | 12 | -81/+185 |
| | |\ \ \ \ \ \ \ \
| | | | |_|_|_|/ / /
| | | |/| | | | | | |
|
| | * | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-20 | 2 | -929/+977 |
| | |\ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | code cleanup | friendica | 2014-02-20 | 3 | -23/+14 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-20 | 2 | -3543/+7994 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge pull request #328 from tuscanhobbit/master | Paolo T | 2014-02-20 | 2 | -3543/+7994 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/
| | |/| | | | | | | | |
|
| | * | | | | | | | | | PT-BR: update to the strings | tuscanhobbit | 2014-02-20 | 2 | -3543/+7994 |
* | | | | | | | | | | | title missing in private mention posts | friendica | 2014-02-20 | 2 | -4/+2 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | updated fr translation | friendica | 2014-02-20 | 2 | -976/+1024 |
* | | | | | | | | | | vsprintf error on update | friendica | 2014-02-20 | 2 | -3/+3 |
| |_|_|_|_|_|_|_|/
|/| | | | | | | | |
|
* | | | | | | | | | use the medium size photo on the nav bar if that photo stays larger, as the s... | friendica | 2014-02-20 | 1 | -1/+1 |
* | | | | | | | | | fix the broken hublocs in an update | friendica | 2014-02-20 | 2 | -2/+18 |
* | | | | | | | | | believe i found the issue which was causing hundreds/thousands of identical h... | friendica | 2014-02-20 | 3 | -11/+14 |
| |_|_|/ / / / /
|/| | | | | | | |
|