]>
git.mxchange.org Git - friendica.git/log
Johannes Schwab [Mon, 7 Dec 2015 23:10:12 +0000 (00:10 +0100)]
fix path for photo and proxy
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)
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)
fabrixxm [Mon, 7 Dec 2015 22:24:55 +0000 (23:24 +0100)]
Update FRIENDICA_VERSION
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
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
Michael Vogel [Mon, 7 Dec 2015 20:45:33 +0000 (21:45 +0100)]
Vier: The line-height seems to make problems with windows
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
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
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)
Michael Vogel [Sun, 6 Dec 2015 21:01:20 +0000 (22:01 +0100)]
Issue 1924: New configuration value for permitting crawler access
Michael Vogel [Sun, 6 Dec 2015 19:05:57 +0000 (20:05 +0100)]
Bugfix for pull request #2147 (Fix for issue #2122)
Michael Vogel [Sun, 6 Dec 2015 19:04:33 +0000 (20:04 +0100)]
Some better logging
Michael Vogel [Sun, 6 Dec 2015 17:57:23 +0000 (18:57 +0100)]
Code beautification
Michael Vogel [Sun, 6 Dec 2015 17:52:19 +0000 (18:52 +0100)]
Workaround for misconfigured Friendica servers
Michael Vogel [Sun, 6 Dec 2015 15:40:31 +0000 (16:40 +0100)]
Move the process check at the beginning of the script
Michael Vogel [Sun, 6 Dec 2015 15:28:28 +0000 (16:28 +0100)]
Double check for maximum number of workers
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
Michael Vogel [Sun, 6 Dec 2015 11:15:31 +0000 (12:15 +0100)]
probe_url: Only cache successful results
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
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
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
Michael Vogel [Sat, 5 Dec 2015 23:18:59 +0000 (00:18 +0100)]
Issue 1921: Disable the auto update
Michael Vogel [Sat, 5 Dec 2015 22:29:42 +0000 (23:29 +0100)]
Issue 1871: Show an information if a group is empty
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
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
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
Tobias Diekershoff [Fri, 4 Dec 2015 20:31:33 +0000 (21:31 +0100)]
SV messages.po regenerated from strings.php
Tobias Diekershoff [Fri, 4 Dec 2015 19:52:58 +0000 (20:52 +0100)]
Merge pull request #2144 from fabrixxm/quattro
Work on Quattro
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.
fabrixxm [Fri, 4 Dec 2015 19:43:35 +0000 (20:43 +0100)]
quattro: some love to events pages
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
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
fabrixxm [Fri, 4 Dec 2015 18:57:19 +0000 (19:57 +0100)]
Quattro: Rss icon for atom feed link in profile
fabrixxm [Fri, 4 Dec 2015 18:29:13 +0000 (19:29 +0100)]
quattro: hide acl button in edit post
fix #1780
fabrixxm [Fri, 4 Dec 2015 17:59:50 +0000 (18:59 +0100)]
Fix contact popup with tinyMCE
Fix #1920
Fabrixxm [Fri, 4 Dec 2015 14:47:41 +0000 (15:47 +0100)]
Fix generated po headers
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
Fabrixxm [Fri, 4 Dec 2015 14:01:46 +0000 (15:01 +0100)]
Add support for attending an event to frost themes
fix #1953
Fabrixxm [Fri, 4 Dec 2015 13:09:17 +0000 (14:09 +0100)]
Rewrite util/php2po.php
Fix #2046
Michael Vogel [Fri, 4 Dec 2015 06:07:34 +0000 (07:07 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
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
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
Michael Vogel [Fri, 4 Dec 2015 05:50:23 +0000 (06:50 +0100)]
The preview picture can now be remote or local
Michael Vogel [Fri, 4 Dec 2015 05:05:12 +0000 (06:05 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
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
Michael Vogel [Fri, 4 Dec 2015 04:57:33 +0000 (05:57 +0100)]
OStatus: Picture posts are reformatted
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
Michael Vogel [Fri, 4 Dec 2015 04:47:59 +0000 (05:47 +0100)]
Merge pull request #2135 from rabuzarus/doxygen
Code reference in help
rabuzarus [Thu, 3 Dec 2015 21:51:00 +0000 (22:51 +0100)]
ping: docu fix
rabuzarus [Thu, 3 Dec 2015 21:42:53 +0000 (22:42 +0100)]
ping: further work
rabuzarus [Thu, 3 Dec 2015 20:22:13 +0000 (21:22 +0100)]
doxygen: correct mistake - .gitignore shouldn't be submitted
rabuzarus [Thu, 3 Dec 2015 16:30:34 +0000 (17:30 +0100)]
doxygen: delete wrong commited file
rabuzarus [Thu, 3 Dec 2015 16:15:49 +0000 (17:15 +0100)]
ping: cleanup
rabuzarus [Thu, 3 Dec 2015 15:17:25 +0000 (16:17 +0100)]
doxygen: exclude some more folders
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
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
Michael Vogel [Thu, 3 Dec 2015 07:35:47 +0000 (08:35 +0100)]
Support for a new Diaspora command for post retraction
rabuzarus [Wed, 2 Dec 2015 23:11:18 +0000 (00:11 +0100)]
little cleanup: insert new line at the end
rabuzarus [Wed, 2 Dec 2015 23:08:43 +0000 (00:08 +0100)]
remove unneeded function page_type_translate()
rabuzarus [Wed, 2 Dec 2015 23:06:11 +0000 (00:06 +0100)]
added code reference to docs
rabuzarus [Wed, 2 Dec 2015 19:01:22 +0000 (20:01 +0100)]
photos-albms widget: add some classes
Michael Vogel [Wed, 2 Dec 2015 06:56:10 +0000 (07:56 +0100)]
Added/Changed accesskeys for the new tab actions
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
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
rabuzarus [Tue, 1 Dec 2015 20:07:05 +0000 (21:07 +0100)]
photos-albms widget: add some classes
rabuzarus [Tue, 1 Dec 2015 18:47:23 +0000 (19:47 +0100)]
unify hcard and vcard: make $pdesc available in hcard&vcard
Michael Vogel [Tue, 1 Dec 2015 18:02:03 +0000 (19:02 +0100)]
Unifying the texts.
rabuzarus [Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)]
Merge develop into 3011_hcard_vcard
rabuzarus [Tue, 1 Dec 2015 17:31:08 +0000 (18:31 +0100)]
unify hcard and vcard
Michael Vogel [Tue, 1 Dec 2015 17:21:05 +0000 (18:21 +0100)]
Header removed in the contact area
Michael Vogel [Tue, 1 Dec 2015 16:16:31 +0000 (17:16 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
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
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 …
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
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
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
Tobias Diekershoff [Tue, 1 Dec 2015 13:19:06 +0000 (14:19 +0100)]
add the module to the page title
Tobias Diekershoff [Tue, 1 Dec 2015 12:56:23 +0000 (13:56 +0100)]
DE translations THX Abrax
Michael Vogel [Tue, 1 Dec 2015 07:12:05 +0000 (08:12 +0100)]
Tab is added to "all friends" and "common friends"
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
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
Michael Vogel [Mon, 30 Nov 2015 22:13:56 +0000 (23:13 +0100)]
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
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…
rabuzarus [Mon, 30 Nov 2015 15:23:03 +0000 (16:23 +0100)]
change shortcut for viewcontacts + shortcut docu
rabuzarus [Mon, 30 Nov 2015 15:00:41 +0000 (16:00 +0100)]
vier event_form: include bb-tags for editing
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
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
Tobias Diekershoff [Mon, 30 Nov 2015 12:16:46 +0000 (13:16 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Mon, 30 Nov 2015 12:16:23 +0000 (13:16 +0100)]
regenerated credits.txt
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
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
Michael Vogel [Mon, 30 Nov 2015 07:25:11 +0000 (08:25 +0100)]
Some SQL improvements
rabuzarus [Mon, 30 Nov 2015 02:25:23 +0000 (03:25 +0100)]
make viewcontacts part of the profile tab
rabuzarus [Mon, 30 Nov 2015 00:24:22 +0000 (01:24 +0100)]
networkheader: do css work the other supported themes
Michael Vogel [Sun, 29 Nov 2015 22:46:10 +0000 (23:46 +0100)]
Show contact comments in the post
Michael Vogel [Sun, 29 Nov 2015 22:36:19 +0000 (23:36 +0100)]
Removing of useless code
Michael Vogel [Sun, 29 Nov 2015 22:33:32 +0000 (23:33 +0100)]
Use the template for the header.
Michael Vogel [Sun, 29 Nov 2015 22:22:05 +0000 (23:22 +0100)]
Redesign of the contact pages, new tab for contact statuses
Tobias Diekershoff [Sun, 29 Nov 2015 22:19:12 +0000 (23:19 +0100)]
Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
projects / friendica.git / log