Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | escape % in file_tag_query as it is ultimately embedded in a sprintf | friendica | 2012-03-31 | 2 | -1/+5 | |
|/ / / / | ||||||
* | | | | register hooks for a COPA plugin | friendica | 2012-03-31 | 1 | -0/+7 | |
| | | | | ||||||
* | | | | some js fixes - ignore backspace as history selector and cleanup errors ↵ | friendica | 2012-03-31 | 1 | -4/+13 | |
| | | | | | | | | | | | | | | | | closing non-existent menus | |||||
* | | | | Merge branch 'pull' | friendica | 2012-03-31 | 25 | -116/+355 | |
|\ \ \ \ | ||||||
| * | | | | bug fix in diabook-aerith and -red | tommy tomson | 2012-03-31 | 6 | -22/+22 | |
| | | | | | ||||||
| * | | | | Merge pull request #191 from tomtom84/master | tomtom84 | 2012-03-31 | 17 | -40/+249 | |
| |\ \ \ \ | | |/ / / | |/| | | | bug-fixes in diabook-derivates | |||||
| | * | | | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 17 | -40/+249 | |
| |/ / / | ||||||
| * | | | Merge pull request #190 from simonlnu/master | Simon | 2012-03-31 | 2 | -14/+2 | |
| |\ \ \ | | | | | | | | | | | forgot the css changes for last push | |||||
| | * | | | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | Merge pull request #189 from simonlnu/master | Simon | 2012-03-31 | 4 | -44/+86 | |
| |\| | | | | | | | | | | | | | most notable one is fixing qcomment | |||||
| | * | | | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 2 | -9/+7 | |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: warning cleanup * master: | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 32 | -275/+423 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: don't delete contact from a friend request if friendship was already established quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme. allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework. css-fixes in diabook-derivates css-fixes in diabook-derivates quattro-green: remove settings code Use config.php from quattro quattro: add config.php settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. catch OpenID login errors in cases when the OpenID server does not answers css-fixes in diabook-derivates quattro-green: added Description to the theme.php * master: | |||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: quattro-green: adopted quattro option for centered display string update add themes diabook-red & diabook-aerith rename "file as" to "save to folder" bug #352 - qcomment plugin disabled, qcomments still allowed quattro-greey: apply theming to private mail zrl into people searches another silly mistake silly mistake zrl on mentions use zrl to get home again provide a way to specify an admin account for siteinfo if more than one have admin email address * master: | |||||
* | | | | | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 5 | -18/+45 | |
|/ / / / / | ||||||
* | / / / | warning cleanup | friendica | 2012-03-30 | 2 | -9/+7 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'pull' | friendica | 2012-03-30 | 31 | -265/+398 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #188 from fabrixxm/master | friendica | 2012-03-30 | 22 | -218/+328 | |
| |\ \ \ \ | | | | | | | | | | | | | Display settings tab and theme settings code | |||||
| | * | | | | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Add config option to select quattro color scheme. | |||||
| | * | | | | allow themes to use "style.php" instead of "style.css". | Fabio Comuni | 2012-03-30 | 2 | -5/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Load style.php trhu mod/view.php to pass it friendica framework. | |||||
| | * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Use config.php from quattro | |||||
| | * | | | | 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 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. | |||||
| * | | | | 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 | |
|/ / / | ||||||
* | | | 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 | |||||
| | * | | | 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 b0rked right now. | |||||
| | * | | | tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵ | Simon L'nu | 2012-03-29 | 6 | -58/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 2 | -4/+3 | |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master: | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 31 | -135/+657 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme file_as combobox for 2.0 css fixes in diabook-derivates quattro: style pm pages message: remove tabs, move new message link to aside, all message with gmail-style quattro: tpl for "file as" * master: |