Commit graph

13234 commits

Author SHA1 Message Date
rabuzarus 4566ad81fd protocol.md - fix typo 2016-11-29 16:10:32 +01:00
rabuzarus a68735b725 update contact request $ confirmation graphics 2016-11-29 16:00:07 +01:00
rabuzarus 6c0bc15ecb docu fix: insert line break 2016-11-28 20:18:28 +01:00
rabuzarus 3cb9324072 frio: some css work for help docs 2016-11-28 18:40:25 +01:00
rabuzarus 36e4aea7ef docs: add documentation about used protocols 2016-11-28 17:55:56 +01:00
rabuzarus 76ca015497 update link in the docs to dfrn specs + h3 headings (instead of h2 headings) in message_flow doc 2016-11-28 16:59:23 +01:00
rabuzarus 14c84b92cc restructure some links in the help docs to have a better seperation between admin and developer docu 2016-11-28 16:57:50 +01:00
rabuzarus ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
rabuzarus a7fbc994e0 update spec file 2016-11-28 15:49:21 +01:00
Tobias Diekershoff 425bd83c8d Merge pull request #2974 from rabuzarus/2511_frio_fix_default_js_arg
Frio Bugfix: correct wrong use of default arg 'title' in modal.js
2016-11-25 23:29:26 +01:00
rabuzarus 5068563cf5 small code formatting correction 2016-11-25 19:18:01 +01:00
rabuzarus a194c44de9 Frio Bugfix: correct wrong use of default arg 'title' in modal.js 2016-11-25 19:13:40 +01:00
rabuzarus 5e466aade0 Merge pull request #2972 from annando/1611-term-date
Delivery to other systems was needlessly deferred.
2016-11-24 22:14:09 +01:00
Michael ba1a304589 Delivery to other systems was needlessly deferred. 2016-11-24 03:34:11 +00:00
Michael Vogel 4eeb5a0a17 Merge pull request #2969 from gerhard6380/develop
Develop
2016-11-23 05:13:31 +01:00
gerhard6380 a0a26a830f reverse change in proxy.php (issue with proxied images is within c#/uwp of windows, not in Friendica server) 2016-11-23 00:14:45 +01:00
gerhard6380 41ab4479fa Corrections of duplicate entries in states (Albania, Bemruda, Laos, Hungary, Kiribati, Moldova, Taiwan) 2016-11-23 00:07:21 +01:00
Michael Vogel 61da46677d Merge pull request #2967 from Hypolite/issue/#2955
ping.php: Prevent $register_count from being undefined
2016-11-22 21:00:34 +01:00
Hypolite Petovan e0322546d8 ping.php improvement: Prevent $register_count from being undefined 2016-11-22 14:17:05 -05:00
Tobias Diekershoff 22732fef12 Merge pull request #2966 from annando/1611-myisam
Bugfix: We should only search in the current database for MyISAM tables
2016-11-22 17:53:01 +01:00
Michael edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
Tobias Diekershoff 754de768f2 Merge pull request #2960 from Hypolite/issue/#2955
ping.php Fix confusion between count vars and array vars
2016-11-22 08:13:36 +01:00
rabuzarus 67f966a0b1 Merge pull request #2954 from tobiasd/20161121-de
DE, ES translation of the core THX Andreas and Albert
2016-11-21 22:05:23 +01:00
Hypolite Petovan cc242d52f8 ping.php Fix confusion between count vars and array vars 2016-11-21 16:02:36 -05:00
Tobias Diekershoff 01b46f5ec0 ES translation of the core THX Albert 2016-11-21 18:35:17 +01:00
Tobias Diekershoff e375517a31 DE translation of the core THX Andreas 2016-11-21 11:45:19 +01:00
Michael Vogel 46ba1a46f5 Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
chache: check for valid serialized data + uncomment caching of contac…
2016-11-21 04:04:36 +01:00
rabuzarus 282de40452 Merge pull request #2953 from tobiasd/20161120-regenmsgHackathon
regenerated master messages.po files after Hackathon 2016
2016-11-21 00:40:25 +01:00
Tobias Diekershoff 9f428bb264 regenerated master messages.po files after Hackathon 2016 2016-11-20 21:47:51 +01:00
Tobias Diekershoff 0628068977 Merge pull request #2952 from annando/issue-2772
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 17:56:05 +01:00
Michael 3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
rabuzarus 721ac5fb9e cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
Michael Vogel b33e817586 Merge pull request #2951 from tobiasd/20161120-mysql
add MySQL warning in admin panel
2016-11-20 17:09:49 +01:00
Tobias Diekershoff dd4a23070c Merge pull request #2950 from rabuzarus/berlin_fix_post_preview
Bugfix: preview has sometimes phantom mentions and tags
2016-11-20 16:46:31 +01:00
Tobias Diekershoff c99c98ab8b script is moved 2016-11-20 16:33:56 +01:00
Tobias Diekershoff 97c6f668e6 add a warning to the admin panel when the MySQL version is problematic 2016-11-20 16:32:38 +01:00
rabuzarus 66341046d2 Bugfix: preview has sometimes phantom mentions and tags 2016-11-20 16:19:55 +01:00
Tobias Diekershoff b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00
Tobias Diekershoff 1e40cdd1d4 Merge pull request #2947 from annando/1611-nowarn-insecure
The warning if a group contains members of several network types can …
2016-11-20 16:00:29 +01:00
Tobias Diekershoff 59c12db020 Merge pull request #2949 from silke/vagrant-1604
Added Vagrant for Ubuntu 16.04
2016-11-20 15:39:31 +01:00
Silke Meyer d0d746a3be Switched to a vagrant box that works for Ubuntu Xenial 2016-11-20 15:32:57 +01:00
Silke Meyer 2308a7d33e Vagrant does not download addons by default 2016-11-20 15:32:17 +01:00
Michael 7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Michael Vogel 7ca4648ffd Merge pull request #2945 from tobiasd/20161119-admindbwarn
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
Tobias Diekershoff 38f9fab6c4 mysql keywords 2016-11-20 10:44:54 +01:00
Tobias Diekershoff 20f987e814 Merge pull request #2946 from annando/1611-bugfix-groups
Bugfix: Filtering by group has to be done with the contact id in the thread table
2016-11-20 10:39:01 +01:00
Michael 68a31e084a Bugfix: Filtering by group has always to be done with the contact id in the thread table 2016-11-20 09:24:56 +00:00
Tobias Diekershoff 7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
Tobias Diekershoff 24d31d3092 Merge pull request #2944 from annando/1611-bugfix-utf8
Avoid UTF8 warning in mod/proxy.php
2016-11-20 09:44:38 +01:00
Michael d6be33cbbb Avoid UTF8 warning in mod/proxy.php 2016-11-20 08:30:30 +00:00