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

21564 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 95a41699cf
Merge pull request #6072 from annando/fix-6071 
Fixes #6071: We should use the correct variable ...
 2018-11-04 15:45:38 -05:00
Michael bd97215147 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 18:54:49 +00:00
Michael e759497af3 Fix small typo / Workerqueue count now only counts non deferred entries 2018-11-04 10:51:01 +00:00
Michael ec3cec37eb Fixes #6071: We should use the correct variable ... 2018-11-04 09:18:36 +00:00
Hypolite Petovan 62761e1099
Merge pull request #6071 from annando/ap-fetch-signed 
Support for fetching non-public content / preparations for forum posts
 2018-11-04 01:56:09 -05:00
Michael 8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Hypolite Petovan 0a9dba005c
Merge pull request #6067 from annando/ap-relocation 
Preparations for a relocation message / fix for notice
 2018-11-02 21:16:14 -04:00
Michael 1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Hypolite Petovan d929e714df
Merge pull request #6065 from annando/fix-forum 
Fix for delivering forum posts again
 2018-11-01 21:48:55 -04:00
Michael 1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Hypolite Petovan 4f76d21e02
Merge pull request #6062 from nupplaphil/test_enhancements 
Test enhancements
 2018-11-01 10:30:06 -04:00
Philipp Holzer e434ff0196
Test enhancements 2018-11-01 13:45:21 +01:00
Philipp Holzer 83ead5ec48
Test enhancements 2018-11-01 13:44:47 +01:00
Philipp Holzer 70f9d3c596
documentation 2018-11-01 12:48:43 +01:00
Hypolite Petovan 0ccdc2ec0e
Merge pull request #6061 from nupplaphil/autoinstall_test_fix 
AutoInstall Test fix
 2018-11-01 07:41:19 -04:00
Philipp Holzer 4f01a198e1
AutoInstall Test fix 
- New Mock for Renderer
- No need of prepared assert.ini.php anymore
- Mocking Renderer during Autoinstall
 2018-11-01 10:30:44 +01:00
Michael Vogel cbc5e12ea8
Merge pull request #6060 from tobiasd/20181101-lng 
CS, DE, PL translation updates
 2018-11-01 08:12:07 +01:00
Tobias Diekershoff 6dbe307a27 PL translation update THX waldis 2018-11-01 07:59:05 +01:00
Tobias Diekershoff 1ad5f2dc46 CS translation update THX Aditoo 2018-11-01 07:58:53 +01:00
Tobias Diekershoff a4cd01a13a DE translation THX vinz 2018-11-01 07:58:43 +01:00
Tobias Diekershoff e12942ce7f
Merge pull request #6058 from JonnyTischbein/issue_contact_batch_archive 
[frio] Fix unarchive contact batch action
 2018-11-01 06:41:05 +01:00
Hypolite Petovan fa1328625c
Merge pull request #6057 from vinzv/patch-2 
Update Install.php typos
 2018-10-31 16:21:43 -04:00
Jonny Tischbein 76c9d37006 Fix not working unarchive contact batch action 2018-10-31 21:20:44 +01:00
vinzv fc2b81d0dd
Update Install.php 
Please update messages.po at Transifex as well.
 2018-10-31 21:03:32 +01:00
Hypolite Petovan 91a221caa2
Merge pull request #6056 from JonnyTischbein/issue_post_delete_return 
Return correctly after post deletion (Non-Ajax)
 2018-10-31 15:39:33 -04:00
Jonny Tischbein b73be5749b Add support for quattro 2018-10-31 20:17:11 +01:00
Jonny Tischbein 645f9387fa make return url optional 2018-10-31 20:09:44 +01:00
Jonny Tischbein 6b43174a74 Fix for vier theme / NonAjax Call 2018-10-31 20:09:44 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Hypolite Petovan 7d5494dd67
Merge pull request #6055 from zeroadam/FileTagHotFix 
Misspelling in use statement
 2018-10-31 13:57:33 -04:00
Hypolite Petovan 8a46c786f3
Merge pull request #6053 from zeroadam/CoreRenderer 
Core Renderer Class
 2018-10-31 13:57:12 -04:00
Adam Magness a09273802e Misspelling in use statement 
misspelled Friendica
 2018-10-31 13:42:38 -04:00
Adam Magness 70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00
Tobias Diekershoff a9416330fe
Merge pull request #6054 from nupplaphil/lock_logger 
Add missing Logger::log()
 2018-10-31 18:04:07 +01:00
Philipp Holzer 2a0a7cd42a
Add missing Logger::log() 2018-10-31 17:52:41 +01:00
Adam Magness 3f74ba88c2 Move delimiter props and functions 
move left and right delimiter functions and properties to Render class.
 2018-10-31 12:12:15 -04:00
Hypolite Petovan 50ba028094
Merge pull request #5830 from nupplaphil/update_from_boot 
update_db & run_update_function to Friendica\Core\Update
 2018-10-31 11:13:59 -04:00
Adam Magness 93ccd7bcdb Remove old functions 
remove old functions from file.
 2018-10-31 11:02:30 -04:00
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Philipp Holzer bf878d2ebb
Adding more Logger entries in case of update process 2018-10-31 15:22:44 +01:00
Adam Magness f6c86649c2 Create Core\Renderer Class 
create new class and redirect old functions
 2018-10-31 10:03:42 -04:00
Philipp Holzer 3f813d853b
introducing Logger::log 2018-10-31 14:48:19 +01:00
Philipp Holzer e5530dfa63
refactoring query 2018-10-31 14:44:43 +01:00
Philipp Holzer 9690dfc54e
Renamed Cache flag 2018-10-31 14:44:42 +01:00
Philipp Holzer 270e817954
Adding force to update routine 
- Introduced Cache::NEVER Lock (never expiring lock)
- Force flag for dbstructure update
- Moving the business logic to central place in Update class
 2018-10-31 14:44:40 +01:00
Philipp Holzer f2ec963b95
removed update db functions again 2018-10-31 14:44:24 +01:00
Philipp Holzer f08f063a38
Replaced check_db in App 2018-10-31 14:44:24 +01:00
Philipp Holzer ffbad2dc81
moved check_db($via_worker) to Update::check($via_worker) 2018-10-31 14:44:23 +01:00
Philipp Holzer 87f3fe24f7
Moving UPDATE defines/constants out of boot 2018-10-31 14:44:23 +01:00