| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 0 | -0/+0 |
| * | Merge pull request #190 from simonlnu/master | Simon | 2012-03-31 | 2 | -14/+2 |
| |\ |
|
| | * | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 |
| * | | Merge pull request #189 from simonlnu/master | Simon | 2012-03-31 | 4 | -44/+86 |
| |\| |
|
| | * | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 2 | -9/+7 |
| | |\
| |/
|/| |
|
| * | | warning cleanup | friendica | 2012-03-30 | 2 | -9/+7 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 32 | -275/+423 |
| | |\
| |/
|/| |
|
| * | | Merge branch 'pull' | friendica | 2012-03-30 | 31 | -265/+398 |
| |\ \ |
|
| | * \ | Merge pull request #188 from fabrixxm/master | friendica | 2012-03-30 | 22 | -218/+328 |
| | |\ \ |
|
| | | * | | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 |
| | | * | | allow themes to use "style.php" instead of "style.css". | Fabio Comuni | 2012-03-30 | 2 | -5/+26 |
| | | * | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-30 | 6 | -14/+36 |
| | | |\ \
| | |/ /
| |/| | |
|
| | * | | | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -14/+36 |
| | | * | | quattro-green: remove settings code | Fabio Comuni | 2012-03-30 | 1 | -29/+0 |
| | | * | | quattro: add config.php | Fabio Comuni | 2012-03-30 | 3 | -35/+35 |
| | | * | | settings: add "display settings" tab, with UI-related settings. | Fabio Comuni | 2012-03-30 | 3 | -77/+180 |
| | |/ / |
|
| | * | | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 8 | -32/+29 |
| | * | | catch OpenID login errors in cases when the OpenID server does not answers | Tobias Diekershoff | 2012-03-30 | 1 | -1/+5 |
| * | | | don't delete contact from a friend request if friendship was already established | friendica | 2012-03-30 | 2 | -2/+6 |
| |/ / |
|
| * | | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -9/+19 |
| * | | quattro-green: added Description to the theme.php | Tobias Diekershoff | 2012-03-30 | 1 | -0/+1 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 0 | -0/+0 |
| |/ |
|
| * | quattro-green: adopted quattro option for centered display | Tobias Diekershoff | 2012-03-30 | 2 | -1/+56 |
| * | Merge branch 'pull' | friendica | 2012-03-30 | 170 | -6/+18107 |
| |\ |
|
| | * | Merge pull request #187 from tomtom84/master | tomtom84 | 2012-03-30 | 170 | -6/+18107 |
| | |\ |
|
| | | * | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 170 | -6/+18107 |
| | |/ |
|
| * / | string update | friendica | 2012-03-30 | 1 | -964/+1230 |
| |/ |
|
| * | rename "file as" to "save to folder" | friendica | 2012-03-30 | 3 | -4/+4 |
| * | Merge branch 'pull' | friendica | 2012-03-30 | 2 | -29/+128 |
| |\ |
|
| | * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-30 | 4 | -5/+5 |
| | |\ |
|
| | * | | quattro-greey: apply theming to private mail | Tobias Diekershoff | 2012-03-30 | 2 | -29/+128 |
| * | | | bug #352 - qcomment plugin disabled, qcomments still allowed | friendica | 2012-03-30 | 1 | -2/+5 |
| | |/
|/| |
|
| * | | zrl into people searches | friendica | 2012-03-29 | 4 | -5/+5 |
| |/ |
|
| * | another silly mistake | friendica | 2012-03-29 | 2 | -5/+5 |
| * | silly mistake | friendica | 2012-03-29 | 1 | -2/+3 |
| * | zrl on mentions | friendica | 2012-03-29 | 1 | -0/+6 |
| * | use zrl to get home again | friendica | 2012-03-29 | 7 | -17/+54 |
| * | Merge branch 'pull' | friendica | 2012-03-29 | 6 | -58/+44 |
| |\ |
|
| | * | Merge pull request #186 from simonlnu/master | Simon | 2012-03-29 | 6 | -58/+44 |
| | |\ |
|
| | | * | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0... | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 2 | -4/+3 |
| | | |\
| | |/
| |/| |
|
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 31 | -135/+657 |
| | | |\ |
|
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 0 | -0/+0 |
| * | | | | provide a way to specify an admin account for siteinfo if more than one have ... | friendica | 2012-03-29 | 1 | -1/+5 |
| |/ / / |
|
| * | / | typo in function name | friendica | 2012-03-29 | 2 | -4/+3 |
| | |/
|/| |
|
| * | | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 |
| * | | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 |
| * | | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 13 | -111/+513 |
| |\ \
| |/
|/| |
|
| | * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
