]>
git.mxchange.org Git - friendica.git/log
root [Tue, 24 Nov 2015 01:56:35 +0000 (02:56 +0100)]
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
gerhard6380 [Tue, 24 Nov 2015 01:58:08 +0000 (02:58 +0100)]
Merge pull request #1 from friendica/develop
Develop
root [Tue, 24 Nov 2015 01:49:29 +0000 (02:49 +0100)]
Test
Tobias Diekershoff [Mon, 23 Nov 2015 20:20:00 +0000 (21:20 +0100)]
Merge pull request #2094 from annando/1511-api
API Improvements
Michael Vogel [Mon, 23 Nov 2015 18:16:27 +0000 (19:16 +0100)]
API: Show the remote profile so that AndStatus uses the correct webfinger address
Michael Vogel [Mon, 23 Nov 2015 17:42:45 +0000 (18:42 +0100)]
API: Improvements for fetching the nick name
Tobias Diekershoff [Sun, 22 Nov 2015 15:42:21 +0000 (16:42 +0100)]
Merge pull request #2092 from strk/do-not-notify-own-items
Do not notify own posts, closes #1032
Sandro Santilli [Sun, 22 Nov 2015 11:28:39 +0000 (12:28 +0100)]
Do not notify own posts, closes #1032
Tobias Diekershoff [Sat, 21 Nov 2015 06:58:28 +0000 (07:58 +0100)]
Merge pull request #2090 from annando/1511-document-ejabberd
Documentation for installing a synchronized ejabberd
Michael Vogel [Fri, 20 Nov 2015 23:11:29 +0000 (00:11 +0100)]
Added the german explanation
Michael Vogel [Fri, 20 Nov 2015 23:09:39 +0000 (00:09 +0100)]
Added some more explanations about ejabberd
Michael Vogel [Thu, 19 Nov 2015 23:20:32 +0000 (00:20 +0100)]
Documentation: Configure bosh
Michael Vogel [Thu, 19 Nov 2015 22:56:56 +0000 (23:56 +0100)]
Documentation for installing a synchronized ejabberd
Michael Vogel [Thu, 19 Nov 2015 06:41:59 +0000 (07:41 +0100)]
Merge pull request #2089 from tobiasd/
20151119-NL
NL update to the strings, thx Ralph
Michael Vogel [Thu, 19 Nov 2015 06:41:41 +0000 (07:41 +0100)]
Merge pull request #2087 from tobiasd/
20151118-docevents
documentation of the not/maybe/attent feature for events
Tobias Diekershoff [Thu, 19 Nov 2015 06:30:27 +0000 (07:30 +0100)]
NL update to the strings, thx Ralph
Tobias Diekershoff [Thu, 19 Nov 2015 05:45:56 +0000 (06:45 +0100)]
linefeeds
Tobias Diekershoff [Thu, 19 Nov 2015 05:44:04 +0000 (06:44 +0100)]
Merge pull request #2088 from annando/1511-endless-loop
Prevention of endless loops in the conversation
Tobias Diekershoff [Thu, 19 Nov 2015 05:41:40 +0000 (06:41 +0100)]
typo
Michael Vogel [Wed, 18 Nov 2015 22:57:53 +0000 (23:57 +0100)]
Prevention of endless loops in the conversation
Tobias Diekershoff [Wed, 18 Nov 2015 13:41:16 +0000 (14:41 +0100)]
documentation of the not/maybe/attent feature for events
fabrixxm [Wed, 18 Nov 2015 08:04:10 +0000 (09:04 +0100)]
Merge pull request #2085 from annando/1511-forumlist-fix
This is a quick fix for the the forumlist.
Michael Vogel [Tue, 17 Nov 2015 20:34:01 +0000 (21:34 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix
Michael Vogel [Tue, 17 Nov 2015 20:33:25 +0000 (21:33 +0100)]
Merge pull request #2086 from rabuzarus/0711_forumlist
0711 forumlist
rabuzarus [Tue, 17 Nov 2015 19:59:12 +0000 (20:59 +0100)]
forumlist: oh forgot to raise $visible_forums after testing
rabuzarus [Tue, 17 Nov 2015 19:57:12 +0000 (20:57 +0100)]
forumlist: fix id conflict and js show-more
Michael Vogel [Tue, 17 Nov 2015 19:39:30 +0000 (20:39 +0100)]
The mobile.css seems to only work for mobiles at the moment.
Michael Vogel [Tue, 17 Nov 2015 19:31:40 +0000 (20:31 +0100)]
Some SQL fixes
Michael Vogel [Tue, 17 Nov 2015 19:11:06 +0000 (20:11 +0100)]
The mobile.css was commented out ...
Michael Vogel [Tue, 17 Nov 2015 18:56:32 +0000 (19:56 +0100)]
This is a quick fix for the the forumlist.
fabrixxm [Tue, 17 Nov 2015 08:13:08 +0000 (09:13 +0100)]
Merge pull request #2081 from annando/1511-avatar-fix
The own avatar was (sometimes?) changed back when it was changed
Michael Vogel [Tue, 17 Nov 2015 07:46:15 +0000 (08:46 +0100)]
Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
Michael Vogel [Tue, 17 Nov 2015 07:39:09 +0000 (08:39 +0100)]
Bugfix: The own avatar was (sometimes?) changed back when it was changed.
Tobias Diekershoff [Sat, 14 Nov 2015 11:19:45 +0000 (12:19 +0100)]
Merge pull request #2077 from annando/1511-plugin-order
Sort the plugin configuration on the admin page by name
Michael Vogel [Sat, 14 Nov 2015 08:27:24 +0000 (09:27 +0100)]
Sort the plugin configuration on the admin page by name
Tobias Diekershoff [Sat, 14 Nov 2015 08:08:26 +0000 (09:08 +0100)]
Merge pull request #2076 from annando/issue-2060
Fix for issue 2060: Redirection after registration
Tobias Diekershoff [Sat, 14 Nov 2015 07:09:52 +0000 (08:09 +0100)]
Merge pull request #2075 from annando/1511-bugfix-bbcode
Bugfix: Avoid error messages because of an already used function
Michael Vogel [Sat, 14 Nov 2015 07:07:09 +0000 (08:07 +0100)]
Fix for issue 2060: When password is provided during the register process now the user is redirected correctly.
Michael Vogel [Fri, 13 Nov 2015 22:55:01 +0000 (23:55 +0100)]
Bugfix: Avoid error messages because of an already used function
rabuzarus [Fri, 13 Nov 2015 22:49:37 +0000 (23:49 +0100)]
forumlist: don't raise db version in dbstructure.php
Tobias Diekershoff [Fri, 13 Nov 2015 11:51:17 +0000 (12:51 +0100)]
Merge pull request #2072 from fabrixxm/issue_2066
Remove anonymous function, 5.2 is still minimal requirement
Tobias Diekershoff [Fri, 13 Nov 2015 11:50:41 +0000 (12:50 +0100)]
Merge pull request #2074 from fabrixxm/issue_2071
Use static css in install procedure
fabrixxm [Fri, 13 Nov 2015 10:26:45 +0000 (11:26 +0100)]
Merge pull request #2073 from annando/1511-avatar
The "self" contact avatar picture is now updated
Fabrixxm [Fri, 13 Nov 2015 09:56:37 +0000 (10:56 +0100)]
pass to all templates by default
Fabrixxm [Fri, 13 Nov 2015 09:56:06 +0000 (10:56 +0100)]
Installer use static css, fix #2071
Michael Vogel [Fri, 13 Nov 2015 09:15:30 +0000 (10:15 +0100)]
Profile photos are now having an extension
Michael Vogel [Fri, 13 Nov 2015 08:48:34 +0000 (09:48 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1511-avatar
Michael Vogel [Fri, 13 Nov 2015 08:45:15 +0000 (09:45 +0100)]
Cleaned code
Fabrixxm [Fri, 13 Nov 2015 08:36:22 +0000 (09:36 +0100)]
Remove anonymous function, 5.2 is still minimal requirement
fabrixxm [Fri, 13 Nov 2015 08:16:52 +0000 (09:16 +0100)]
Merge pull request #2067 from annando/1511-optimize-sql
Optimized SQL queries to reduce the amount of write operations
fabrixxm [Fri, 13 Nov 2015 08:15:56 +0000 (09:15 +0100)]
Merge pull request #2070 from annando/1511-local-delivery-soapbox
Local delivery of comments to soap boxes are working now
Michael Vogel [Fri, 13 Nov 2015 07:45:14 +0000 (08:45 +0100)]
The avatar picture wasn't updated at the contact table
rabuzarus [Thu, 12 Nov 2015 23:33:32 +0000 (00:33 +0100)]
forumlist: some more doxygen for plugin.php
rabuzarus [Thu, 12 Nov 2015 23:16:39 +0000 (00:16 +0100)]
forumlist: dbupdate - fix - delete hooks and addon entry manually
Michael Vogel [Thu, 12 Nov 2015 22:34:33 +0000 (23:34 +0100)]
Just removed blanks with tabs
Michael Vogel [Thu, 12 Nov 2015 20:55:33 +0000 (21:55 +0100)]
Only allow non top level posts to soap boxes
Michael Vogel [Thu, 12 Nov 2015 20:43:42 +0000 (21:43 +0100)]
Local delivery of comments to soap boxes are working now
rabuzarus [Thu, 12 Nov 2015 15:42:27 +0000 (16:42 +0100)]
forumlist: dbupdate - new try
Tobias Diekershoff [Thu, 12 Nov 2015 09:18:52 +0000 (10:18 +0100)]
Merge pull request #2069 from fabrixxm/vier_aside_mobile
Vier mobile
fabrixxm [Thu, 12 Nov 2015 08:30:54 +0000 (09:30 +0100)]
vier mobile: prefixed transition in css, mobile-related javascript only on mobile
fabrixxm [Wed, 11 Nov 2015 18:11:55 +0000 (19:11 +0100)]
fix tab icon padding
fabrixxm [Wed, 11 Nov 2015 18:06:35 +0000 (19:06 +0100)]
fix menu icon, add icon to tab
fabrixxm [Wed, 11 Nov 2015 17:39:32 +0000 (18:39 +0100)]
mobile friendly tabs
Tobias Diekershoff [Thu, 12 Nov 2015 08:09:28 +0000 (09:09 +0100)]
Merge pull request #2068 from annando/1511-vier-mobile-aside
Vier-Mobile: The left menu does now appears even when scrolled down
Michael Vogel [Thu, 12 Nov 2015 07:59:29 +0000 (08:59 +0100)]
Some SQL queries were optimized to reduce the amount of write operations.
Michael Vogel [Thu, 12 Nov 2015 07:57:57 +0000 (08:57 +0100)]
Vier: The left menu does now appear reliably even if the user had scrolled down.
rabuzarus [Wed, 11 Nov 2015 22:47:09 +0000 (23:47 +0100)]
forumlist: dbupdate - small includel fix
rabuzarus [Wed, 11 Nov 2015 22:40:26 +0000 (23:40 +0100)]
forumlist: dbupdate - small optical fix
rabuzarus [Wed, 11 Nov 2015 22:39:14 +0000 (23:39 +0100)]
forumlist: dbupdate
rabuzarus [Wed, 11 Nov 2015 21:41:44 +0000 (22:41 +0100)]
forumlist: doxygen corrections
rabuzarus [Wed, 11 Nov 2015 21:36:14 +0000 (22:36 +0100)]
forumlist: function get_feature_default()
rabuzarus [Wed, 11 Nov 2015 20:37:16 +0000 (21:37 +0100)]
forumlist: forgot some required_once for plugin_enabled()
rabuzarus [Wed, 11 Nov 2015 20:31:26 +0000 (21:31 +0100)]
forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()
rabuzarus [Wed, 11 Nov 2015 00:29:31 +0000 (01:29 +0100)]
forumlist: use a more unique identifier
Michael Vogel [Tue, 10 Nov 2015 20:55:15 +0000 (21:55 +0100)]
Merge pull request #2065 from tobiasd/
20151110-shashape
ShaShape iconset
Michael Vogel [Tue, 10 Nov 2015 20:53:06 +0000 (21:53 +0100)]
Merge pull request #2064 from tobiasd/
20151110-de
update to the DE translation by Abrax
Tobias Diekershoff [Tue, 10 Nov 2015 19:34:21 +0000 (20:34 +0100)]
updated the CSS file for the ShaShape iconset
rabuzarus [Tue, 10 Nov 2015 19:31:13 +0000 (20:31 +0100)]
forumlist: some little code unification
Tobias Diekershoff [Tue, 10 Nov 2015 19:12:16 +0000 (20:12 +0100)]
new version of the ShaShape iconset
Tobias Diekershoff [Tue, 10 Nov 2015 19:10:20 +0000 (20:10 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
Tobias Diekershoff [Tue, 10 Nov 2015 19:02:19 +0000 (20:02 +0100)]
update to the DE translation by Abrax
rabuzarus [Tue, 10 Nov 2015 18:23:45 +0000 (19:23 +0100)]
forumlist: move include to header
fabrixxm [Tue, 10 Nov 2015 15:31:41 +0000 (16:31 +0100)]
Merge pull request #2062 from annando/1511-vier-fonts
Vier: Make it look more beautiful under Linux
Michael Vogel [Tue, 10 Nov 2015 15:25:36 +0000 (16:25 +0100)]
Vier: Make it look more beautiful under Linux
rabuzarus [Tue, 10 Nov 2015 11:53:56 +0000 (12:53 +0100)]
forumlist: small fix
Michael Vogel [Mon, 9 Nov 2015 15:05:23 +0000 (16:05 +0100)]
Merge pull request #2055 from tobiasd/
20151108-messagespo
regenerated master messages.po file
rabuzarus [Mon, 9 Nov 2015 14:56:20 +0000 (15:56 +0100)]
move forumlist addon to core
Tobias Diekershoff [Sun, 8 Nov 2015 21:26:22 +0000 (22:26 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 8 Nov 2015 18:17:32 +0000 (19:17 +0100)]
Merge pull request #2054 from fabrixxm/vier_aside_mobile
aside bar as menu in mobile
fabrixxm [Sun, 8 Nov 2015 18:08:00 +0000 (19:08 +0100)]
aside bar as menu in mobile
Tobias Diekershoff [Sun, 8 Nov 2015 17:39:07 +0000 (18:39 +0100)]
Merge pull request #2053 from annando/1511-only-supported-themes
Only show supported themes on the admin site.
Michael Vogel [Sun, 8 Nov 2015 17:35:39 +0000 (18:35 +0100)]
Only show supported themes on the admin site.
Tobias Diekershoff [Sun, 8 Nov 2015 17:29:15 +0000 (18:29 +0100)]
Merge pull request #2052 from fabrixxm/issue_1718
duepuntozero, vier: add unread messages per group
fabrixxm [Sun, 8 Nov 2015 17:02:04 +0000 (18:02 +0100)]
duepuntozero, vier: add unread messages per group
Tobias Diekershoff [Sun, 8 Nov 2015 16:06:05 +0000 (17:06 +0100)]
Merge pull request #2050 from fabrixxm/issue_1718
quattro: add unread message count per groups
fabrixxm [Sun, 8 Nov 2015 16:04:39 +0000 (17:04 +0100)]
remove debug code
fabrixxm [Sun, 8 Nov 2015 15:55:44 +0000 (16:55 +0100)]
quattro: add unread message count per groups
Tobias Diekershoff [Sun, 8 Nov 2015 15:46:45 +0000 (16:46 +0100)]
Merge pull request #2049 from annando/1511-only-valid-contacts
Only show valid contacts on the group page
Michael Vogel [Sun, 8 Nov 2015 15:41:00 +0000 (16:41 +0100)]
Only show valid contacts on the group side
Tobias Diekershoff [Sun, 8 Nov 2015 15:04:50 +0000 (16:04 +0100)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
projects / friendica.git / log