bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity
15348 commits 3 branches 61 tags 178 MiB
Commit graph

15348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael 192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
Michael 696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Hypolite Petovan 173372eda5 Merge pull request #3471 from annando/issue-3309 
Issue 3309: Avatar update should work now
 2017-05-17 12:42:34 -04:00
Tobias Diekershoff fd5d058156 Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2 
Frio: better UX for aside bar
 2017-05-17 11:27:37 +02:00
Michael cb3077b7a9 It is better this way 2017-05-17 06:07:55 +00:00
Michael 7daf5ecde1 Use the contact picture instead of the profile picture 2017-05-17 06:00:20 +00:00
Michael 80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
Hypolite Petovan 879cb23841 Merge pull request #3470 from rabuzarus/201705016_-_fix_doxyfile 
Update Doxyfile (add src folder)
 2017-05-16 11:51:39 -04:00
rabuzarus fb0d335268 Update Doxyfile (add src folder) 2017-05-16 17:36:19 +02:00
Hypolite Petovan 48e3f4f47f Merge pull request #3465 from annando/bugfix-dba-1 
Bugfix: dba::num_rows hadn't checked the object variable
 2017-05-16 02:05:16 -04:00
Michael 41f94a62fc Spelling 2017-05-16 06:00:01 +00:00
Hypolite Petovan 2fbfe1aea6 Merge pull request #3468 from tobiasd/20170516-IT 
IT translations THX fabrixxm
 2017-05-16 01:46:55 -04:00
Tobias Diekershoff 3fb99e74d8 IT translations THX fabrixxm 2017-05-16 07:39:38 +02:00
Michael Vogel 8f253f6c12 Merge pull request #3464 from beardyunixer/nginx 
Nginx
 2017-05-16 06:26:54 +02:00
Thomas Willingham 805406a9d1 Requested changes 2017-05-16 00:22:17 +01:00
Hypolite Petovan 916afd3d9a Merge pull request #3467 from annando/1705-dm-api 
API: Direct Messages via the API now work again.
 2017-05-15 19:00:41 -04:00
Michael 124690cc4d dba: Beautification is now a separate function 2017-05-15 21:06:17 +00:00
Michael 875592f285 API: Direct Messages via the API now work again. 2017-05-15 20:11:33 +00:00
Michael 83e4141639 Bugfix: dba::num_rows hadn't checked the object variable 2017-05-15 15:17:38 +00:00
Thomas Willingham 1a1469339d red > Friendica 2017-05-15 10:39:39 +01:00
Thomas Willingham 8af7df4259 Update nginx 2017-05-15 10:36:56 +01:00
Michael Vogel 9f62dd8627 Merge pull request #3463 from friendica/develop 
Update 3.5.2rc with latest develop
 2017-05-14 21:08:08 +02:00
Hypolite Petovan fd9c9603e4 Merge pull request #3462 from annando/bugfix-dba 
Bugfix: The commit in dba::delete was never executed
 2017-05-14 14:40:19 -04:00
Tobias Diekershoff 925b803ae8 set version to 3.5.2rc 2017-05-14 09:16:55 +02:00
Michael 05c890f256 Bugfix: The commit in dba::delete was never executed 2017-05-14 07:01:38 +00:00
Hypolite Petovan db0c3620c0 Merge pull request #3461 from annando/1705-some-more-dba 
DBA: poller / SQL errors / dbclean
 2017-05-13 00:22:01 -04:00
Michael e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 
Conflicts:
	include/uimport.php
 2017-05-13 04:13:07 +00:00
Michael 74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan 2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 
Coding convention applied split 2-4-2 (of 2-14-2)
 2017-05-12 21:40:30 -04:00
Roland Häder cc4b481bc9
fixed parser error, need parentheses 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-12 21:02:58 +02:00
Michael b907ad9dd8 dba is now used for writing the workerqueue as well 2017-05-12 16:25:44 +00:00
Michael 2b180d7804 Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 2017-05-12 16:12:00 +00:00
Michael 377fe31907 dba functions in poller / avoiding SQL errors in conversation / dbclean is better 2017-05-12 16:09:25 +00:00
Hypolite Petovan 06ea23665c Merge pull request #3460 from annando/1705-dbclean 
dbclean is now using the new database functions
 2017-05-12 11:45:27 -04:00
Michael acd9f453d7 And another one 2017-05-12 06:55:04 +00:00
Michael 58b2b1dbef Some more cleaner delete 2017-05-12 06:30:45 +00:00
Michael 11e524a555 This item removal is much more cleaner 2017-05-12 06:17:48 +00:00
Michael Vogel abc924bc8f Merge pull request #3459 from Hypolite/improvement/class-autoloading-use 
Use `use` instead of `\`
 2017-05-12 06:46:52 +02:00
Michael c00a5223d6 Removed code from the pre worker era. 2017-05-12 04:33:52 +00:00
Hypolite Petovan 4293e27d5c Improved usage of use in dba_pdo 2017-05-11 23:05:49 -04:00
Hypolite Petovan c0a6f1122b Removed useless usage of use 2017-05-11 23:01:49 -04:00
Michael c52f7657ab Now it should work 2017-05-11 20:19:43 +00:00
Michael 6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
Hypolite Petovan 39f894bd4a Use use instead of \ 2017-05-11 11:53:04 -04:00
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
fabrixxm 61e8147daf Frio: recalculate sticky aside on click only on a tags 
This to prevent input elements in aside to lose focus after the
recalculation.
 2017-05-09 14:53:56 +02:00
Michael Vogel bc724f2b68 Merge pull request #3458 from Hypolite/bug/missing-require-poco 
Missing require for poco_serverlist
 2017-05-09 06:56:32 +02:00
Hypolite Petovan 108f0b2d1e Improve refactoring 
- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion
 2017-05-08 23:03:52 -04:00
Hypolite Petovan d5b660a72f Add missing require for poco_serverlist 2017-05-08 21:55:19 -04:00
Hypolite Petovan 70cc2ccc7a Fix standards + refactored variables with meaningful names 2017-05-08 21:55:04 -04:00