]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoFR update to the strings THX Perig
Tobias Diekershoff [Fri, 11 Dec 2015 07:03:09 +0000 (08:03 +0100)]
FR update to the strings THX Perig

8 years agoMerge pull request #2161 from ddorian1/release-3.4.3-rc
Michael Vogel [Thu, 10 Dec 2015 20:20:37 +0000 (21:20 +0100)]
Merge pull request #2161 from ddorian1/release-3.4.3-rc

fix path for photo and proxy

8 years agoMerge pull request #2166 from rabuzarus/1012_vier-forum
Michael Vogel [Thu, 10 Dec 2015 20:19:16 +0000 (21:19 +0100)]
Merge pull request #2166 from rabuzarus/1012_vier-forum

vier: fix little misspelling

8 years agovier: fix little misspelling
rabuzarus [Thu, 10 Dec 2015 12:30:11 +0000 (13:30 +0100)]
vier: fix little misspelling

8 years agoMerge pull request #2164 from annando/1512-basepath-2
fabrixxm [Wed, 9 Dec 2015 18:17:48 +0000 (19:17 +0100)]
Merge pull request #2164 from annando/1512-basepath-2

Avoid problems with wrong configured server variables

8 years agoMerge pull request #2163 from annando/1512-rendertime-css
Tobias Diekershoff [Tue, 8 Dec 2015 20:05:05 +0000 (21:05 +0100)]
Merge pull request #2163 from annando/1512-rendertime-css

Do a linebreak before the output of rendertime

8 years agoAvoid problems with wrong configured server variables
Michael Vogel [Tue, 8 Dec 2015 18:53:01 +0000 (19:53 +0100)]
Avoid problems with wrong configured server variables

8 years agoDo a linebreak before the output of rendertime
Michael Vogel [Tue, 8 Dec 2015 18:41:27 +0000 (19:41 +0100)]
Do a linebreak before the output of rendertime

8 years agofix path for photo and proxy
Johannes Schwab [Mon, 7 Dec 2015 23:10:12 +0000 (00:10 +0100)]
fix path for photo and proxy

8 years agoMerge pull request #2162 from annando/1512-basepath
fabrixxm [Tue, 8 Dec 2015 08:08:48 +0000 (09:08 +0100)]
Merge pull request #2162 from annando/1512-basepath

Add an additional way to fetch the basepath (See pull request 2161)

8 years agoAdd an additional way to fetch the basepath (See pull request 2161)
Michael Vogel [Tue, 8 Dec 2015 07:17:29 +0000 (08:17 +0100)]
Add an additional way to fetch the basepath (See pull request 2161)

8 years agoUpdate FRIENDICA_VERSION
fabrixxm [Mon, 7 Dec 2015 22:24:55 +0000 (23:24 +0100)]
Update FRIENDICA_VERSION

8 years agoMerge pull request #2159 from annando/1512-worker-processes
fabrixxm [Mon, 7 Dec 2015 22:20:02 +0000 (23:20 +0100)]
Merge pull request #2159 from annando/1512-worker-processes

Better control for the number of workers

8 years agoMerge pull request #2158 from annando/1512-vier-fonts
fabrixxm [Mon, 7 Dec 2015 22:06:50 +0000 (23:06 +0100)]
Merge pull request #2158 from annando/1512-vier-fonts

Vier: The line-height seems to make problems with windows

8 years agoVier: The line-height seems to make problems with windows
Michael Vogel [Mon, 7 Dec 2015 20:45:33 +0000 (21:45 +0100)]
Vier: The line-height seems to make problems with windows

8 years agoMerge pull request #2151 from annando/1512-misconfigured-friendica
Tobias Diekershoff [Mon, 7 Dec 2015 05:37:37 +0000 (06:37 +0100)]
Merge pull request #2151 from annando/1512-misconfigured-friendica

Workaround for misconfigured Friendica servers with probe_url

8 years agoMerge pull request #2153 from annando/issue-1924
Tobias Diekershoff [Mon, 7 Dec 2015 05:32:01 +0000 (06:32 +0100)]
Merge pull request #2153 from annando/issue-1924

Issue 1924: New configuration value for permitting crawler access

8 years agoMerge pull request #2152 from annando/bugfix-socgraph
Tobias Diekershoff [Mon, 7 Dec 2015 05:29:38 +0000 (06:29 +0100)]
Merge pull request #2152 from annando/bugfix-socgraph

Bugfix for pull request #2147 (Fix for issue #2122)

