marcusxs/friendica
1
0
Fork 0
forked from friendica/friendica
Code Pull requests Activity
22,643 commits 3 branches 67 tags 205 MiB
Commit graph

22,643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
6436145909
 		Merge pull request #6584 from tobiasd/20190204-cs 
CS translation update THX Aditoo
 2019-02-04 08:30:36 +01:00
Tobias Diekershoff
2357a7b0f5 CS translation update THX Aditoo 2019-02-04 07:18:24 +01:00
Tobias Diekershoff
deaecfaf79
 		Merge pull request #6582 from MrPetovan/bug/6570-fix-diaspora-hashtags 
Only escape leading hash marks in Markdown::toBBCode
 2019-02-04 06:47:27 +01:00
Philipp Holzer
1c51d7d22f
 		Typo at addon-directory-name ... 2019-02-04 02:21:23 +01:00
Philipp Holzer
bdfe0c35fb
 		Typo at addon-directory-name ... 2019-02-04 02:14:20 +01:00
Philipp Holzer
f2f8c97b7c
 		Bugfixing Addon-config 2019-02-04 02:06:15 +01:00
Hypolite Petovan
5d2fce789a
 		Merge pull request #6583 from annando/priority 
Lower priority for removing items
 2019-02-03 19:37:16 -05:00
rabuzarus
b0372e5e93 attachment preview: fix a bug if inserted text did contain a new line between content and url 2019-02-04 01:23:30 +01:00
Philipp Holzer
d6dd74690d
 		Bugfixing Config output for memcached_hosts[] 2019-02-04 01:19:01 +01:00
Michael
97fb2202cb Lower priority for removing item 2019-02-03 23:59:16 +00:00
Michael
633d04049b Lower priority for removing users 2019-02-03 23:55:46 +00:00
rabuzarus
ac22c0593d attachment preview: scroll the content not the mocal (adds scroll bars to the modal conent if it is to large) 2019-02-04 00:44:38 +01:00
Hypolite Petovan
e5647be30f Only escape leading hash marks in Markdown::toBBCode 
- Remove useless line ending fiddling
 2019-02-03 18:31:11 -05:00
Philipp Holzer
90e88d6c35
 		Bugfixing AutomaticInstallation test 2019-02-04 00:04:16 +01:00
Philipp Holzer
bc73d4bd2b
 		Adding descriptions 2019-02-03 23:39:30 +01:00
Philipp Holzer
f3da5b3a2f
 		Bugfixing PConfig 2019-02-03 23:22:05 +01:00
Philipp Holzer
8b70ae6d46
 		Bugfixing tests 2019-02-03 22:55:13 +01:00
Philipp Holzer
0f5a50b46b
 		Bugfixing tests 2019-02-03 22:53:39 +01:00
Michael Vogel
5e2cbce9b6
 		Merge pull request #6580 from MrPetovan/bug/6575-escaped-field-input-attributes 
Add nofilter to field_input attribute parameter
 2019-02-03 22:52:30 +01:00
Philipp Holzer
1e0e1674f2
 		4) Adding Factories to other entrypoints 2019-02-03 22:46:50 +01:00
Philipp Holzer
4af0119b73
 		3) Introducing ConfigFactory 2019-02-03 22:22:04 +01:00
Hypolite Petovan
8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
Hypolite Petovan
ba7ffab3c2 Add nofilter to field_input attribute parameter 2019-02-03 15:32:52 -05:00
Philipp Holzer
5c50684b50
 		2) Refactor App->config[] into Core\PConfig 2019-02-03 19:32:31 +01:00
Philipp Holzer
f40c57fc20
 		2) Refactor App->config[] into Core\PConfig 2019-02-03 19:05:44 +01:00
Philipp Holzer
d43a8184f4
 		2) Refactor App->config[] into Core\PConfig 2019-02-03 19:04:41 +01:00
