| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|/ / |
|
| | |
|
|\ \ |
|
| |\ \
| | | |
| | | | |
fixes in diabook-derivates
|
| |/ / |
|
|/ / |
|
| | |
|
| | |
|
|\ \ |
|
| |\ \
| | | |
| | | | |
latest fixes for dispys. tweaking/repairing
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | |\ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
* remotes/upstream/master:
line 86: s/Friendika/Friendica/
fix "between yourself and You" in mail list
* master:
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* remotes/upstream/master:
more error handling
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
handle escaped file chars in display and search
escape % in file_tag_query as it is ultimately embedded in a sprintf
diabook-themes: move "common tabs" to left side on settings page
move the common tabs to right_aside in diabook-derivates
register hooks for a COPA plugin
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
bug fix in diabook-aerith and -red
bug-fixes in diabook-derivates
settings for unknown private mail acceptance
* master:
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* remotes/upstream/master:
* master:
|
|/ / / / |
|
| |/ /
|/| | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \ |
|
| |\ \ \
| | | | |
| | | | | |
diabook-themes: move "common tabs" to left side on settings page
|
| |/ / / |
|
| |\ \ \
| | | | |
| | | | | |
fixes in diabook-derivates
|
| |/ / / |
|
|/ / / |
|
| | | |
|
| | |
| | |
| | |
| | | |
closing non-existent menus
|
|\ \ \ |
|
| | | | |
|
| |\ \ \
| | |/ /
| |/| | |
bug-fixes in diabook-derivates
|
| |/ / |
|
| |\ \
| | | |
| | | | |
forgot the css changes for last push
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| |\| |
| | | |
| | | | |
most notable one is fixing qcomment
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | |\ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
* remotes/upstream/master:
warning cleanup
* master:
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 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:
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 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:
|
|/ / / / |
|
| |/ /
|/| | |
|
|\ \ \ |
|
| |\ \ \
| | | | |
| | | | | |
Display settings tab and theme settings code
|
| | | | |
| | | | |
| | | | |
| | | | | |
Add config option to select quattro color scheme.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Load style.php trhu mod/view.php to pass it friendica framework.
|
| | |\ \ \
| | |/ / /
| |/| | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Use config.php from quattro
|
| | | | | |
|
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
|