8 years agoIssue 1924: New configuration value for permitting crawler access
Michael Vogel [Sun, 6 Dec 2015 21:01:20 +0000 (22:01 +0100)]
Issue 1924: New configuration value for permitting crawler access

8 years agoBugfix for pull request #2147 (Fix for issue #2122)
Michael Vogel [Sun, 6 Dec 2015 19:05:57 +0000 (20:05 +0100)]
Bugfix for pull request #2147 (Fix for issue #2122)

8 years agoSome better logging
Michael Vogel [Sun, 6 Dec 2015 19:04:33 +0000 (20:04 +0100)]
Some better logging

8 years agoCode beautification
Michael Vogel [Sun, 6 Dec 2015 17:57:23 +0000 (18:57 +0100)]
Code beautification

8 years agoWorkaround for misconfigured Friendica servers
Michael Vogel [Sun, 6 Dec 2015 17:52:19 +0000 (18:52 +0100)]
Workaround for misconfigured Friendica servers

8 years agoMove the process check at the beginning of the script
Michael Vogel [Sun, 6 Dec 2015 15:40:31 +0000 (16:40 +0100)]
Move the process check at the beginning of the script

8 years agoDouble check for maximum number of workers
Michael Vogel [Sun, 6 Dec 2015 15:28:28 +0000 (16:28 +0100)]
Double check for maximum number of workers

8 years agoMerge pull request #2150 from annando/1512-probe-url-caching
Tobias Diekershoff [Sun, 6 Dec 2015 11:22:43 +0000 (12:22 +0100)]
Merge pull request #2150 from annando/1512-probe-url-caching

probe_url: Only cache successful results

8 years agoprobe_url: Only cache successful results
Michael Vogel [Sun, 6 Dec 2015 11:15:31 +0000 (12:15 +0100)]
probe_url: Only cache successful results

8 years agoMerge pull request #2149 from annando/issue-1921
Tobias Diekershoff [Sun, 6 Dec 2015 06:31:13 +0000 (07:31 +0100)]
Merge pull request #2149 from annando/issue-1921

Issue 1921: Disable the auto update

8 years agoMerge pull request #2148 from annando/issue-1871
Tobias Diekershoff [Sun, 6 Dec 2015 05:43:30 +0000 (06:43 +0100)]
Merge pull request #2148 from annando/issue-1871

Issue 1871: Show an information if a group is empty

8 years agoMerge pull request #2147 from annando/issue-2122
Tobias Diekershoff [Sun, 6 Dec 2015 05:42:45 +0000 (06:42 +0100)]
Merge pull request #2147 from annando/issue-2122

Issue 2122: Make sure to always return the correct number of entries

8 years agoIssue 1921: Disable the auto update
Michael Vogel [Sat, 5 Dec 2015 23:18:59 +0000 (00:18 +0100)]
Issue 1921: Disable the auto update

8 years agoIssue 1871: Show an information if a group is empty
Michael Vogel [Sat, 5 Dec 2015 22:29:42 +0000 (23:29 +0100)]
Issue 1871: Show an information if a group is empty

8 years agoIssue 2122: Make sure to always return the correct number of entries
Michael Vogel [Sat, 5 Dec 2015 22:05:48 +0000 (23:05 +0100)]
Issue 2122: Make sure to always return the correct number of entries

8 years agoMerge pull request #2146 from annando/1512-ostatus-picture-posts
Tobias Diekershoff [Sat, 5 Dec 2015 05:47:31 +0000 (06:47 +0100)]
Merge pull request #2146 from annando/1512-ostatus-picture-posts

Enhancements to picture posts to OStatus

8 years agoMerge pull request #2145 from tobiasd/20151204-sv
fabrixxm [Fri, 4 Dec 2015 22:32:37 +0000 (23:32 +0100)]
Merge pull request #2145 from tobiasd/20151204-sv

SV messages.po regenerated from strings.php

8 years agoSV messages.po regenerated from strings.php
Tobias Diekershoff [Fri, 4 Dec 2015 20:31:33 +0000 (21:31 +0100)]
SV messages.po regenerated from strings.php

8 years agoMerge pull request #2144 from fabrixxm/quattro
Tobias Diekershoff [Fri, 4 Dec 2015 19:52:58 +0000 (20:52 +0100)]
Merge pull request #2144 from fabrixxm/quattro

Work on Quattro

8 years ago modified: include/dbstructure.php removed uneeded break; It causes errors with...
root [Fri, 4 Dec 2015 19:49:09 +0000 (19:49 +0000)]
modified:   include/dbstructure.php removed uneeded break; It causes errors with php 7.0.

