friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
15,181 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

387 Commits

Author SHA1 Message Date
Michael Vogel ee39aba490 Merge pull request #3043 from Quix0r/rewrites/dbm_is_result 
More usage of dbm::is_result + coding convention applied
 2017-01-07 17:09:23 +01:00
Hypolite Petovan 3caf3bccd9 Updated SSL english docs 
Fixes #1034
 2017-01-07 23:27:50 +11:00
Michael 414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
Michael 680b16d036 Added documentation 2017-01-06 07:03:35 +00:00
Roland Häder ace8f753ac added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-20 11:59:13 +01:00
Roland Häder e24c3a5b82 added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:56:34 +01:00
Roland Häder 34fcaeb209 changed to this: 
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:59:11 +01:00
Michael Vogel af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src 
Fix Friendica private image URL replacing
 2016-12-09 15:54:11 +01:00
Tobias Diekershoff 52b8474be7 in docs there was a wrong link to the issue tracker 2016-12-09 11:38:08 +01:00
Hypolite Petovan 88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src 
# Conflicts:
#	doc/htconfig.md
 2016-12-07 23:15:46 -05:00
Tobias Diekershoff a4959626ad Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content 
docu docs: some polishing
 2016-12-06 22:05:08 +01:00
rabuzarus b65433c823 docu docs: some polishing 2016-12-06 15:03:57 +01:00
Tobias Diekershoff ac5617c40c add frontend worker to the admin panel and regen master messages.po file 2016-12-06 08:44:59 +01:00
Hypolite Petovan 979fc6d38a Add protocol whitelist for href/src attributes 
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
 2016-12-03 14:19:57 -05:00
rabuzarus 7a9a1b3722 autocomplete: add [embed] tag to tag autocomplete and to docu docs 2016-12-02 19:39:35 +01:00
Michael Vogel efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing 
Add protocol docu to the help docs
 2016-11-29 19:38:31 +01:00
rabuzarus 4566ad81fd protocol.md - fix typo 2016-11-29 16:10:32 +01:00
rabuzarus 6c0bc15ecb docu fix: insert line break 2016-11-28 20:18:28 +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
Michael 636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
Michael e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00: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 bb3385a7e3 Adapted documentation for Vagrant multiple machines 2016-11-19 16:09:20 +01:00
Tobias Diekershoff 1cc0cc5b82 DE update of the SSL doc 2016-11-19 15:51:12 +01:00
Silke Meyer 5d779941e7 Updated SSL documentation 2016-11-19 13:28:45 +01:00
Tobias Diekershoff fca72c4996 DE translation of the BBCode reference, small stuff on the EN version 2016-11-09 14:05:33 +01:00
Tobias Diekershoff a6776f0cc1 Merge pull request #2885 from Hypolite/improvement/bbcode-documentation 
bbcode documentation: minor style changes
 2016-11-04 17:15:17 +01:00
Hypolite Petovan 3d29b7745c bbcode documentation: minor style changes 2016-11-04 11:20:47 -04:00
rabuzarus 75166cae27 Merge pull request #2882 from Hypolite/improvement/bbcode-documentation 
BBCodes documentation improvement
 2016-11-04 02:34:29 +01:00
Hypolite Petovan 106f003447 bbcode documentation: BBCodes.md complete rewrite 
- Switched to table display to put BBCodes and result side-by-side
- Added all missing BBCodes
 2016-11-02 22:42:19 -04:00
Hypolite Petovan 8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan bc407080d2 ping.php performance: improve documentation and formatting 2016-10-28 22:14:51 -04:00
Michael 967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance 
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
 2016-10-25 16:16:01 +00:00
Hypolite Petovan 8da5a23267 Improved doc formatting 2016-10-24 11:57:25 -04:00
Michael Vogel ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Hypolite Petovan 2ecd1f5d09 Update settings documentation 2016-10-23 07:57:40 -04:00
Hypolite Petovan 0eadc0bd51 Switched coding standards indentation doc to tabs 2016-10-22 23:01:54 -04:00
Hypolite Petovan 894d2e569b Remove binary blob 
- Remove PHP CS Fixer executable and config file
- Add reference to PHP Code Sniffer in Developer doc
 2016-10-06 21:31:26 -04:00
Hypolite Petovan 3a9be01cb6 Merge branch 'issue/#2103-alt' of https://github.com/Hypolite/friendica into issue/#2103-alt 2016-10-06 21:05:52 -04:00
Hypolite Petovan fe17ce2150 Add upgrade documentation 2016-10-05 16:39:37 -04:00
Hypolite Petovan 27f5e0343a 1 phrase per line in doc 2016-10-05 16:16:33 -04:00
Hypolite Petovan 68a39539ab Fix Issue #2301 - Typos 2016-10-03 08:54:34 -04:00
Hypolite Petovan 50b07cb46a Fix Issue #2103 - Improve developers english help page 
- Add section about coding standards
 2016-10-03 08:47:39 -04:00
Hypolite Petovan 8fc558b8e6 Fix #2817 
- Change all references to language folders
 2016-09-30 10:46:56 -04:00
gerhard6380 afc7d316a7 Change API documentation to contain new API call /api/friendica/profile/show 2016-09-23 19:26:44 +02:00
Tobias Diekershoff e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
ben-utzer 2040cb4473 Update htconfig.md 
typo, siehe auch https://github.com/friendica/friendica/pull/2754
 2016-09-05 00:22:39 +02:00
Michael Vogel 35813ab377 Set the PHP requirements to php 5.4 2016-09-01 06:47:36 +00:00
Michael Vogel 59ff309ee5 Add the new charset parameter to the database creation 2016-09-01 04:44:29 +00:00
Tobias Diekershoff bd99eedd9b Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc 2016-08-14 22:05:54 +02:00
gerhard6380 728fb76f3d adapted documentation 
removed reference to Windows 10 app
 2016-08-14 22:04:25 +02:00
