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

24281 Commits

Author SHA1 Message Date
Philipp Holzer aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer a654470061
fix phpdoc 2019-07-14 22:41:09 +02:00
Philipp Holzer 05439e4866
fixed test 2019-07-14 22:32:50 +02:00
Philipp Holzer b48c22dc1a
minor fixing: phpdoc & type-hint 2019-07-14 22:31:53 +02:00
Hypolite Petovan b839a291d7 [frio] Use server theme settings for user's empty settings 2019-07-14 16:28:10 -04:00
Philipp Holzer a2c6240da0
some minor fixings 2019-07-14 22:26:36 +02:00
Philipp Holzer d384663b39
bugfix: add lost changes due merge 2019-07-14 22:19:16 +02:00
Philipp Holzer 4913502922
bugfix: add lost changes due merge 2019-07-14 22:12:45 +02:00
Philipp Holzer 8f0aa0ca5a
bugfix: add missing group by parameters 2019-07-14 22:12:14 +02:00
Philipp Holzer c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00
Philipp Holzer 486f139342
Move Preload/JIT Configuration logic from Adapter to Core-Configuration 2019-07-14 22:09:07 +02:00
Hypolite Petovan 06f6bc8a4a
Merge pull request #7377 from friendica/revert-7374-task/frio/default-to-login 
Revert "Default theme = login theme"
 2019-07-14 15:19:08 -04:00
Hypolite Petovan 2b8a99fabe
Revert "Default theme = login theme" 2019-07-14 15:18:50 -04:00
Michael 83729b8c00 "defaults" is replaced 2019-07-14 16:04:52 +00:00
Hypolite Petovan 1f2047d703
Merge pull request #7374 from JeroenED/task/frio/default-to-login 
Default theme = login theme
 2019-07-14 09:00:02 -04:00
Michael 9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
Jeroen De Meerleer 660ed6df22 Updated towards hypolite's first suggestion 2019-07-14 10:57:54 +02:00
Jeroen De Meerleer 5aa3cf1e2d Revert "Updated towards hypolites suggestions" 
This reverts commit aa5b3c20b3.
 2019-07-14 10:54:08 +02:00
Jeroen De Meerleer b70e3d1c22 Revert "Fixed issues" 
This reverts commit 5e6b23bd4e.
 2019-07-14 10:54:03 +02:00
Jeroen De Meerleer 5e6b23bd4e Fixed issues 2019-07-14 10:48:24 +02:00
Jeroen De Meerleer aa5b3c20b3 Updated towards hypolites suggestions 2019-07-14 10:34:42 +02:00
Michael 5bba0e7d39 Hopefully avoiding duplicated relay entries 2019-07-13 23:53:15 +00:00
Jeroen De Meerleer 43625b437b Default theme = login theme 2019-07-13 23:27:54 +02:00
Hypolite Petovan d3cb1125e8
Merge pull request #7373 from JeroenED/bugfix/relation-nofilter 
Don't filter partner in relation status
 2019-07-13 17:25:30 -04:00
Jeroen De Meerleer aff60da1af Nofilter 2019-07-13 22:45:54 +02:00
Michael 2df17fc0c0 Fix SQL problem with "not null" 2019-07-13 07:39:53 +00:00
Michael 002963f198 Fix wrong variable 2019-07-13 07:29:56 +00:00
Michael 9b8396620b Fix duplicated contacts due to relay probing 2019-07-13 07:25:01 +00:00
Hypolite Petovan 753c41bb40
Merge pull request #7366 from guzzisti/install-md-wrapup 
Overhaul of Install.md
 2019-07-12 22:02:39 -04:00
Hypolite Petovan deffc08f01
Merge pull request #7371 from nupplaphil/task/split_cache 
Splitting ConfigCache & PConfigCache (Simplify Config Part 2)
 2019-07-12 20:21:03 -04:00
Philipp Holzer 8c0f047bc7
Add namespace 2019-07-12 23:08:01 +02:00
Michael 7dfadf7e7e Simplify the contact update in "getIdForURL" 2019-07-12 21:07:47 +00:00
Philipp Holzer a30200083a
BugFix: forgot configCache in ConfigFactory 2019-07-12 23:05:48 +02:00
Philipp Holzer c82127ffb7
Splitting ConfigCache & PConfigCache 
- Remove IConfigCache & IPConfigCache
- Add new PConfigCache
- Add missing Logger::init() (bugfixing tests)
 2019-07-12 22:53:37 +02:00
Michael c34204cf50 Merge remote-tracking branch 'upstream/develop' into contact-update 2019-07-12 20:51:27 +00:00
Hypolite Petovan b56709d802
Merge pull request #7358 from nupplaphil/bug/installer_db 
Bugfixing DB/Installer (Simplify Config Part 1)
 2019-07-12 16:48:17 -04:00
Michael 8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
rwa 369cb34428
typo 2019-07-12 14:45:25 +02:00
rwa 576a4b73a6
directly link to install.md 2019-07-12 14:44:23 +02:00
Philipp 108f15a94e
Merge pull request #7368 from annando/fix-switch 
Use standard function to update the contact to avoid SQL errors
 2019-07-12 07:24:36 +02:00
Michael Vogel 807d2665ea Use standard function to update the contact to avoid SQL errors 2019-07-11 22:11:51 +02:00
guzzisti e5f51244a9 fix broken numbered list in doc/update.md 
minor typos/formatting in doc/install.md
 2019-07-11 21:32:40 +02:00
guzzisti 999a82e58b minor formatting adjustments 2019-07-11 21:26:51 +02:00
guzzisti 3f09ecc3e1 merge Install.md into doc/Install.md, remove Install.md afterwards 
Add link to the docs to Readme.md
 2019-07-11 21:19:44 +02:00
Philipp Holzer d533e819e2
temporary deactivate console installation tests due complex mocking situation. 2019-07-10 22:33:26 +02:00
Hypolite Petovan a06de3127f
Merge pull request #7361 from JeroenED/bugfix/frio-header-color-php 
[FRIO] fixing chromium mobile navbar color when not logged in
 2019-07-10 11:16:18 -04:00
Jeroen De Meerleer 4ccc8b87b5 Code style 2019-07-10 16:54:31 +02:00
Jeroen De Meerleer 9b7b718b43 Using global $nav_bg if undefined 2019-07-10 16:51:18 +02:00
Philipp 1b2b2259b1
Merge pull request #7360 from annando/fix-fatal 
Fix fatal error with incomplete contact data upon delivery
 2019-07-10 08:39:24 +02:00
Michael Vogel 6b25fd5b2f added logging 2019-07-10 05:19:54 +02:00