8 years agoquattro: some love to events pages
fabrixxm [Fri, 4 Dec 2015 19:43:35 +0000 (20:43 +0100)]
quattro: some love to events pages

8 years agoMerge pull request #2142 from fabrixxm/issue_1920
Tobias Diekershoff [Fri, 4 Dec 2015 19:29:01 +0000 (20:29 +0100)]
Merge pull request #2142 from fabrixxm/issue_1920

Fix contact popup with tinyMCE

8 years agoMerge pull request #2140 from fabrixxm/issue_2046
Tobias Diekershoff [Fri, 4 Dec 2015 19:25:33 +0000 (20:25 +0100)]
Merge pull request #2140 from fabrixxm/issue_2046

Rewrite util/php2po.php

8 years agoQuattro: Rss icon for atom feed link in profile
fabrixxm [Fri, 4 Dec 2015 18:57:19 +0000 (19:57 +0100)]
Quattro: Rss icon for atom feed link in profile

8 years agoquattro: hide acl button in edit post
fabrixxm [Fri, 4 Dec 2015 18:29:13 +0000 (19:29 +0100)]
quattro: hide acl button in edit post

fix #1780

8 years agoFix contact popup with tinyMCE
fabrixxm [Fri, 4 Dec 2015 17:59:50 +0000 (18:59 +0100)]
Fix contact popup with tinyMCE

Fix #1920

8 years agoFix generated po headers
Fabrixxm [Fri, 4 Dec 2015 14:47:41 +0000 (15:47 +0100)]
Fix generated po headers

8 years agoMerge pull request #2141 from fabrixxm/issue_1953
Tobias Diekershoff [Fri, 4 Dec 2015 14:39:53 +0000 (15:39 +0100)]
Merge pull request #2141 from fabrixxm/issue_1953

Add support for attending an event to frost themes

8 years agoAdd support for attending an event to frost themes
Fabrixxm [Fri, 4 Dec 2015 14:01:46 +0000 (15:01 +0100)]
Add support for attending an event to frost themes

fix #1953

8 years agoRewrite util/php2po.php
Fabrixxm [Fri, 4 Dec 2015 13:09:17 +0000 (14:09 +0100)]
Rewrite util/php2po.php

Fix #2046

