]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Tue, 15 Dec 2015 14:47:09 +0000 (15:47 +0100)]
Merge pull request #2189 from rabuzarus/1512_vier_images
vier: fix missing icons
rabuzarus [Tue, 15 Dec 2015 14:13:46 +0000 (15:13 +0100)]
vier: fix missing icons
Michael Vogel [Tue, 15 Dec 2015 13:53:06 +0000 (14:53 +0100)]
Merge pull request #2188 from rabuzarus/1512_allfriends_pager
add pager to common friends and allfriends
rabuzarus [Tue, 15 Dec 2015 13:31:24 +0000 (14:31 +0100)]
add pager to common friends and allfriends
Tobias Diekershoff [Tue, 15 Dec 2015 07:09:41 +0000 (08:09 +0100)]
Merge pull request #2186 from annando/1512-profile-bbcode
Bugfix: The bbcode conversion of the profile was inconsistent
Michael Vogel [Mon, 14 Dec 2015 23:11:19 +0000 (00:11 +0100)]
Just one more place where we had forgotten to use the bbcode function for the about text
Michael Vogel [Mon, 14 Dec 2015 22:53:35 +0000 (23:53 +0100)]
Bugfix: The bbcode conversion of the profile was inconsistent
Michael Vogel [Mon, 14 Dec 2015 22:02:49 +0000 (23:02 +0100)]
The "about" in feed has to be rendered as HTML
fabrixxm [Mon, 14 Dec 2015 16:04:02 +0000 (17:04 +0100)]
Merge pull request #2185 from tobiasd/
20151214-translations
update to translation for DE, FR; IT
Tobias Diekershoff [Mon, 14 Dec 2015 15:56:40 +0000 (16:56 +0100)]
IT update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:30:28 +0000 (16:30 +0100)]
FR update to the strings
Tobias Diekershoff [Mon, 14 Dec 2015 15:27:00 +0000 (16:27 +0100)]
DE update to the strings
fabrixxm [Mon, 14 Dec 2015 14:21:14 +0000 (15:21 +0100)]
Merge pull request #2183 from rabuzarus/1412_profile_addr_fix
fix displaying forum in hcard
rabuzarus [Mon, 14 Dec 2015 13:12:56 +0000 (14:12 +0100)]
fix account_type
Tobias Diekershoff [Mon, 14 Dec 2015 06:57:44 +0000 (07:57 +0100)]
Merge pull request #2178 from annando/1512-slapper-400
OStatus: Make sure that mentions are always accepted
Michael Vogel [Sun, 13 Dec 2015 13:10:18 +0000 (14:10 +0100)]
OStatus: Make sure that mentions are always accepted
Tobias Diekershoff [Sun, 13 Dec 2015 09:22:13 +0000 (10:22 +0100)]
Merge pull request #2176 from annando/1512-warning
Bugfix: Notice because of undefined constant
Michael Vogel [Sun, 13 Dec 2015 08:43:47 +0000 (09:43 +0100)]
Bugfix: Warning because of undefined constant
fabrixxm [Sun, 13 Dec 2015 08:21:03 +0000 (09:21 +0100)]
Merge pull request #2172 from tobiasd/
20151212-frosticons
added event icons from frost-mobile to frost
Tobias Diekershoff [Sun, 13 Dec 2015 07:32:03 +0000 (08:32 +0100)]
Merge pull request #2173 from annando/1512-optimize-fragmentation
There is now a fragmentation level for the table optimization
Tobias Diekershoff [Sun, 13 Dec 2015 07:30:43 +0000 (08:30 +0100)]
Merge pull request #2174 from annando/1512-ostatus-subscribe
Bugfix: OStatus subscription worked by random until now ...
Tobias Diekershoff [Sun, 13 Dec 2015 07:09:53 +0000 (08:09 +0100)]
resized icons to 16px
Michael Vogel [Sat, 12 Dec 2015 16:55:57 +0000 (17:55 +0100)]
Bugfix: The subscribe process took the own contact by random ...
Michael Vogel [Sat, 12 Dec 2015 16:46:24 +0000 (17:46 +0100)]
There is now a fragmentation level for the table optimisation
Michael Vogel [Sat, 12 Dec 2015 16:41:25 +0000 (17:41 +0100)]
Code cleaning, real changes will follow
Tobias Diekershoff [Sat, 12 Dec 2015 05:23:54 +0000 (06:23 +0100)]
added event icons from frost-mobile to frost
Tobias Diekershoff [Sat, 12 Dec 2015 04:56:27 +0000 (05:56 +0100)]
Merge pull request #2171 from rabuzarus/1212_directory_fix
fix directory search
rabuzarus [Sat, 12 Dec 2015 00:27:31 +0000 (01:27 +0100)]
fix directory search
Tobias Diekershoff [Fri, 11 Dec 2015 18:45:09 +0000 (19:45 +0100)]
Merge pull request #2170 from fabrixxm/issue_1953
missing frost-mobile event icons
fabrixxm [Fri, 11 Dec 2015 18:38:00 +0000 (19:38 +0100)]
missing frost-mobile event icons
Michael Vogel [Fri, 11 Dec 2015 10:23:49 +0000 (11:23 +0100)]
Merge pull request #2169 from tobiasd/
20151211-FR
update to the French translation
Tobias Diekershoff [Fri, 11 Dec 2015 07:11:16 +0000 (08:11 +0100)]
Merge pull request #2168 from annando/1512-contact-posts
Bugfix: Posts weren't always shown for feeds that start with "www."
Tobias Diekershoff [Fri, 11 Dec 2015 07:10:23 +0000 (08:10 +0100)]
Merge pull request #2167 from annando/1512-profile-aside
Sometimes there wasn't a linebreak before the address in the profile
Tobias Diekershoff [Fri, 11 Dec 2015 07:04:35 +0000 (08:04 +0100)]
regenerated credits.txt
Tobias Diekershoff [Fri, 11 Dec 2015 07:03:09 +0000 (08:03 +0100)]
FR update to the strings THX Perig
Michael Vogel [Thu, 10 Dec 2015 21:47:58 +0000 (22:47 +0100)]
Bugfix: Posts weren't always shown for feeds that start with "www."
Michael Vogel [Thu, 10 Dec 2015 20:39:44 +0000 (21:39 +0100)]
Sometimes there wasn't a linebreak before the address in the profile
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
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
rabuzarus [Thu, 10 Dec 2015 12:30:11 +0000 (13:30 +0100)]
vier: fix little misspelling
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
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
Michael Vogel [Tue, 8 Dec 2015 18:53:01 +0000 (19:53 +0100)]
Avoid problems with wrong configured server variables
Michael Vogel [Tue, 8 Dec 2015 18:41:27 +0000 (19:41 +0100)]
Do a linebreak before the output of rendertime
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
projects / friendica.git / log