strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
26893 commits 2 branches 55 tags 148 MiB
Commit graph

26893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 1b0a8ec5c0
Merge pull request #8545 from nupplaphil/bug/subdir 
Template Engine with Subdirectory
 2020-04-26 14:31:30 -04:00
Hypolite Petovan 1b8918351d
Merge pull request #8537 from annando/views 
We now can define views
 2020-04-26 13:46:26 -04:00
Michael 53b0401d6a Fix tests - hopefully 2020-04-26 16:25:46 +00:00
Michael 6c59e03805 Renamed comment 2020-04-26 16:20:17 +00:00
Philipp Holzer f5f62d3f42
Template Engine with Subdirectory 
- Use explicit root path for template engine
- Replace "__DIR__" calls in addons with subdirectories
- Fixes local tests, where call is made out of '/' and not '/vagrant/'
 2020-04-26 15:45:25 +02:00
Michael af97df96bd Merge remote-tracking branch 'upstream/develop' into views 2020-04-26 09:21:57 +00:00
Michael Vogel 91b87b8df1
Merge pull request #8544 from nupplaphil/bug/fix_travis 
Fix Travis
 2020-04-26 11:20:04 +02:00
Philipp Holzer a708627b45
Fix travis services entry 2020-04-26 09:49:35 +02:00
Michael d74067b461 Queries had been simplified 2020-04-26 06:58:30 +00:00
Michael 832ac65248 Merge branch 'views' of github.com:annando/friendica into views 2020-04-26 06:31:31 +00:00
Michael Vogel 62e6c2f781
Merge pull request #8543 from MrPetovan/task/frio-brand-color 
[frio] Align brand name color on nav icon
 2020-04-26 08:07:28 +02:00
Michael Vogel 7e8bcc9034
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:34 +02:00
Michael Vogel 3107680e51
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:17 +02:00
Michael Vogel 3f9c78a20b
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:03 +02:00
Michael Vogel 37b9031a27
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:11 +02:00
Michael Vogel 7f17c1484a
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:01 +02:00
Hypolite Petovan 66021480a7 [frio] Align brand name color on nav icon 2020-04-25 15:36:29 -04:00
Michael 51bc5279a0 Documentation and unneeded stuff removed 2020-04-25 18:36:58 +00:00
Michael Vogel 296b7069ec
Merge pull request #8541 from MrPetovan/bug/8511-lib-oauth1-token-parameter 
Move optional token parameter at the end of OAuthRequest::from_consumer_and_token() function definition
 2020-04-25 19:54:38 +02:00
Hypolite Petovan b1efa11308 Update function definition in library/OAuth1 
- Move optional token parameter at the end of OAuthRequest::from_consumer_and_token() function definition
- Make token parameter optional in OAuthSignatureMethod->build_signature
- Move optional token parameter at the end of OAuthSignatureMethod->check_signature() function definition
 2020-04-25 13:21:21 -04:00
Michael e012730e52 Added check and repair for missing self contact 2020-04-25 07:29:38 +00:00
Michael 7d111e2a6f Duplicated fields renamed 2020-04-25 07:29:02 +00:00
Michael efa1351ac6 Cleaned up user table order in query 2020-04-24 21:14:03 +00:00
Michael ee3a724b41 Three more joins replaced with views 2020-04-24 20:39:14 +00:00
Michael 1c980c5b29 The workerqueue is now using a view as well 2020-04-24 18:50:36 +00:00
Michael 89dcab774d Prticipation is now a view as well 2020-04-24 17:55:49 +00:00
Michael 749c2ce4ab Updated database description 2020-04-24 15:44:41 +00:00
Michael 57009d30c4 There is now a pending view 2020-04-24 15:42:43 +00:00
Michael cf0d36737f Removed query for "updated" in gcontact 2020-04-24 15:18:34 +00:00
Michael 6011598bc2 Database definition updated 2020-04-24 13:43:07 +00:00
Michael a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
Michael c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
Michael 3e5c3dce01 Next join replaced by view 2020-04-24 12:24:10 +00:00
Michael 0950e4bada Another view 2020-04-24 12:09:51 +00:00
Michael 4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
Michael 02aed490e2 Owner-view added 2020-04-24 11:04:50 +00:00
Michael afa712b811 DBView is View 2020-04-24 08:48:34 +00:00
Michael b50aaf87d7 Some more code standards 2020-04-24 05:39:30 +00:00
Michael bc1efdaf53 Code standards 2020-04-24 05:37:06 +00:00
Michael 304ba0e7c4 Merge remote-tracking branch 'upstream/develop' into views 2020-04-24 05:35:00 +00:00
Hypolite Petovan 911dc9d794
Merge pull request #8539 from annando/ap-update-create 
AP: Interpret "update" as "create" when item isn't found
 2020-04-24 01:08:14 -04:00
Michael 778ff0689f AP: Interpret "update" as "create" when item isn't found 2020-04-23 19:57:20 +00:00
Michael c3aa2730de Improved definition style 2020-04-23 07:02:18 +00:00
Michael 63ebbb8a16 We now can define views 2020-04-23 06:19:44 +00:00
Hypolite Petovan 43b8bdea07
Merge pull request #8520 from annando/term2tag 
We now store tags in "tag"
 2020-04-22 22:56:07 -04:00
Michael 1f7993acad Code standards 2020-04-22 15:22:39 +00:00
Michael Vogel 29dfac2345
Merge pull request #8535 from MrPetovan/bug/8534-fbrowser-album-name 
Remove album name bin2hex conversion in file browser
 2020-04-22 07:19:35 +02:00
Hypolite Petovan 16f48731b1 Remove album name bin2hex conversion in file browser 
- Avoids Javascript hex2bin() limitation to Latin-1 string encoding
 2020-04-21 22:14:11 -04:00
Hypolite Petovan 36717a9953
Merge pull request #8532 from annando/fix-image-description 
Fix: Image descriptions now work again
 2020-04-21 09:45:01 -04:00
Michael 33eda87bc4 Fix: Image descriptions now work again 2020-04-21 04:01:13 +00:00