8 years agoMerge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
Michael Vogel [Fri, 4 Dec 2015 06:07:34 +0000 (07:07 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts

8 years agoMerge pull request #2136 from annando/1512-diaspora-retractions
Tobias Diekershoff [Fri, 4 Dec 2015 05:54:55 +0000 (06:54 +0100)]
Merge pull request #2136 from annando/1512-diaspora-retractions

Support for a new Diaspora command for post retraction

8 years agoMerge pull request #2130 from annando/1512-contact-rework
Tobias Diekershoff [Fri, 4 Dec 2015 05:53:29 +0000 (06:53 +0100)]
Merge pull request #2130 from annando/1512-contact-rework

Some more contact rework

8 years agoThe preview picture can now be remote or local
Michael Vogel [Fri, 4 Dec 2015 05:50:23 +0000 (06:50 +0100)]
The preview picture can now be remote or local

8 years agoMerge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
Michael Vogel [Fri, 4 Dec 2015 05:05:12 +0000 (06:05 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts

8 years agoMerge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512...
Michael Vogel [Fri, 4 Dec 2015 05:00:56 +0000 (06:00 +0100)]
Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts

8 years agoOStatus: Picture posts are reformatted
Michael Vogel [Fri, 4 Dec 2015 04:57:33 +0000 (05:57 +0100)]
OStatus: Picture posts are reformatted

8 years agoMerge pull request #2139 from rabuzarus/0312_ping_cleanup
Michael Vogel [Fri, 4 Dec 2015 04:50:49 +0000 (05:50 +0100)]
Merge pull request #2139 from rabuzarus/0312_ping_cleanup

moving group_count_unseen to include/group.php

8 years agoMerge pull request #2135 from rabuzarus/doxygen
Michael Vogel [Fri, 4 Dec 2015 04:47:59 +0000 (05:47 +0100)]
Merge pull request #2135 from rabuzarus/doxygen

Code reference in help

8 years agoping: docu fix
rabuzarus [Thu, 3 Dec 2015 21:51:00 +0000 (22:51 +0100)]
ping: docu fix

8 years agoping: further work
rabuzarus [Thu, 3 Dec 2015 21:42:53 +0000 (22:42 +0100)]
ping: further work

8 years agodoxygen: correct mistake - .gitignore shouldn't be submitted
rabuzarus [Thu, 3 Dec 2015 20:22:13 +0000 (21:22 +0100)]
doxygen: correct mistake - .gitignore shouldn't be submitted

8 years agodoxygen: delete wrong commited file
rabuzarus [Thu, 3 Dec 2015 16:30:34 +0000 (17:30 +0100)]
doxygen: delete wrong commited file

8 years agoping: cleanup
rabuzarus [Thu, 3 Dec 2015 16:15:49 +0000 (17:15 +0100)]
ping: cleanup

8 years agodoxygen: exclude some more folders
rabuzarus [Thu, 3 Dec 2015 15:17:25 +0000 (16:17 +0100)]
doxygen: exclude some more folders

8 years agoMerge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Michael Vogel [Thu, 3 Dec 2015 13:38:04 +0000 (14:38 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework

Conflicts:
mod/contacts.php
mod/crepair.php

8 years agoMerge pull request #2131 from rabuzarus/3011_hcard_vcard
Michael Vogel [Thu, 3 Dec 2015 13:16:52 +0000 (14:16 +0100)]
Merge pull request #2131 from rabuzarus/3011_hcard_vcard

unify hcard and vcard

8 years agoSupport for a new Diaspora command for post retraction
Michael Vogel [Thu, 3 Dec 2015 07:35:47 +0000 (08:35 +0100)]
Support for a new Diaspora command for post retraction

8 years agolittle cleanup: insert new line at the end
rabuzarus [Wed, 2 Dec 2015 23:11:18 +0000 (00:11 +0100)]
little cleanup: insert new line at the end

8 years agoremove unneeded function page_type_translate()
rabuzarus [Wed, 2 Dec 2015 23:08:43 +0000 (00:08 +0100)]
remove unneeded function page_type_translate()

8 years agoadded code reference to docs
rabuzarus [Wed, 2 Dec 2015 23:06:11 +0000 (00:06 +0100)]
added code reference to docs

8 years agophotos-albms widget: add some classes
rabuzarus [Wed, 2 Dec 2015 19:01:22 +0000 (20:01 +0100)]
photos-albms widget: add some classes

8 years agoAdded/Changed accesskeys for the new tab actions
Michael Vogel [Wed, 2 Dec 2015 06:56:10 +0000 (07:56 +0100)]
Added/Changed accesskeys for the new tab actions

8 years agoSolved a problem with author links that are different from what is provided in the...
Michael Vogel [Tue, 1 Dec 2015 22:51:34 +0000 (23:51 +0100)]
Solved a problem with author links that are different from what is provided in the contact

8 years agoMerge pull request #2132 from rabuzarus/0112_vier_css
Michael Vogel [Tue, 1 Dec 2015 21:40:56 +0000 (22:40 +0100)]
Merge pull request #2132 from rabuzarus/0112_vier_css

photos-albms widget: add some classes

8 years agophotos-albms widget: add some classes
rabuzarus [Tue, 1 Dec 2015 20:07:05 +0000 (21:07 +0100)]
photos-albms widget: add some classes

8 years agounify hcard and vcard: make $pdesc available in hcard&vcard
rabuzarus [Tue, 1 Dec 2015 18:47:23 +0000 (19:47 +0100)]
unify hcard and vcard: make $pdesc available in hcard&vcard

8 years agoUnifying the texts.
Michael Vogel [Tue, 1 Dec 2015 18:02:03 +0000 (19:02 +0100)]
Unifying the texts.

8 years agoMerge develop into 3011_hcard_vcard
rabuzarus [Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)]
Merge develop into 3011_hcard_vcard

8 years agounify hcard and vcard
rabuzarus [Tue, 1 Dec 2015 17:31:08 +0000 (18:31 +0100)]
unify hcard and vcard

8 years agoHeader removed in the contact area
Michael Vogel [Tue, 1 Dec 2015 17:21:05 +0000 (18:21 +0100)]
Header removed in the contact area

8 years agoMerge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Michael Vogel [Tue, 1 Dec 2015 16:16:31 +0000 (17:16 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework

8 years agoMerge pull request #2125 from rabuzarus/2911_event_template
Michael Vogel [Tue, 1 Dec 2015 16:13:46 +0000 (17:13 +0100)]
Merge pull request #2125 from rabuzarus/2911_event_template

vier event_form: include bb-tags for editing

8 years agoMerge pull request #2129 from annando/1512-diaspora-cid
fabrixxm [Tue, 1 Dec 2015 16:11:35 +0000 (17:11 +0100)]
Merge pull request #2129 from annando/1512-diaspora-cid

Diaspora comments/likes: The contact id and the network is now taken …

8 years agoMerge pull request #2127 from tobiasd/20151201-de
Michael Vogel [Tue, 1 Dec 2015 16:01:47 +0000 (17:01 +0100)]
Merge pull request #2127 from tobiasd/20151201-de

DE translations THX Abrax

8 years agoDiaspora comments/likes: The contact id and the network is now taken from the contact
Michael Vogel [Tue, 1 Dec 2015 14:36:32 +0000 (15:36 +0100)]
Diaspora comments/likes: The contact id and the network is now taken from the contact

8 years agoMerge pull request #2128 from tobiasd/20151201-issue2079
fabrixxm [Tue, 1 Dec 2015 13:33:25 +0000 (14:33 +0100)]
Merge pull request #2128 from tobiasd/20151201-issue2079

add the module to the page title

8 years agoadd the module to the page title
Tobias Diekershoff [Tue, 1 Dec 2015 13:19:06 +0000 (14:19 +0100)]
add the module to the page title

8 years agoDE translations THX Abrax
Tobias Diekershoff [Tue, 1 Dec 2015 12:56:23 +0000 (13:56 +0100)]
DE translations THX Abrax

8 years agoTab is added to "all friends" and "common friends"
Michael Vogel [Tue, 1 Dec 2015 07:12:05 +0000 (08:12 +0100)]
Tab is added to "all friends" and "common friends"

8 years agoMerge pull request #2126 from annando/1511-duplicates
Tobias Diekershoff [Tue, 1 Dec 2015 05:07:18 +0000 (06:07 +0100)]
Merge pull request #2126 from annando/1511-duplicates

Bugfix: The duplicate check sometimes seemed to have scrambled the posts

8 years agoMerge pull request #2121 from rabuzarus/3011_viewcontactstitle
Michael Vogel [Mon, 30 Nov 2015 22:29:35 +0000 (23:29 +0100)]
Merge pull request #2121 from rabuzarus/3011_viewcontactstitle

make viewcontacts part of the profile tab

8 years agoBugfix: The duplicate check sometimes seemed to have scrambled the posts
Michael Vogel [Mon, 30 Nov 2015 22:13:56 +0000 (23:13 +0100)]
Bugfix: The duplicate check sometimes seemed to have scrambled the posts

8 years agoMerge pull request #2104 from rabuzarus/2611_contacts_directory
Michael Vogel [Mon, 30 Nov 2015 17:07:35 +0000 (18:07 +0100)]
Merge pull request #2104 from rabuzarus/2611_contacts_directory

display contact information in contact and directory according to the…

8 years agochange shortcut for viewcontacts + shortcut docu
rabuzarus [Mon, 30 Nov 2015 15:23:03 +0000 (16:23 +0100)]
change shortcut for viewcontacts + shortcut docu

8 years agovier event_form: include bb-tags for editing
rabuzarus [Mon, 30 Nov 2015 15:00:41 +0000 (16:00 +0100)]
vier event_form: include bb-tags for editing

8 years agoMerge pull request #2119 from annando/1511-contact-evolution
fabrixxm [Mon, 30 Nov 2015 13:45:23 +0000 (14:45 +0100)]
Merge pull request #2119 from annando/1511-contact-evolution

Refurbished contact settings/contact posts

8 years agoMerge pull request #2124 from tobiasd/20151130-messagespo-credits
Michael Vogel [Mon, 30 Nov 2015 12:58:48 +0000 (13:58 +0100)]
Merge pull request #2124 from tobiasd/20151130-messagespo-credits

regenerated messages.po and credits.txt

8 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 30 Nov 2015 12:16:46 +0000 (13:16 +0100)]
regenerated master messages.po file

8 years agoregenerated credits.txt
Tobias Diekershoff [Mon, 30 Nov 2015 12:16:23 +0000 (13:16 +0100)]
regenerated credits.txt

8 years agoMerge pull request #2113 from annando/1511-manage-notifications
fabrixxm [Mon, 30 Nov 2015 11:04:53 +0000 (12:04 +0100)]
Merge pull request #2113 from annando/1511-manage-notifications

The manage page now shows the notifications

8 years agoMerge pull request #2120 from rabuzarus/2911_network_header
Michael Vogel [Mon, 30 Nov 2015 07:30:34 +0000 (08:30 +0100)]
Merge pull request #2120 from rabuzarus/2911_network_header

2911 network header