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

19931 Commits

Author SHA1 Message Date
fabrixxm e3ee9ee501 API: fix sender/recipient of PMs: check api_user before get user info. 
To throw ForbiddenException and pass tests
 2018-06-18 11:55:02 +02:00
Tobias Diekershoff ca85fa2272 update to the zh-cn translation THX 朱陈锬 2018-06-18 11:41:29 +02:00
Hypolite Petovan be2af7487e
Merge pull request #5236 from tobiasd/develop 
CS and NL translation update
 2018-06-18 04:05:26 -04:00
Hypolite Petovan 4a0176f3d6
Merge pull request #5235 from tobiasd/20180618-doc 
missing markdown formatting added
 2018-06-18 04:05:17 -04:00
Tobias Diekershoff 7a84252233 NL translation update 2018-06-18 08:24:00 +02:00
Tobias Diekershoff c39a5f6faa CS translation update 2018-06-18 08:23:05 +02:00
Tobias Diekershoff 0de3d96cd3 missing markdown formatation added 2018-06-18 08:17:21 +02:00
Michael 68ab3764e9 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-18 05:20:47 +00:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
Hypolite Petovan af39296f06
Merge pull request #5232 from annando/no-author-link 
Separate functions for fetching items for the system and for users
 2018-06-17 18:41:46 -04:00
Michael 2a76290d19 Using the constants 2018-06-17 21:55:01 +00:00
Michael 23aa9dffa0 New item functions are now used in the delivery process as well 2018-06-17 21:35:33 +00:00
fabrixxm c015bb1b77 API: fix sender/recipient of PMs 2018-06-17 19:57:32 +02:00
Michael e42b934807 Item field list structure is unified 2018-06-17 17:14:52 +00:00
Michael 6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael 0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael 1aec8f620d More item abstractions for DFRN and Diaspora 2018-06-16 22:32:57 +00:00
Michael 6f9ec690aa Merge remote-tracking branch 'upstream/develop' into no-author-link 2018-06-16 15:37:54 +00:00
Michael abef0cd46c Don't use the author-link anymore - just author-id 2018-06-16 15:35:30 +00:00
Hypolite Petovan 7d1bb9ecf4
Merge pull request #5230 from annando/new-item-uri 
New function for generating item URI
 2018-06-16 10:54:56 -04:00
Hypolite Petovan 5fb8c758fd
Merge pull request #5229 from rabuzarus/20180616_-_fix_stream_position_ajax_update 
fix scroll position in stream while ajax update
 2018-06-16 09:06:32 -04:00
Hypolite Petovan 133cd342d4
Merge pull request #5226 from annando/even-more-abstraction 
More item calls have been replaced with the new functions
 2018-06-16 07:57:00 -04:00
Michael a54fea313f More indentions 2018-06-16 11:52:28 +00:00
rabuzarus 1a8d3c460e add class "wall-item-body" to all themes 2018-06-16 13:50:56 +02:00
rabuzarus d0ea208d04 main.js - move some code of liveUpdate() into updateConvItems() for readability 2018-06-16 13:38:32 +02:00
rabuzarus a2fc1be187 fix scroll position in stream while ajax update 2018-06-16 13:05:33 +02:00
Tobias Diekershoff 7966c48e75
Merge pull request #5228 from annando/fix-5199 
Fix for PR 5199: Corrected check for empty object
 2018-06-16 09:42:36 +02:00
Michael d2da5d63c7 Fix for PR 5199: Corrected check for empty object 2018-06-16 07:26:09 +00:00
Michael 14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Michael 8592fc435c Fix indenting 2018-06-16 06:27:20 +00:00
Tobias Diekershoff b729e8b21c
Merge pull request #5227 from MrPetovan/bug/fix-php72-notice-model-contact 
Fix PHP 7.2 Warning in Model\Contact
 2018-06-16 08:02:13 +02:00
Hypolite Petovan c651641856 Fix PHP 7.2 Warning in Model\Contact 2018-06-15 20:50:31 -04:00
Michael Vogel a029439686
Merge pull request #5224 from rabuzarus/20180615_-_frio_frix_js_error_callAddonHooks 
Frio: add addon_hooks to head.tpl
 2018-06-16 00:39:00 +02:00
Michael bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
rabuzarus 2b69571cbf Frio: add addon_hooks to head.tpl 2018-06-15 22:55:00 +02:00
Hypolite Petovan 41d1f0173a
Merge pull request #5223 from annando/fast-daemon 
Multiple daemon improvements (foreground, faster spawning)
 2018-06-15 14:50:23 -04:00
Michael e97a3c25e7 Multiple daemon improvements (foreground, faster spawning) 2018-06-15 18:18:20 +00:00
Tobias Diekershoff 71b017bfad
Merge pull request #5219 from annando/abstraction-2 
Reworked notifications / use of Item class to fetch data
 2018-06-15 09:54:50 +02:00
Michael Vogel a1e06c9782
Merge pull request #5218 from MrPetovan/bug/fix-feed-reshare 
Fix feed blank reshare body
 2018-06-15 08:06:56 +02:00
Michael 02fef0bcf5 Reworked notifications ("alt pager" added) / use of Item class to fetch data 2018-06-15 05:50:28 +00:00
Tobias Diekershoff 641ca5c08e
Merge pull request #5217 from MrPetovan/bug/5191-fix-registration-email 
Fix corrupt registration emails
 2018-06-15 06:33:22 +02:00
Hypolite Petovan c96b330a72 Allow share body output for private = 2 in mod/share 2018-06-14 23:53:54 -04:00
Hypolite Petovan 7469de29f1 Fix corrupt registration emails 
- Use double quotes for line break-containing translation string
- Simplify HTML/plaintext email body conversion
 2018-06-14 23:42:08 -04:00
Hypolite Petovan 6191fab4d7
Merge pull request #5216 from abanink/2337 
solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly
 2018-06-14 15:36:21 -04:00
Pascal Deklerck ce4b793acf solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly 2018-06-14 21:09:55 +02:00
Hypolite Petovan f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template 
Frio: provide a template for received contact suggestions
 2018-06-14 13:56:30 -04:00
rabuzarus 02344ce78c Frio: background color for fsuggest module 2018-06-14 18:57:30 +02:00
rabuzarus aaeb85c944 Frio: scroll to the contact request in notifications module 2018-06-14 18:49:53 +02:00
rabuzarus b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
Hypolite Petovan 0134fa31d1
Merge pull request #5214 from abanink/5118 
Added PHP part of JavaScript hooks to Addons.md doc
 2018-06-14 10:32:02 -04:00