| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 3 | -7/+9 |
| |\ | |||||
| | * | Merge pull request #144 from simonlnu/master | Simon | 2012-03-16 | 3 | -7/+9 |
| | |\ | | | | | | | remove auto-complete from some themes since the comment one is now global | ||||
| | | * | remove auto-complete from darkzero-NS, dispys, since the comment one is now ↵ | Simon L'nu | 2012-03-16 | 2 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | global Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | make auto-complete work in more places | Simon L'nu | 2012-03-16 | 1 | -1/+9 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 28 | -306/+488 |
| |\| | |||||
| | * | Merge pull request #143 from simonlnu/master | Simon | 2012-03-16 | 1 | -0/+3 |
| | |\ | | | | | | | make auto-complete in darkzero-NS. | ||||
| | | * | make auto-complete in darkzero-NS. other themes can use this easily. might ↵ | Simon L'nu | 2012-03-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | need to edit the id it hooks into Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 2 | -7/+18 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | * 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: | ||||
| | * | | convert boolean or int settings to strings to work around issues with ↵ | friendica | 2012-03-16 | 1 | -7/+7 |
| | | | | | | | | | | | | | template processing | ||||
| | * | | add "send pm" link to photo dropdown for Diaspora contacts | friendica | 2012-03-16 | 1 | -0/+11 |
| | | | | |||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | * remotes/upstream/master: wrong link in d* comment notifications * master: | ||||
| | * | Merge branch 'pull' | friendica | 2012-03-16 | 19 | -200/+325 |
| | |\ | |||||
| | | * | Merge pull request #142 from simonlnu/master | Simon | 2012-03-16 | 2 | -0/+18 |
| | | |\ | | | | | | | | | make profiles-menu disappear when clicked outside of it | ||||
| | | | * | make profiles-menu disappear when clicked outside it | Simon L'nu | 2012-03-16 | 2 | -0/+18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | | * | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 4 | -10/+18 |
| | | |\ | | | | | | | | | Private messages - tabindex | ||||
| | | | * | Bugfix of old IEs | Tobias Hößl | 2012-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Forgot to remove a debug line | Tobias Hößl | 2012-03-16 | 1 | -1/+0 |
| | | | | | |||||
| | | | * | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 4 | -11/+20 |
| | | | | | | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | ||||
| | | * | | Merge pull request #140 from simonlnu/master | Simon | 2012-03-16 | 15 | -195/+294 |
| | | |\ \ | | | | | | | | | | | weee, dispys get another update | ||||
| | | | * | | weee, dispys get another update | Simon L'nu | 2012-03-16 | 15 | -195/+294 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 5 | -98/+141 |
| | | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | | | wrong link in d* comment notifications | friendica | 2012-03-16 | 2 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | syntax error from pasted text, remove ^M's | friendica | 2012-03-16 | 1 | -96/+96 |
| | | | | | | |||||
| | * | | | | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | whitespace | friendica | 2012-03-16 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | notification for disapora comments | friendica | 2012-03-16 | 1 | -0/+42 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-16 | 44 | -170/+547 |
| |\| | | | |||||
| | * | | | Merge pull request #139 from simonlnu/master | Simon | 2012-03-15 | 1 | -1/+1 |
| | |\| | | | |/ | |/| | missing close double quote in mail_list.tpl | ||||
| | | * | missing close double quote in mail_list.tpl | Simon L'nu | 2012-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #138 from simonlnu/master | Simon | 2012-03-15 | 1 | -0/+6 |
| | |\| | | | | | | | more changes in dispy-dark | ||||
| | | * | more changes in dispy-dark | Simon L'nu | 2012-03-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | * | turn indexes back off (this is from an errant checkin a year or more ago) | friendica | 2012-03-15 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-15 | 15 | -32/+86 |
| | |\ | |||||
| | | * | Merge pull request #137 from tomtom84/master | tomtom84 | 2012-03-15 | 15 | -32/+86 |
| | | |\ | | | | | | | | | fixes in diabook-derivates | ||||
| | | | * | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 15 | -32/+86 |
| | | |/ | |||||
| | * / | undo git stuffup | friendica | 2012-03-15 | 3 | -4/+8 |
| | |/ | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-15 | 28 | -157/+448 |
| | |\ | |||||
| | | * | Merge pull request #136 from annando/master | friendica | 2012-03-15 | 12 | -71/+329 |
| | | |\ | | | | | | | | | Mail improvements, item caching and so on | ||||
| | | | * | html2bbcode: Disabled size conversion | Michael Vogel | 2012-03-15 | 1 | -9/+9 |
| | | | | | |||||
| | | | * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 114 | -870/+2820 |
| | | | |\ | |||||
| | | | * | | Mail: Subject are now with working "Re:" | Michael Vogel | 2012-03-12 | 2 | -43/+14 |
| | | | | | | |||||
| | | | * | | Removing test exports | Michael Vogel | 2012-03-11 | 2 | -4/+4 |
| | | | | | | |||||
| | | | * | | Missing field in database.sql | Michael Vogel | 2012-03-11 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | | | | | |||||
| | | | * | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 62 | -555/+7192 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| | | | * | | | Added config options for the item cache and the ostatus priority | Michael Vogel | 2012-03-11 | 1 | -0/+6 |
| | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |