keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24318 commits 4 branches 0 tags 179 MiB
Commit graph

24318 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
1a164b0dc5 Add two-factor app-specific password settings page 
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
 2019-07-22 07:56:00 -04:00
Hypolite Petovan
a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
Hypolite Petovan
d7fdb42488 Database Structure Version 1320 
- Add 2fa_app_specific_password
 2019-07-22 07:39:28 -04:00
Hypolite Petovan
1d8b809227
Merge pull request #7414 from annando/fetch-diaspora 
Fetch Diaspora posts by url
 2019-07-22 07:01:42 -04:00
Michael
105378f5a4 Changed regexp 2019-07-22 06:03:18 +00:00
Hypolite Petovan
55e2006312
Merge pull request #7412 from nupplaphil/task/dice 
Introduce DICE
 2019-07-21 11:04:41 -04:00
Philipp Holzer
05102911db
Fix App\Mode determination 2019-07-21 14:40:50 +02:00
Philipp Holzer
7aa9917ca8
Fix DB_UPDATE_VERSION constant 2019-07-21 14:34:42 +02:00
Philipp Holzer
3d93ef9cea
Fix tests (static usage for non-static methods) 2019-07-21 14:21:08 +02:00
Philipp Holzer
a8e6a57e9b
Fixing installer 2019-07-21 14:21:02 +02:00
Hypolite Petovan
9cf4562200
Merge pull request #7415 from TiMESPLiNTER/fix/photo-tag-rendering 
Fix tag rendering which was displayed as escaped HTML
 2019-07-21 06:57:42 -04:00
TiMESPLiNTER
8825971687 Fix tag rendering which was displayed as escaped HTML instead of rendered HTML 2019-07-21 12:43:05 +02:00
Hypolite Petovan
502617afde
Merge pull request #7413 from annando/issue-6675 
Issue 6675: Improved check for follower, removed global setting
 2019-07-21 05:52:26 -04:00
Michael
53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
Michael
a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Philipp
c6131c057b
Merge pull request #7411 from annando/ap-quote 
Preparation for quoted reshares on AP
 2019-07-21 01:49:22 +02:00
Philipp Holzer
55999730e0
Introduce DICE 
- Adding dice library
- Adding dependency config

- Removing Factories
- Refactoring App\Mode constructor
- Refactoring App\Router constructor
- Refactoring BasePath for DI usage
- Refactoring ConfigFileLoader constructor
- Refactoring Profiler constructor

- Adjust entrypoints (index, console, worker, ..)

- Adding functional test for DI
- Fix tests because of refactorings
 2019-07-21 01:22:10 +02:00
Michael
23830dc45f Preparation for quoted reshares on AP 2019-07-20 21:32:19 +00:00
Michael Vogel
61d33bea66
Merge pull request #7410 from MrPetovan/task/7408-remove-failed_update 
Remove confusing extraneous `success_update` >= `failure_update` conditions
 2019-07-20 20:38:42 +02:00
Hypolite Petovan
6df53624c7 Remove confusing extraneous success_update >= failure_update conditions 2019-07-20 13:34:08 -04:00
Michael Vogel
970baccfdc
Merge pull request #7409 from MrPetovan/bug/notices 
Fix reference non-existing "mobile-theme" field in user record
 2019-07-20 19:09:29 +02:00
Hypolite Petovan
2f9e710f5c Fix reference non-existing "mobile-theme" field in user record 2019-07-20 12:14:20 -04:00
Philipp Holzer
5887b9c499
Add level-2/dice library 2019-07-19 21:42:02 +02:00
Philipp
388ac062c4
Merge pull request #7407 from MrPetovan/bug/notices 
Fix undefined property notice in L10n\L10n
 2019-07-19 08:09:19 +02:00
Hypolite Petovan
f5e07be04e Fix undefined property notice in L10n\L10n 2019-07-18 21:21:16 -04:00
Michael Vogel
2aea286143
Merge pull request #7400 from MrPetovan/bug/7397-frio-settings-fallback 
[frio] Theme settings fallback on node settings
 2019-07-18 23:22:17 +02:00
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
8e9a0e0e50 Show frio theme customization settings for new users 2019-07-17 23:08:56 -04:00
Hypolite Petovan
ac53ee8e0f Show node's theme as selected in display setting for new users 2019-07-17 23:08:26 -04:00
Hypolite Petovan
ada699536a Prevent users from forcibly installing a disabled theme in mod/settings 2019-07-17 23:08:03 -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