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

21,323 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ralf Thees
ff203c277d Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-22 23:20:00 +02:00
Michael Vogel
ebc97ba8fe
 		Merge pull request #5981 from MrPetovan/task/move-dbstructure-to-php 
Move dbstructure to PHP array
 2018-10-22 23:19:38 +02:00
Hypolite Petovan
a22196edae Add/Fix Doxygen headers for classes 2018-10-22 16:50:55 -04:00
Hypolite Petovan
9eaedc576c Remove unused dbstructure hook call in App->loadDatabase 2018-10-22 16:50:55 -04:00
Hypolite Petovan
2debdbd0c9 Fix dbstructure console outputting addon structure as well 2018-10-22 16:50:55 -04:00
Hypolite Petovan
015e2a84b1 Remove obsolete require_once include/dba from Core\Addon and Core\Hook 2018-10-22 16:50:55 -04:00
Hypolite Petovan
19ffc0510b Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan
fad99b8619 Switch from dbstructure.json to dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan
e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME 
- Add DBA::NULL_DATE constant
 2018-10-22 16:50:55 -04:00
Hypolite Petovan
ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
Hypolite Petovan
0aa7671119 Add new Core\Hook class 2018-10-22 16:49:53 -04:00
Michael Vogel
c0abff0bda
 		Merge pull request #5990 from MrPetovan/task/move-apps-out-of-app 
Road to Router Part 4: Move $apps out of App
 2018-10-22 22:47:22 +02:00
Hypolite Petovan
2a881cc2e7
 		Merge pull request #5907 from nupplaphil/goaway_to_redirectto 
Replaced goaway() with System::redirect()
 2018-10-22 16:22:41 -04:00
Philipp Holzer
3072c56057
 		goaway fix in App 2018-10-22 22:15:50 +02:00
Philipp Holzer
32af52842b
 		adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
Philipp Holzer
363d00cc45
 		Adding $a->getBaseURL for Worker in profile_photo 
Adding a TODO for Contact::magicLink
 2018-10-22 22:13:39 +02:00
Philipp Holzer
34989480e1
 		removed unnecessary System use 2018-10-22 22:13:39 +02:00
Philipp Holzer
95f3c3eca0
 		replaced a relative url with path 2018-10-22 22:13:38 +02:00
Philipp Holzer
722a86a7ca
 		replaced onerror_url with onerror_path 2018-10-22 22:13:38 +02:00
Philipp Holzer
d51e931db7
 		replaced forwardurl with forward_path 2018-10-22 22:13:37 +02:00
Philipp Holzer
3edad1591e
 		replaced $return_url to $return_path to make it more clear that it is a relative path to the Friendica baseurl 2018-10-22 22:13:37 +02:00
Philipp Holzer
a9510ffcdf
 		description fix 2018-10-22 22:13:37 +02:00
Philipp Holzer
d00ddc01af
 		Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer
2ef81108b3
 		Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Michael Vogel
c46caeb0d3
 		Merge pull request #5988 from MrPetovan/task/move-strings-out-of-app 
Road to Router Part 3: Move $strings out of App
 2018-10-22 22:03:27 +02:00
Benjamin Lorteau
339a5da946 Move $apps out of App 
- Move $nav_sel out of App
- Add new Content\Nav::getAppMenu() method
 2018-10-22 16:02:15 -04:00
Hypolite Petovan
e3fe25383c Add static keyword for Core\L10n properties 2018-10-22 15:58:42 -04:00
Hypolite Petovan
c6f0bea51d Move $strings from App to Core\L10n 
- Add L10n::init() call in App constructor
- Improve pushLang/popLang
- Remove no longer needed references to App
 2018-10-22 15:58:42 -04:00
Michael Vogel
baa1094489
 		Merge pull request #5987 from MrPetovan/task/empty-index-php 
Road to Router Part 2: Empty index.php
 2018-10-22 21:56:13 +02:00
Benjamin Lorteau
37f00b5fd1 Use System::httpExit for 403 error in App 2018-10-22 15:16:59 -04:00
Hypolite Petovan
768d1d3f76
 		Merge pull request #5993 from nupplaphil/fix_testing 
Fix testing
 2018-10-22 15:16:33 -04:00
Philipp Holzer
5ab115598c
 		Code Standards 2018-10-22 21:11:09 +02:00
Philipp Holzer
d28424ddce
 		Code standards 2018-10-22 21:10:31 +02:00
Philipp Holzer
4a82708cbf
 		Fix Testing 2018-10-22 20:59:51 +02:00
Philipp Holzer
cbb9a2e8b7
 		Fix Testing 2018-10-22 20:23:06 +02:00
Hypolite Petovan
65f29800ff
 		Merge pull request #5991 from annando/api-source 
API: The source field does now reliably return the correct network name
 2018-10-22 10:52:22 -04:00
Michael
1cd72e7694 API: The source field does now reliably return the correct network name of the author 2018-10-22 14:15:14 +00:00
Hypolite Petovan
43db120967
 		Merge pull request #5989 from annando/ap-profile 
Improved parsing of AP profiles
 2018-10-22 08:35:59 -04:00
Hypolite Petovan
a0bd96d587 Remove unwarranted doxygen comments in App 2018-10-22 08:17:55 -04:00
Michael
5c13ecdf6e Improved parsing of AP profiles 2018-10-22 07:24:47 +00:00
Hypolite Petovan
e2c5a423c5 Improve App->runFrontend formatting 
- Use single-quotes instead of double
- Use strpos() instead of substr()
- Add/remove comments
- Use Config::get default value and drop the exact match for config.private_addons
 2018-10-22 00:07:56 -04:00
Hypolite Petovan
e2ac36e43e Simplify bin/worker 
- Remove duplicate calls to Addon::loadHooks and Config::load
- Remove useless killme() call
 2018-10-21 22:25:53 -04:00
Hypolite Petovan
279196959c Move index.php content to App->runFrontend 
- Replace all x() by !empty() in App
- Replace all killme() with exit()
 2018-10-21 22:24:47 -04:00
rabuzarus
72a7671010
 		Merge pull request #5986 from annando/improve-5984 
Improve PR 5984: better check for remote users as well
 2018-10-22 00:03:19 +02:00
Michael
8e11f055b1 Improve PR 5984: better check for remote users as well 2018-10-21 21:56:46 +00:00
Michael Vogel
277fe547a1
 		Merge pull request #5978 from MrPetovan/task/make-username-length-configurable 
Make username length configurable
 2018-10-21 23:42:44 +02:00
Hypolite Petovan
4ec56a0975 Sets maximum to 64 for username_min/max_length config keys 2018-10-21 17:28:40 -04:00
Hypolite Petovan
1176a4240a
 		Merge pull request #5985 from annando/ap-followers 
AP: We now send the previous followers collection as well
 2018-10-21 17:05:34 -04:00
Hypolite Petovan
6324d4595f
 		Merge pull request #5984 from annando/microformats 
Fix webmentions and microformats ("redir" only for logged in users)
 2018-10-21 17:05:00 -04:00
Hypolite Petovan
ac19a9cddc
 		Merge pull request #5959 from vinzv/patch-2 
Fix broken credits box
 2018-10-21 17:03:55 -04:00