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

27138 Commits

Author SHA1 Message Date
Michael 3b2ae5c4a9 function names changed 2020-05-01 06:01:22 +00:00
Michael 6d4962a571 1,000 is better than 100 2020-04-30 12:13:13 +00:00
Michael bb0d6ce6f6 Better check for finished conversion 2020-04-30 09:03:05 +00:00
Michael 88931e5053 Post update functionality for tags 2020-04-30 06:09:57 +00:00
Michael Vogel e1d21e736a
Update src/Database/Database.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-29 19:13:23 +02:00
Michael 136c6b644e Fix: Mentions had been stored as tags 2020-04-29 10:49:13 +00:00
Michael 2423831b90 Added todo 2020-04-29 09:12:56 +00:00
Michael 6487daa4a9 Issue 8550: Check for a good table_definition cache value 2020-04-29 06:28:06 +00:00
Michael 8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
Hypolite Petovan 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
Michael 00ef29fb97 It has to be "selectFirst" 2020-04-29 01:40:59 +00:00
Michael 1f9f321d54 Issue 8557: We have to fetch only a single row 2020-04-28 21:13:37 +00:00
Hypolite Petovan 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
Michael 10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
Hypolite Petovan 8ab34149e3
Merge pull request #8558 from annando/corrected-view 
Corrected view
 2020-04-28 15:53:05 -04:00
Michael 881c9bbd70 Increased db version number 2020-04-28 19:46:59 +00:00
Hypolite Petovan 65fc64e931
Merge pull request #8559 from annando/notices 
Fix for "Undefined index: profile_url"
 2020-04-28 15:42:34 -04:00
Michael 6f3b46217e Fix for "Undefined index: profile_url" 2020-04-28 19:36:10 +00:00
Michael 6febbef060 Corrected view 2020-04-28 19:15:42 +00:00
Michael 638a6ac375 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-28 13:33:14 +00:00
Michael 70e5639e29 Merge 2020-04-28 13:33:03 +00:00
Hypolite Petovan a61f61a051
Merge pull request #8556 from annando/close-db-connection 
Added forgotten DBA::close
 2020-04-28 09:27:27 -04:00
Hypolite Petovan 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
Michael c2a9b3b9e9 Usage of the new tag tables 2020-04-28 11:52:51 +00:00
Michael 5367620467 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-28 08:03:26 +00:00
Michael af1abba271 Merge remote-tracking branch 'upstream/develop' into close-db-connection 2020-04-28 08:02:07 +00:00
Michael 238c079d11 Merge remote-tracking branch 'upstream/develop' into issue-8546 2020-04-28 08:01:33 +00:00
Michael e52e505a48 Merge 2020-04-28 08:00:38 +00:00
Michael f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
Tobias Diekershoff 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
Michael 9ccdbd9349 Added forgotten DBA::close 2020-04-28 05:55:17 +00:00
Michael fd752be114 Issue 8546: Added option to not use prepared statements 2020-04-28 05:40:23 +00:00
Michael 0c4dde8e68 Fix issue 8551: Last item is now displayed again 2020-04-28 05:22:29 +00:00
Michael ce20081d28 Fix wrong field name 2020-04-28 03:52:07 +00:00
Hypolite Petovan dbad46c378
Merge pull request #8549 from annando/suppress-xml-log 
Suppress XML logging of errors
 2020-04-27 16:46:40 -04:00
Michael f5886db3e2 New view for searching tags 2020-04-27 20:32:25 +00:00
Michael 2768ece690 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-27 18:07:43 +00:00
Michael 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
Hypolite Petovan 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
Michael ebb96faedd Merge branch 'develop' of github.com:annando/friendica into develop 2020-04-27 09:01:03 +00:00
Michael 9fb035ee79 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-26 18:47:24 +00:00
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
Michael 7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
Michael 5df5e9521b The tag table is now really used 2020-04-26 15:24:58 +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