Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 21:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
25458 commits 3 branches 64 tags 246 MiB
Commit graph

761 commits

Author SHA1 Message Date
Tobias Diekershoff
c8928c4dad added missing topics to DE FAQ 2018-01-10 08:24:06 +01:00
Tobias Diekershoff
32871c5f79 one sentence per line 2018-01-10 08:23:38 +01:00
Tobias Diekershoff
f8f4044f06 missing word 2018-01-10 07:32:49 +01:00
Tobias Diekershoff
e4c99a5a33 updated DE SSL doc by missing section from EN file (see #3955) 2018-01-10 07:26:46 +01:00
Tobias Diekershoff
fc890e9869 use same intendation in entire docs file 2018-01-10 07:25:26 +01:00
Tobias Diekershoff
92049e20fa added howto manually check DB structure to the FSQ 2018-01-10 07:23:59 +01:00
Hypolite Petovan
390d5706f4
Merge pull request #4123 from Rudloff/feature/ruleset 
Custom PHPCS ruleset
 2018-01-08 09:14:46 -05:00
rabuzarus
9db936013c add registered-users to the db docu 2018-01-08 14:57:50 +01:00
rebeka-catalina
f4707d03d9 Removed directory setting from htconfig.md and changed the example 2018-01-08 10:46:33 +01:00
Michael Vogel
066b776dcc
Merge pull request #4166 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix unused code issues in boot and include
 2018-01-04 20:59:07 +01:00
Hypolite Petovan
0dd664f54b Review change 
- Remove htconfig doc for admin panel setting
 2018-01-04 13:27:59 -05:00
Hypolite Petovan
d1b3b7fbe4 Review changes 
- Remove doc for unused config value
- Restore api_get_user($a) calls
 2018-01-04 13:26:09 -05:00
Pierre Rudloff
de5dae0751 Basic support for account/update_profile API (fixes #4094) 2017-12-25 21:10:26 +01:00
Pierre Rudloff
c7544e41c0 Update doc to show how to use new ruleset 2017-12-24 00:40:40 +01:00
Pierre Rudloff
833815bff5 Lint doc/Developers-Intro.md 2017-12-24 00:39:42 +01:00
Pierre Rudloff
e982d68370
Update api.md 
account/update_profile_background_image was listed twice
 2017-12-22 23:56:13 +01:00
Pierre Rudloff
30cb37cda5 Implement saved_searches/list API 2017-12-19 14:22:38 +01:00
Pierre Rudloff
c9d1d6803d
Update api.md 
search/tweets is implemented
 2017-12-19 14:01:03 +01:00
Pierre Rudloff
cf063b2045 Lint doc/api.md 2017-12-19 12:18:38 +01:00
Pierre Rudloff
e11190b4cf Implement friendships/incoming and users/lookup APIs 2017-12-18 23:51:03 +01:00
Hypolite Petovan
7a6706b0f7
Merge pull request #4097 from Rudloff/feature/search_api 
Implement search API (fixes #929)
 2017-12-18 09:28:33 -05:00
Hypolite Petovan
86922c4821
Merge pull request #4101 from Rudloff/feature/block_api 
Implement the blocks/list API
 2017-12-18 09:27:35 -05:00
Pierre Rudloff
3e4af13772 Implement the blocks/list API 2017-12-18 15:20:42 +01:00
Pierre Rudloff
bd427c40f1
Update Developers-Intro.md 
GitHub does not display titles correctly if there isn't a space after `#`.
 2017-12-18 13:09:03 +01:00
Pierre Rudloff
4a5d988d8c Implement search API (fixes #929) 2017-12-18 13:05:27 +01:00
Hypolite Petovan
dcc0a77949 Add doc entry for statuses/networkpublic_timeline api 2017-12-17 08:51:57 -05:00
Michael
8db5b121ff Prevent the running of multiple xmpp auth daemons at a time 2017-12-09 09:46:21 +00:00
Hypolite Petovan
eeee65136c Remove obsolete fserver and ffinder db table doc 2017-12-06 23:11:06 -05:00
Hypolite Petovan
fe93029914 Remove unused table documentation 2017-12-06 18:27:55 -05:00
Michael
4268f42412 Grammar ... 2017-12-06 20:26:33 +00:00
Michael
e272a5b847 Added documentation 2017-12-06 20:23:39 +00:00
Michael
925c03fda8 Retrieve data about Mastodon servers 2017-12-06 20:09:59 +00:00
Tobias Diekershoff
9f845b0279 Events doc is not in DE, but had a from link to the doc home page 2017-11-28 14:29:50 +01:00
Tobias Diekershoff
2bf8ebaab9 this and should be an or 2017-11-26 15:19:40 +01:00
Tobias Diekershoff
797aac9a3b Events docs had an obsolete paragraph 2017-11-26 00:59:27 +01:00
Hypolite Petovan
e74d9d1113
Merge pull request #3957 from tobiasd/20171125-docEvents 
calendar documentation
 2017-11-25 17:58:16 -05:00
Tobias Diekershoff
add6f85cdf added German translation to the events documentation, THX Ratten 2017-11-25 22:57:00 +01:00
Tobias Diekershoff
5c7694d00e export cal is now in core 2017-11-25 21:57:19 +01:00
Tobias Diekershoff
9bb1be91d9 updated links to Friendiqa 2017-11-25 21:43:36 +01:00
Silke Meyer
21a3a6f45b Markdown formatting and minor changes 2017-11-25 17:26:36 +01:00
Michael
4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael
731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Tobias Diekershoff
4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff
3948539495 add docs for the show_global_community_hint option 2017-11-10 20:24:05 +01:00
Adam Magness
aa13302bbc Review updates 
Documentation and yet another use statement
 2017-11-08 08:37:03 -05:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Tobias Diekershoff
ea4fb53f80 updated client list in FAQ 2017-11-08 09:20:20 +01:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Hypolite Petovan
c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff
a1fcff67f2 added some EN docs 2017-11-05 08:46:41 +01:00
Michael
d2dc61c246 Logging for ejabberd authentication is now done via syslog 2017-11-04 08:36:42 +00:00
Michael
c31d382e7d Added documentation 2017-10-31 21:11:30 +00:00
Michael
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Tobias Diekershoff
55e2f49268 also mention Transifex as tool to use near the translation example 2017-10-17 22:48:33 +02:00
Michael
9286f5cf31 Added documentation 2017-10-13 10:49:51 +00:00
Tobias Diekershoff
77471bccd3 changed links 2017-10-08 11:40:06 +02:00
Tobias Diekershoff
74eb0ae923 move to forum.friendi.ca 2017-10-08 11:38:26 +02:00
Tobias Diekershoff
8b9ce4a0ec move to forum.friendi.ca 2017-10-08 11:25:35 +02:00
Tobias Diekershoff
2bcd5b3243 Merge pull request #3757 from silke/develop 
Develop
 2017-10-05 07:55:00 +00:00
Silke Meyer
56bfb0f45a Updated MySQL and PHP requirements in documentation 2017-10-04 21:57:49 +02:00
Silke Meyer
ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop 2017-10-04 21:28:35 +02:00
Silke Meyer
eadeb3ed21 Fixed settings for test mysql database and updated documentation 2017-10-04 20:25:15 +02:00
Michael
bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Michael
03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
Tobias Diekershoff
7b89168f89 missing linebreaks 2017-09-24 12:05:28 +02:00
Tobias Diekershoff
1353417182 minor rephrasing 2017-09-24 11:04:24 +02:00
Tobias Diekershoff
1085487c0e missing linebreak and a typo 2017-09-24 11:00:16 +02:00
Tobias Diekershoff
592884467b added missing linebreak 2017-09-24 10:55:08 +02:00
Tobias Diekershoff
d0dfcc71a8 missing linebreaks and a small typo 2017-09-24 10:52:14 +02:00
Tobias Diekershoff
9006a678c0 added missing link to translation docs 2017-09-24 10:51:43 +02:00
Tobias Diekershoff
fb7ce8b82e missing line break 2017-09-21 09:54:52 +02:00
Tobias Diekershoff
4715495df1 added missing line breaks 2017-09-21 09:53:46 +02:00
Tobias Diekershoff
65ff646182 a README would be nice 2017-09-21 09:45:17 +02:00
Tobias Diekershoff
5b65bf2c9f added a note about Diaspora account movements 2017-09-21 09:42:02 +02:00
Tobias Diekershoff
0d9e974122 use typo.php to check before PR 2017-09-21 09:38:03 +02:00
Tobias Diekershoff
ec95fb5c8d clarification 2017-09-21 09:37:23 +02:00
Tobias Diekershoff
ac28cb9532 missing line breaks and some updates 2017-09-21 09:36:52 +02:00
Tobias Diekershoff
1dcc9e4d74 added link to the Wikipedia page about access keys 2017-09-21 09:36:18 +02:00
Tobias Diekershoff
37e6651f9f that place is long gone, and a typo 2017-09-20 19:26:15 +02:00
Michael
7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
Tobias Diekershoff
02ff6b77bc php xml package is required and sometimes not installed by default 2017-09-06 21:05:10 +02:00
Michael
21b239cbc7 Documentation was updated. (Reference to poormancron removed) 2017-08-25 02:49:25 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Tobias Diekershoff
7d97171eec include the delete item page in the docs for the admin panel 2017-07-23 19:51:03 +02:00
Tobias Diekershoff
29e9705d26 Update Install.md 2017-07-02 07:52:07 +02:00
Tobias Diekershoff
1a7dce6814 Update Install.md 2017-06-30 13:16:29 +02:00
Tobias Diekershoff
dd250174b8 Let there be... 2017-06-30 10:38:11 +02:00
Tobias Diekershoff
076cf702b0 Added a short usage example of exportet profile data 2017-06-28 15:11:35 +02:00
Tobias Diekershoff
22a2c3b9bf added a short note about backups to the INSTALL files 2017-06-28 15:10:57 +02:00
Hypolite Petovan
ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 
Coding convention applied split 2-6-2 (of 2-14-2)
 2017-06-18 18:44:34 -04:00
Michael
fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
Michael
cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Roland Häder
4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Michael
a056afd566 Small corrections 2017-06-13 20:51:24 +00:00
Michael
06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster 
Conflicts:
	include/poller.php
 2017-06-11 07:49:34 +00:00
Tobias Diekershoff
1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Michael
d419962dbf Added documentation 2017-06-08 20:50:25 +00:00
Tobias Diekershoff
0489c04a43 spacing not tabs 2017-06-08 15:03:04 +02:00
Tobias Diekershoff
a9b948d6f9 added hints how to specify a port for the database connection 2017-06-08 15:00:50 +02:00
Hypolite Petovan
98d1051583 Updated documentation with the new coding standard 2017-06-07 22:01:27 -04:00
Michael
6161ceff64 Merge remote-tracking branch 'upstream/develop' into 1706-lock 2017-06-07 05:28:37 +00:00
Michael
611d3e3f5d Added documentation 2017-06-06 17:41:01 +00:00
Michael
de9cddc82f Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced 2017-06-06 17:30:40 +00:00
Michael
286b2da7a9 Added documentation and renamed function 2017-06-06 17:25:28 +00:00
Hypolite Petovan
cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Michael
d649873f80 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-24 20:55:12 +00:00
Michael
d2dd0b3248 Minimal poll intervall 2017-05-24 08:21:05 +00:00
Michael
ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
Michael
44efdc3e1b Central item expiration routine for external items 2017-05-20 20:02:06 +00:00
Tobias Diekershoff
b6d646cb85 removed some more files from doc/de 2017-05-20 11:24:28 +02:00
Tobias Diekershoff
09b5fea371 removed de/andfinally from docs 2017-05-20 11:22:47 +02:00
Tobias Diekershoff
617c094beb links in BBCode docs 2017-05-20 11:20:31 +02:00
Tobias Diekershoff
2e9ab15583 links in Account Basics 2017-05-20 11:12:51 +02:00
Thomas Willingham
e41c983f2e Switch image URL to master branch 2017-05-20 02:38:01 +01:00
Thomas Willingham
86c4ac80c5 Update doco 2017-05-19 21:37:45 +01:00
Roland Häder
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
Tobias Diekershoff
1f58bcc114 Merge pull request #3418 from gerhard6380/develop 
New API calls for photo management
 2017-05-08 06:56:24 +02:00
gerhard6380
0039ccf382 applied documentation convention 2017-05-07 21:43:29 +02:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
gerhard6380
f99d831686 move account/update_profile_image to section with general API's 2017-05-07 01:39:37 +02:00
gerhard6380
fa33293cf4 documentation for new api calls for photo management 2017-05-07 01:33:12 +02:00
Michael
da75dbac58 added documention 2017-05-05 20:45:11 +00:00
Hypolite Petovan
96ae2ff224 Add doc about magic constants __FILE__ and __DIR__ 2017-05-03 10:30:23 -04:00
Hypolite Petovan
a76256e6e9 Remove date mention 2017-05-02 23:37:45 -04:00
Hypolite Petovan
dfd4c8528e Add new documentation page about moving classes to src 2017-05-02 23:37:40 -04:00
Michael
55c39a80fa Description added 2017-04-29 12:19:49 +00:00
Michael
fa14096ea8 Added documentation 2017-04-29 08:11:54 +00:00
Tobias Diekershoff
06f5ce89b0 a typo 2017-04-28 09:48:07 +02:00
Hypolite Petovan
4493f37af3 Merge pull request #3390 from annando/1704-cleaned_install 
Added a PDO check in the install routine and cleaned it up
 2017-04-27 21:17:13 -04:00
Tobias Diekershoff
069f8bf5a9 a cookie for the Rechtschreib-Nerd 2017-04-27 11:00:30 +02:00
Tobias Diekershoff
67aae6fca9 DE Server Blocklist docs 2017-04-27 07:29:49 +02:00
Hypolite Petovan
5d3021fd5a Add documentation about the new admin page 2017-04-26 22:22:01 -04:00
Michael
bc2c0b0864 Added PDO in documentation. 2017-04-25 16:10:38 +00:00
Sandro Santilli
24c023eb0e Add default value to documentation for system.auth_cookie_lifetime 2017-04-21 17:20:28 +02:00
Sandro Santilli
270d604a6e Add documentation 2017-04-21 17:19:11 +02:00
Michael Vogel
a941199760 Merge pull request #3344 from tobiasd/20170412-doc 
some words about the workers
 2017-04-17 08:11:18 +02:00
Tobias Diekershoff
d5c2b9d4cd Ham 2017-04-17 07:33:12 +02:00
Alexandre Alapetite
6b250d3ae9 Merge branch 'develop' into MySQL5.7 2017-04-16 15:16:58 +02:00
Tobias Diekershoff
f3393106ae typos 2017-04-16 13:59:52 +02:00
Tobias Diekershoff
5a0af71ade remote_self paragraph was missing in DE 2017-04-16 13:54:12 +02:00
Tobias Diekershoff
09da31442e Worker auf Deutsch 2017-04-16 13:47:57 +02:00
Tobias Diekershoff
f4466b86e3 some EN doc about the worker 2017-04-16 13:32:41 +02:00
Tobias Diekershoff
b8fd48dddc Merge pull request #3335 from annando/issue-3331 
Issue 3331: Remove unneeded table "deliverq"
 2017-04-14 07:32:30 +02:00
Michael
d5c6f67a4a Changed documentation 2017-04-13 19:10:53 +00:00
Pierre Rudloff
8567113f0f Doc about j/k keyboard shortcuts 2017-04-13 17:20:05 +02:00
Michael
2b3a129480 Removed it here as well 2017-04-13 05:08:42 +00:00
Michael
f399a1914f Removed documentation 2017-04-13 05:08:12 +00:00
Alexandre Alapetite
d2901dcb00 Fix for MySQL 5.7+ 
https://github.com/friendica/friendica/issues/2786

Only tested on Ubuntu 16.10 with MySQL 5.7.17.

https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html

https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date
As of MySQL 5.7.4, NO_ZERO_DATE is deprecated.

Patch based on the following search & replace (and then reverting some
changes in libraries):

```sh
grep -l '= "0000-00-00"' -r . | xargs sed -i -e "s/= \"0000-00-00\"/=
'0000-00-00'/g"

grep -l "0000-00-00" -r . | xargs sed -i -e "s/0000-00-00/0001-01-01/g"

grep -l "!= '0001-01-01'" -r . | xargs sed -i -e "s/!= '0001-01-01'/>
'0001-01-01'/g"

grep -l " === '0001-01-01'" -r . | xargs sed -i -e "s/ === '0001-01-01'/
<= '0001-01-01'/g"

grep -l " == '0001-01-01'" -r . | xargs sed -i -e "s/ == '0001-01-01'/
<= '0001-01-01'/g"

grep -l "strpos(\$dob, '0000-') === 0" -r . | xargs sed -i -e
"s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 ||
strpos(\$dob, '0001-') === 0/g"

grep -l 'array("", "0001-01-01")' -r . | xargs sed -i -e 's/array("",
"0001-01-01")/array("", "0000-00-00", "0001-01-01")/g'

grep -l "\$dob = '0000-'" -r . | xargs sed -i -e "s/\$dob =
'0000-'/\$dob = '0001-'/g"
```
 2017-04-11 23:00:45 +02:00
Hypolite Petovan
b09553a71b Add Composer FAQ 2017-04-04 20:34:06 -04:00
Michael Vogel
d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer 
Add Composer
 2017-04-02 14:57:37 +02:00
Hypolite Petovan
95a5740229 Add links to EN pages in DE help 2017-04-02 08:54:11 -04:00
Hypolite Petovan
1c276b5cd5 Add Composer documentation 2017-04-01 17:58:21 -04:00
Michael
648d5bd047 More mcrypt is removed 2017-04-01 10:07:12 +00:00
Michael
0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Tobias Diekershoff
4a3a61c594 coding standard for the docs 2017-02-24 08:37:36 +01:00
Michael Vogel
4d591c4a07 Merge pull request #2841 from Hypolite/issue/#2103-alt 
Issue/#2103 alt - define coding standards for Friendica
 2017-02-24 07:46:29 +01:00
Tobias Diekershoff
4de6ef1610 make it a code block 2017-02-22 09:37:00 +01:00
Tobias Diekershoff
79c2234cc1 EN quickstart had some dead links in it, DE version is ok 2017-02-22 07:21:36 +01:00
Eelco Maljaars
d9d4a0ccc4 Document reformat as requested - 1 sentence per line 2017-02-21 19:32:03 +01:00
Eelco Maljaars
32660b64a7 Added note about MySQL sql_mode on newer versions of MySQL 2017-02-21 15:59:12 +01:00
Michael Vogel
d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Michael Vogel
288ad37c3c Merge pull request #3110 from tobiasd/20170127-translationdocs 
translation docs now contain basic usage of the Transifex client
 2017-01-27 18:14:08 +01:00
Tobias Diekershoff
8f59833c51 translation docs now contain basic usage of the Transifex client 2017-01-27 12:39:21 +01:00
Hypolite Petovan
46fe6b1908 - Remove misc TinyMCE mentions in docs and minifyjs 2017-01-26 22:58:25 -05:00
Michael
ef31127430 Added documentation 2017-01-16 22:00:58 +00:00
Tobias Diekershoff
b067a11146 Merge pull request #3088 from beardyunixer/patch-1 
Update FAQ.md
 2017-01-12 16:32:38 +01:00
beardyunixer
9183ef4385 Update FAQ.md 
Grammar - a few sentences that are technically correct, but don't sound quite right to a native speaker.
 2017-01-12 12:13:13 +00:00
Michael
e67133ef56 Merge remote-tracking branch 'upstream/develop' into 1701-curl-range 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
 2017-01-12 07:25:44 +00:00
Michael Vogel
3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include 
Normalize App parameter declaration (doc-include folders, boot)
 2017-01-11 09:01:48 +01:00
Hypolite Petovan
160d462d3f Fix typo in doc 2017-01-11 18:42:49 +11:00
Michael
a2debaa68a Download limit for fetching data via "z_fetch_url" 2017-01-09 23:10:32 +00:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Michael
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
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
Michael Vogel
7b2fadcf43 Get rid of the "guid" table. We don't need it anymore. 2016-02-09 10:21:10 +01:00
Fabrixxm
5250fed447 Revert "Merge pull request #2319 from stieben/develop" 
This reverts commit 9330a6994c, reversing
changes made to ecfb6ec924.

But it keeps changes to doc/Plugins.md and doc/de/Plugins.md
 2016-02-09 09:39:29 +01:00
rabuzarus
c1c21ada0a contactedit-actions-button: remove contact tabs which aren't needed anymore 2016-02-08 23:51:51 +01:00
Fabrixxm
a283691149 api docs: fix indentation 2016-02-08 10:34:27 +01:00
Fabrixxm
870d2f844d Update API docs 
Add `friendica/notification` and `friendica/notification/seen` endpoints

Fix some list rendering issues

Move all `friendica/*` endpoints under "Implemented API calls (not compatible with other APIs)" section

Add info about permitted HTTP methods and required auth
 2016-02-08 10:22:12 +01:00
Andrej Stieben
a81d929cdf Minor documentation update, as requested by @tobiasd 2016-02-05 14:11:10 +01:00
Andrej Stieben
48e6ff21aa Added the possibility for themes to override core module functions 2016-02-04 21:45:21 +01:00
Andrej Stieben
acefb84681 Improved documentation formatting (of Plugins.md) 2016-02-04 19:37:06 +01:00
Silke Meyer
c715877261 Slightly updated docs about Let's Encrypt 2016-02-03 20:47:41 +01:00
Tobias Diekershoff
c7691ce68d OStatus clarification 2016-01-25 09:58:58 +01:00
Tobias Diekershoff
47a936eaa3 groups vs forums and mentioning those 2016-01-24 07:42:25 +01:00
Tobias Diekershoff
924bf238df typos 2016-01-22 09:02:21 +01:00
Tobias Diekershoff
76d588f929 typos 2016-01-22 09:00:12 +01:00
Tobias Diekershoff
420e3021f9 clarification to the forum docs 2016-01-22 07:42:03 +01:00
Tobias Diekershoff
15febca93d Update to the translation docs (email templates and language selection problems in Safari) 2016-01-22 07:36:01 +01:00
Tobias Diekershoff
3eef0cea3d small additions to the docs, part of #2194 2016-01-19 10:02:05 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel
012107f5f7 Table documentation added 2016-01-11 20:17:31 +01:00
Michael Vogel
5ab2786c00 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
fabrixxm
c2d1016014 remove linebreak in doc/api.md 2015-12-28 18:30:28 +01:00
fabrixxm
f579b2af55 Fix TOC links href, no TOC in home 2015-12-28 10:24:47 +01:00
fabrixxm
1776b19dbf Add table of content in aside of help pages 2015-12-28 10:24:47 +01:00
fabrixxm
e752d41389 Update API docs 2015-12-28 10:23:06 +01:00
fabrixxm
cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu 
add db documentation to the help pages
 2015-12-28 10:22:33 +01:00
rabuzarus
12f8b0630d docu - add schema of each db table 2015-12-28 02:50:25 +01:00
rabuzarus
28317ed9ae added databas schema to the help 2015-12-26 15:51:41 +01:00