gerhard6380 7daaaf0ab8 updated api documentation to reflect changes on direct_messages 
added direct_messages/destroy, friendica/direct_messages_setseen
 2016-08-14 22:04:11 +02:00
Tobias Diekershoff f79a9f67f1 DOCs we have a new developer forum 2016-08-14 09:34:50 +02:00
Tobias Diekershoff 11e3c3bfad DOCS: clarify Settings also discusses the Admin Panel 2016-08-13 12:11:27 +02:00
Michael Vogel 4b29937a74 Worker: New value for cooldown time after each function call 2016-07-13 19:43:16 +02:00
Michael Vogel 19d820a9c4 Added fcontact doc 2016-07-10 14:08:27 +02:00
Michael Vogel c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
rabuzarus 2f266382c5 code highlight - add docu 2016-06-17 11:02:27 +02:00
Tobias Diekershoff e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
Michael Vogel 1dd77ee443 Merge pull request #2569 from tobiasd/doc-settings-de 
German translation of doc/Settings
 2016-06-07 07:57:29 +02:00
Tobias Diekershoff 04594666dc Typos 2016-06-07 06:53:37 +02:00
Tobias Diekershoff 06c0588817 German translation of doc/Settings, part of #2194 2016-06-06 22:17:40 +02:00
Michael Vogel 5420c98ff0 removed some copy&paste fragments 2016-06-04 12:30:24 +02:00
Michael Vogel e33defbe3e Added documentation 2016-06-04 12:23:12 +02:00
Tobias Diekershoff 177fbd2a7c small fixes 2016-05-23 14:05:27 +02:00
Tobias Diekershoff 3df9876d74 remote_self 2016-05-23 09:05:49 +02:00
Tobias Diekershoff 8e89ba7a42 placement of the logfiles 2016-05-23 09:03:57 +02:00
Tobias Diekershoff 0a5f70acb9 Typo 2016-05-21 06:02:36 +02:00
Tobias Diekershoff aedbbdc0bf added short intoduction of the term admin panel 2016-05-20 20:09:45 +02:00
Tobias Diekershoff 0d6b49977b rewrite of the doc/settings.md 2016-05-20 20:06:37 +02:00
rabuzarus a61361f351 add some hook docu 2016-04-28 23:18:38 +02:00
Michael Vogel 76b24f61a9 New (experimental) value to define the maximum level of database connections for the worker 2016-04-23 10:11:09 +02:00
Michael Vogel ec90a9e6ad Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-24 16:19:52 +01:00
Michael Vogel 799ff77797 API: Support for the conversation api call from GNU Social 2016-03-23 10:24:01 +01:00
Michael Vogel 16b92af71f Retraction do work as well 2016-03-17 12:24:23 +01:00
Michael Vogel 56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Tobias Diekershoff b5851931d1 Hotkey documentation 2016-03-12 08:57:07 +01:00
Michael Vogel bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
fabrixxm d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile 
polishing of the contact-edit page
 2016-03-06 19:56:59 +01:00
Michael Vogel 497c40e674 Merge pull request #2383 from tobiasd/20160225 
a missing break
 2016-02-29 11:11:54 +01:00
Tobias Diekershoff 08a7802112 old location might vanish, vinzv moved the GS API docs over here 2016-02-28 08:30:45 +01:00
Tobias Diekershoff f4b0e9316e a missing break 2016-02-25 21:37:37 +01:00
Tobias Diekershoff 48642a8544 Merge pull request #2379 from annando/1602-abstract-doc 
Some documentation for the usage of the "abstract" element.
 2016-02-25 13:15:12 +01:00
Tobias Diekershoff 1b14b22b76 Client section in DeveloperIntro docs 2016-02-24 20:46:06 +01:00
Michael Vogel 68d7beb298 Welcome to the live editing and commenting of the pull request ;-) 2016-02-24 07:43:13 +01:00
Michael Vogel 8369e6ce59 Clarification between statusnet and GNU Social. 2016-02-24 07:37:18 +01:00
Michael Vogel db92663466 One line, one sentence 2016-02-24 07:33:20 +01:00
Tobias Diekershoff a153f49920 clarification to the docs 2016-02-24 06:27:31 +01:00
Michael Vogel 86339cdb97 Some documentation for the usage of the "abstract" element. 2016-02-23 22:45:06 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Tobias Diekershoff 4ee15cc682 Merge pull request #2334 from fabrixxm/feature_autoloader 
Autoloader
 2016-02-13 12:27:24 +01:00
fabrixxm a7498ef50d doc: add quick intro to autoloading 2016-02-13 10:57:37 +01:00
Fabrixxm 45c4e3455e docs: add brief autoloading help page, fix smarty3 help page name 2016-02-12 09:25:33 +01:00
Michael Vogel ef0f826fd0 Merge pull request #2325 from fabrixxm/api_ping 
Api for notifications
 2016-02-10 23:47:11 +01:00
Michael Vogel 902820b30d Added documentation 2016-02-10 07:56:49 +01:00
Fabrixxm 04dceb9551 Merge branch 'develop' into api_ping 2016-02-09 14:06:57 +01:00
rabuzarus 743f2e0391 Merge develop into 0602_contact_profile 
Conflicts:
	mod/contacts.php
 2016-02-09 13:44:30 +01:00
fabrixxm b5100b3154 Merge pull request #2332 from annando/1602-no-guid 
Get rid of the "guid" table. We don't need it anymore.
 2016-02-09 13:40:05 +01:00