| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* remotes/upstream/master:
* master:
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
remove auto-complete from some themes since the comment one is now global
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
global
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* remotes/upstream/master:
* master:
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
make auto-complete in darkzero-NS.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
need to edit the id it hooks into
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | |\ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
template processing
|
| | | | | | | | |
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* remotes/upstream/master:
wrong link in d* comment notifications
* master:
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
make profiles-menu disappear when clicked outside of it
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* remotes/upstream/master:
Bugfix of old IEs
Forgot to remove a debug line
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
* master:
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Private messages - tabindex
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | | |
weee, dispys get another update
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* remotes/upstream/master:
syntax error from pasted text, remove ^M's
bug #335 network search broken after new ssl policy settings
whitespace
notification for disapora comments
* master:
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* remotes/upstream/master:
* master:
|
| |/ / / / / / / / / |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | |_|/ / / / / /
| |/| | | | | | | |
|
|\| | | | | | | | |
|
| |\| | | | | | |
| | |/ / / / / /
| |/| | | | | | |
missing close double quote in mail_list.tpl
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| |\| | | | | |
| | | | | | | |
| | | | | | | | |
more changes in dispy-dark
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* remotes/upstream/master: (21 commits)
turn indexes back off (this is from an errant checkin a year or more ago)
undo git stuffup
added icons to profile_side, fixes in css
track whether contact is a community page or not
html2bbcode: Disabled size conversion
Mail: Subject are now with working "Re:"
Removing test exports
Missing field in database.sql
Removed changes
Added config options for the item cache and the ostatus priority
Item cache now is one day.
Corrected some git problems
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
Pages: Show every community page - even from foreign servers (with caching)
New plugin that shows community pages in the sidebar
Caching improved.
Enabled Caching for items. Changed color of tags in diabook.
New config options if ostatus polling should use the priority in the contacts
Mail: Removing signatures, gpg, unnecessary line breaks
diabook: Moving the location between the icons
...
* master:
|
| | | | | | | |
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
fixes in diabook-derivates
|
| | |/ / / / / / |
|
| |/ / / / / / |
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Mail improvements, item caching and so on
|
| | | | | | | | | |
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
|
| | | | | | | | | | | |
|