Commit graph

26920 commits

Author SHA1 Message Date
6487daa4a9 Issue 8550: Check for a good table_definition cache value 2020-04-29 06:28:06 +00:00
4991fa4e27
Merge pull request #8562 from annando/issue-8557
Issue 8557: We have to fetch only a single row
2020-04-28 21:44:23 -04:00
00ef29fb97 It has to be "selectFirst" 2020-04-29 01:40:59 +00:00
1f9f321d54 Issue 8557: We have to fetch only a single row 2020-04-28 21:13:37 +00:00
99ce487e1e
Merge pull request #8561 from annando/issue-8560
Iissue 8560: Wrong value for parent in mail notification
2020-04-28 16:39:01 -04:00
10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
8ab34149e3
Merge pull request #8558 from annando/corrected-view
Corrected view
2020-04-28 15:53:05 -04:00
881c9bbd70 Increased db version number 2020-04-28 19:46:59 +00:00
65fc64e931
Merge pull request #8559 from annando/notices
Fix for "Undefined index: profile_url"
2020-04-28 15:42:34 -04:00
6f3b46217e Fix for "Undefined index: profile_url" 2020-04-28 19:36:10 +00:00
6febbef060 Corrected view 2020-04-28 19:15:42 +00:00
a61f61a051
Merge pull request #8556 from annando/close-db-connection
Added forgotten DBA::close
2020-04-28 09:27:27 -04:00
892c49fa30
Merge pull request #8555 from annando/issue-8546
Issue 8546: Added option to not use prepared statements
2020-04-28 08:52:35 -04:00
af1abba271 Merge remote-tracking branch 'upstream/develop' into close-db-connection 2020-04-28 08:02:07 +00:00
238c079d11 Merge remote-tracking branch 'upstream/develop' into issue-8546 2020-04-28 08:01:33 +00:00
e52e505a48 Merge 2020-04-28 08:00:38 +00:00
f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
c853ea6aae
Merge pull request #8554 from annando/fix-8551
Fix issue 8551: Last item is now displayed again
2020-04-28 07:55:24 +02:00
9ccdbd9349 Added forgotten DBA::close 2020-04-28 05:55:17 +00:00
fd752be114 Issue 8546: Added option to not use prepared statements 2020-04-28 05:40:23 +00:00
0c4dde8e68 Fix issue 8551: Last item is now displayed again 2020-04-28 05:22:29 +00:00
dbad46c378
Merge pull request #8549 from annando/suppress-xml-log
Suppress XML logging of errors
2020-04-27 16:46:40 -04:00
f521689ced Suppress XML logging of errors 2020-04-27 14:35:50 +00:00
Michael Vogel
ef4c68c60b
Merge pull request #8548 from MrPetovan/task/8490-frio-focus-style
[frio] Restore focus styles
2020-04-27 15:55:18 +02:00
50622d27d1 [frio] Restore focus styles
- Replace .btn-main by .btn-primary
- Harmonize focus styles between buttons and form controls based on the theme scheme
2020-04-27 09:43:46 -04:00
ebb96faedd Merge branch 'develop' of github.com:annando/friendica into develop 2020-04-27 09:01:03 +00:00
1b0a8ec5c0
Merge pull request #8545 from nupplaphil/bug/subdir
Template Engine with Subdirectory
2020-04-26 14:31:30 -04:00
1b8918351d
Merge pull request #8537 from annando/views
We now can define views
2020-04-26 13:46:26 -04:00
53b0401d6a Fix tests - hopefully 2020-04-26 16:25:46 +00:00
6c59e03805 Renamed comment 2020-04-26 16:20:17 +00:00
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
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
a708627b45
Fix travis services entry 2020-04-26 09:49:35 +02:00
d74067b461 Queries had been simplified 2020-04-26 06:58:30 +00:00
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
66021480a7 [frio] Align brand name color on nav icon 2020-04-25 15:36:29 -04:00
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
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
e012730e52 Added check and repair for missing self contact 2020-04-25 07:29:38 +00:00
7d111e2a6f Duplicated fields renamed 2020-04-25 07:29:02 +00:00
efa1351ac6 Cleaned up user table order in query 2020-04-24 21:14:03 +00:00
ee3a724b41 Three more joins replaced with views 2020-04-24 20:39:14 +00:00