Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 13:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
24289 commits 3 branches 64 tags 237 MiB
Commit graph

24289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp
75ebd4810d
Merge pull request #7405 from MrPetovan/bug/fatal-errors 
Force invite remaining variable to be integer in Content\Widget
 2019-07-18 15:30:58 +02:00
Hypolite Petovan
3f85a921da Force invite remaining variable to be integer in Content\Widget 
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-512786156
 2019-07-18 08:42:07 -04:00
Hypolite Petovan
fc5aa0aa76
Merge pull request #7404 from annando/fetch-item 
Fetch items by given uri
 2019-07-18 08:18:49 -04:00
Michael
13212e0d04 Added search 2019-07-18 06:37:33 +00:00
Michael
931c190566 Removed test output 2019-07-18 06:20:54 +00:00
Michael
1553581175 Merge remote-tracking branch 'upstream/develop' into fetch-item 2019-07-18 06:16:40 +00:00
Michael Vogel
d82405052b
Merge pull request #7403 from annando/fix-7399 
Fix PR 7399: Added missing "use"
 2019-07-18 08:15:58 +02:00
Michael
c771c575a7 Fix PR 7399: Added missing "use" 2019-07-18 06:12:43 +00:00
Michael
41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Michael Vogel
dcebf53ecf
Merge pull request #7402 from MrPetovan/bug/7401-node-settings-style 
Ensures node theme settings are used to render theme embed
 2019-07-18 06:32:40 +02:00
Hypolite Petovan
477a84a8c4 Ensures node theme settings are used to render theme embed 2019-07-17 23:25:22 -04:00
Hypolite Petovan
9b927fa333
Merge pull request #7399 from annando/only-sharer 
Added the option to only receive top level posts from people you follow
 2019-07-17 20:53:28 -04:00
Michael
e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan
4fc3eb8f06
Merge pull request #7398 from annando/fetch-posts 
Preparation for being able to fetch AP posts by proving the URL
 2019-07-17 16:01:19 -04:00
Michael
a80a6bec74 Preparation for being able to fetch AP posts by proving the URL 2019-07-17 19:36:32 +00:00
Michael Vogel
419365d65b
Merge pull request #7394 from MrPetovan/task/7314-frio-post-padding 
[frio] Remove outer post padding
 2019-07-17 17:52:58 +02:00
Hypolite Petovan
6332a50466 [frio] Remove outer post padding 
- Include mobile view changes
- Includes search view changes
 2019-07-17 08:09:46 -04:00
Hypolite Petovan
6717df2c23
Merge pull request #7395 from nupplaphil/bug/l10n_test 
Fix InstallerTest
 2019-07-17 08:08:42 -04:00
Philipp Holzer
e175b3c733
Fix L10n test 
- Switched L10n::t() argument
 2019-07-17 12:40:00 +02:00
Hypolite Petovan
11e4f906c2
Hot-fix: Core\L10n::t method passing parameter bug 
Follow-up to #7379
 2019-07-16 21:18:25 -04:00
Hypolite Petovan
0b97b32a59
Merge pull request #7379 from nupplaphil/task/refactor_l10n_for_test 
Refactor L10n for testing
 2019-07-16 16:03:42 -04:00
Hypolite Petovan
3b1f777d0c
Merge pull request #7391 from annando/warning 
Avoid a warning in Notifier worker
 2019-07-16 16:03:17 -04:00
Hypolite Petovan
0c56e75b89
Merge pull request #7313 from nupplaphil/task/dyn_config 
Dynamic config loading
 2019-07-16 15:59:10 -04:00
Michael
379a1a52e0 Avoid a warning 2019-07-16 19:58:47 +00:00
Philipp Holzer
346290cc23
Reverted indention 2019-07-16 21:54:22 +02:00
Philipp Holzer
46a260aa01
Fix indentations 2019-07-16 20:19:56 +02:00
Philipp Holzer
92fb0a82ca
Dynamic config loading 
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
 2019-07-16 20:16:43 +02:00
Philipp Holzer
79e69ee528
Fix language (again ;-) ) 2019-07-16 16:50:49 +02:00
Philipp Holzer
eb024a3718
Refactor L10n for testing 
- Moving L10n to L10n\L10n
- Adding constructor information
- Adding to factory
- simplify/speedup tests
 2019-07-16 16:44:47 +02:00
Philipp
966043712f
Merge pull request #7389 from MrPetovan/bug/7387-local_user-int 
Ensure NULL isn't passed to Feature::isEnabled
 2019-07-16 16:37:38 +02:00
Hypolite Petovan
c6cd2b131d Add transitive type hints in Core\PConfig 2019-07-16 07:45:24 -04:00
Philipp
1298258f6d
Merge pull request #7390 from annando/issue-7315 
Issue 7315: Set the forum's contact id for forum posts
 2019-07-16 10:01:17 +02:00
Michael
8c2f50eb72 Issue 7315: Set the forum's contact id for forum posts 2019-07-16 05:07:26 +00:00
Hypolite Petovan
ea6b02a1f5 Fix PConfiguration tests 
- Replace uid = 0 (invalid uid) with 42
- Remove isConnected mocked calls for invalid uid test
 2019-07-16 00:19:04 -04:00
Michael Vogel
bb83f23e26
Merge pull request #7386 from MrPetovan/bug/7293-hide-registration-link 
Hide registration button on login page when registration are closed
 2019-07-16 05:38:12 +02:00
Hypolite Petovan
cf70d0beb4 Updated PConfiguration test to honor the type-hint 2019-07-15 22:00:49 -04:00
Hypolite Petovan
68f5b639eb Restore $uid parameter integer type-hint in Config 
- Add integer type-hint to Feature::isEnabled
 2019-07-15 22:00:49 -04:00
Hypolite Petovan
19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Hypolite Petovan
e9511b4f34
Merge pull request #7388 from annando/issue-7315 
Issue 7315: Changed handling of "Group" posts
 2019-07-15 16:32:42 -04:00
Hypolite Petovan
d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
Michael
1a213bd8e8 Issue 7315: Changed handling of "Group" posts 2019-07-15 20:05:36 +00:00
Hypolite Petovan
b0e06699da
Merge pull request #7387 from nupplaphil/task/pconfig_refactor 
Refactor PConfiguration (Simplify Config Part 4)
 2019-07-15 15:42:18 -04:00
Philipp Holzer
f70271aa5d
Allow nullable UID in PConfigCache 2019-07-15 21:14:13 +02:00
Philipp Holzer
d5de5b6789
Bugfixing bad UIDs for PConfig 2019-07-15 21:11:38 +02:00
Philipp Holzer
ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer
74f7c16585
Fixup phpdoc 2019-07-15 20:19:52 +02:00
Philipp Holzer
9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
Hypolite Petovan
e16c410b59 Hide registration button on login page when registration are closed 2019-07-15 09:11:21 -04:00
Hypolite Petovan
ff99a62584
Merge pull request #7384 from nupplaphil/bug/fixing_config_load 
Fixing initial load config (Simplify Config Part 3a)
 2019-07-15 08:06:29 -04:00
Philipp
e9c6746c3b
Merge pull request #7382 from annando/issue-7367 
Issue 7367: Enhanced check when DFRN delivery can be skipped
 2019-07-15 09:59:16 +02:00