1
1
Fork 0
Commit graph

13308 commits

Author SHA1 Message Date
Tobias Diekershoff 32c0a9ef43 added return value to doxygen header 2016-11-19 14:32:01 +01:00
Michael Vogel 83b30bbc78 Merge pull request #2933 from silke/develop
Updated SSL documentation
2016-11-19 14:03:06 +01:00
Silke Meyer 5d779941e7 Updated SSL documentation 2016-11-19 13:28:45 +01:00
Michael Vogel 9657fed705 Merge pull request #2927 from Hypolite/improvement/ping-php-json
ping.php performance: Add JSON output
2016-11-19 13:23:10 +01:00
rabuzarus a8d1a3f997 frio: add a very simple character counter to the jot 2016-11-18 23:48:31 +01:00
Tobias Diekershoff f4c52f5a0e send email confirming pending registration #2916 2016-11-18 20:16:22 +01:00
Tobias Diekershoff 23bc0eae29 Merge pull request #2929 from annando/1611-onepoll-priority
Polling feeds is now done with a higher priority.
2016-11-18 07:20:27 +01:00
Hypolite Petovan a6bdb2c34a overhauling proxy_url
- Decode possible HTML entities in the input URL
- Add the safe extension for the shortpath as well
- Formatting
- Documentation
2016-11-17 23:08:00 -05:00
Michael ccd484643d Polling feeds is now done with a higher priority. 2016-11-17 23:06:22 +00:00
fabrixxm 90f100578b Merge pull request #2928 from tobiasd/20161117-es
ES translation of the core THX Albert
2016-11-17 09:10:18 +01:00
Tobias Diekershoff 7aef99a4f0 ES translation of the core THX Albert 2016-11-17 07:42:41 +01:00
Hypolite Petovan c6fbb46108 ping.php performance: Add JSON output
- Added JSON/JSONP support
- Added XML backward-compatible output
- Updated main.js to handle JSON data
- Removed unused references to non-existant DOM elements
2016-11-16 23:26:43 -05:00
Tobias Diekershoff 03943cb4c0 Merge pull request #2924 from rabuzarus/1611_fix_comment_edit
Frio Bugfix: clear float at the end of comment-edit
2016-11-16 14:32:05 +01:00
rabuzarus 02a0269a67 Frio Bugfix: clear float at the end of comment-edit 2016-11-16 14:19:09 +01:00
Tobias Diekershoff 1f9469b5e3 Merge pull request #2923 from rabuzarus/1611_fix_NotificationsManager_unseen
Bugfix: avatar images for activty like was not shown on notifications page
2016-11-16 14:09:18 +01:00
rabuzarus 0f81411b26 Bugfix: avatar images for activty like was not shown notifications page 2016-11-16 13:21:13 +01:00
Michael Vogel a63e060b51 Merge pull request #2921 from rabuzarus/1611_fix_NotificationsManager_unseen
Bugfix: seen status was not handled correcty on the notifications page
2016-11-16 07:02:06 +01:00
Michael Vogel cffdca2b1a Merge pull request #2920 from rabuzarus/1611_fix_remove_baseurl
Bugfix: "remove_baseurl" wasn't work correct if called statically
2016-11-16 06:57:28 +01:00
rabuzarus e4a625ad12 Bugfix: seen status was not handled correcty on the notifications page 2016-11-16 04:57:55 +01:00
rabuzarus 262a149cab Bugfix: "remove_baseurl" wasn't work correct if called statically 2016-11-16 01:14:14 +01:00
rabuzarus 7729e6cfb4 Merge pull request #2919 from annando/1611-ssl-plink
Bugfix: "remove_baseurl" accidentally normalized all links
2016-11-16 00:33:39 +01:00
Michael 740aaa69f5 Bugfix: "remove_baseurl" accidentally normalized all links 2016-11-15 21:56:28 +00:00
fabrixxm 4eccdd7251 Merge pull request #2917 from annando/issue-2914
Bugfix: Avoid warning when posting items and the worker isn't active
2016-11-15 14:14:00 +01:00
Michael 85875fc07f Bugfix: Avoid warning when posting items and the worker isn't active 2016-11-15 11:52:01 +00:00
Tobias Diekershoff b628e82465 Merge pull request #2910 from annando/1611-slinky
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
Tobias Diekershoff 44d79cbc27 Merge pull request #2911 from annando/1611-well-formatted-uri
URI of "remote self" are looking better now.
2016-11-15 09:53:14 +01:00
Michael d4e3bc1924 Added documentation 2016-11-15 07:05:43 +00:00
Tobias Diekershoff 2ecf2723c8 Merge pull request #2913 from rabuzarus/1411_fix_photo_permissions
fix photos page permissions
2016-11-14 20:22:48 +01:00
rabuzarus 9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
Michael Vogel b7dbecd5e3 Merge pull request #2912 from sesom42/develop
fixes an sql syntax error in NotificationsManager
2016-11-14 10:37:22 +01:00
Jens Tautenhahn 31ad26aae2 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-14 09:52:01 +01:00
Jens Tautenhahn d92c9a444f Revert "count only version numbers starting with "numbers / dot or dash / numbers" in federation statistics"
This reverts commit 7b5c5c0fa2.
2016-11-14 09:48:19 +01:00
Michael 88d073f3d9 URI of "remote self" are looking better now. 2016-11-14 06:55:17 +00:00
Michael 5ef688f1d2 Case correction 2016-11-14 05:44:18 +00:00
Tobias Diekershoff 717997b14f Merge pull request #2906 from annando/1611-parseurl
Improvements to page_info (bad ssl, bad formatted url)
2016-11-14 06:41:04 +01:00
Michael 3de7b6d6ce Several shorteners doesn't work anymore 2016-11-13 19:19:35 +00:00
Michael 1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael 6dfaa5a95f Some more standard stuff 2016-11-13 19:09:47 +00:00
rabuzarus fa7f0cac71 Merge pull request #2909 from annando/1611-diaspora-location
Bugfix: Locations without coordinates aren't good for Diaspora
2016-11-13 19:50:51 +01:00
Michael e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael Vogel fe46533e3f Merge pull request #2908 from tobiasd/20161113-de
DE translation of the core THX Andreas
2016-11-13 19:16:30 +01:00
Michael 26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Tobias Diekershoff deaf82cfd0 DE translation of the core THX Andreas 2016-11-13 11:23:19 +01:00
Michael 2937df21ad Standard stuff 2016-11-13 08:50:01 +00:00
Michael Vogel ce96624452 Merge pull request #2899 from tobiasd/20161109-stats
prepare for Mastodon in the federation stats and include BlaBlaNet
2016-11-13 09:42:42 +01:00
Tobias Diekershoff df3c776e1b shorter foreach loop 2016-11-13 09:03:22 +01:00
Tobias Diekershoff 772d33342c add unkown to empty version strings 2016-11-13 08:12:09 +01:00
Tobias Diekershoff 32b2d9952b some platforms don't provide version information 2016-11-13 07:03:38 +01:00
Michael e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
Tobias Diekershoff 724f9c80e7 Merge pull request #2905 from annando/1611-performance-again
Performance improvements when storing items (via API)
2016-11-12 19:06:36 +01:00