Philipp Holzer
be6b229534
 		1) Refactor App->config[] into Core\Config 2019-02-03 18:54:25 +01:00
rabuzarus
ba03ec857a attachment preview: some small corrections 2019-02-03 16:26:13 +01:00
Hypolite Petovan
82f713cb7f
 		Merge pull request #6576 from nupplaphil/cache_lock_mock 
Refactoring DBA-mocking tests
 2019-02-03 07:53:36 -05:00
Hypolite Petovan
e9b7b81232
 		Merge pull request #6578 from Ixiter/develop-markdown-anchors 
Markdown - Fixed bug with local anchor links
 2019-02-03 07:51:26 -05:00
peter
0ca762001b Markdown - fixed bug in local anchor links, optimized replacer 2019-02-03 10:33:15 +01:00
peter
990cc45a26 Markdown - fixed bug in local anchor links 2019-02-03 03:23:47 +01:00
rabuzarus
dcf072e77d attachment preview: handle content with attachment bbcode inside (show preview of this attachment) 2019-02-02 23:06:11 +01:00
Philipp Holzer
835b5c00ee
 		ConsoleTest is now a MockedTest 2019-02-02 19:21:48 +01:00
Philipp Holzer
433d6abe8c
 		Refactoring DBA-mocking tests 
- Reducing DB-dependencies
- Creating DB-cache mocks
- Creating DB-lock mocks
- Switching to mocked dependencies for Cache/Lock/App
 2019-02-02 19:03:15 +01:00
Hypolite Petovan
441d953098
 		Merge pull request #6573 from tobiasd/20190202-lng 
translation updates
 2019-02-02 07:34:49 -05:00
Tobias Diekershoff
55de1c66f3 PL translation update THX waldis 2019-02-02 08:25:24 +01:00
Tobias Diekershoff
33304d4b0b DE translation update 2019-02-02 08:24:44 +01:00
Tobias Diekershoff
9342e97bac CS translation update THX Aditoo 2019-02-02 08:24:10 +01:00
Tobias Diekershoff
92b1400506 update to the zh-cn translation THX ZhuChentan 2019-02-02 08:23:23 +01:00
rabuzarus
3a15c22028 attachment preview: frio- initialize linkPreview on jot modal open (so we can use the linkPreview for new posts and edit post modal) 2019-02-02 03:12:36 +01:00
rabuzarus
b065356c28 attachment preview: add destroy method to linkPreview.js 2019-02-02 02:27:41 +01:00
rabuzarus
132e0b83c4 attachment preview: mv some js functions from frio to the linkPreview to make linkPreview available for other themes 2019-02-01 23:48:14 +01:00
rabuzarus
a6322b1c4e attachment preview: some backend work in the item module: 
- convert attachment to bbcode and
- add the attachment bbcode to the item body
 2019-02-01 23:42:36 +01:00
rabuzarus
07d1932efc attachment preview: frontend work (works with frio) 2019-02-01 19:18:08 +01:00
Hypolite Petovan
51e669616a
 		Merge pull request #6572 from annando/hubzilla-ap 
Hopefully fixes a communicaton problem with Hubzilla
 2019-02-01 10:22:24 -05:00
Michael
35e3700c8a Hopefully fixes a communicaton problem with Hubzilla 2019-02-01 14:26:45 +00:00
Michael Vogel
811589c81b
 		Merge pull request #6562 from MrPetovan/task/4090-move-profile-to-src 
Move profile module to src/
 2019-01-31 07:02:05 +01:00
Hypolite Petovan
811bafa246
 		Merge pull request #6568 from annando/ap-mentions 
Links of mentioned contacts hadn't looked great on Mastodon
 2019-01-30 19:05:00 -05:00
Hypolite Petovan
bc5646092e
 		Merge pull request #6567 from annando/ap-auto-follow 
Automatically follow every incoming reshared item
 2019-01-30 19:03:54 -05:00