Commit graph

15340 commits

Author SHA1 Message Date
Roland Häder 0394004fee
reverted comments, but maintained multi-line comment.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:11:22 +02:00
Roland Häder 4c2d4934f7
Some CR applied:
- removed todo
- added explanation
- merged next if() block with already merged

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:06:13 +02:00
Roland Häder f55ea4bc83
tpzo fixed again ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:02:44 +02:00
Roland Häder afb430b908
tpzo fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:41:01 +02:00
Roland Häder 249065b421
opps, went in again? :-/
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:31:46 +02:00
Roland Häder 031d96d933
improved some comments
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:28:01 +02:00
Roland Häder 635b26353c
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:08:15 +02:00
Roland Häder 347803fd5c
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:08:15 +02:00
Roland Häder f66c5c6823
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:07:31 +02:00
Hypolite Petovan 0c2c221e50 Merge pull request #3469 from Quix0r/rewrites/coding-convention-split2-5-2
Coding convention applied split 2-5-2 (of 2-14-2)
2017-05-16 20:37:34 -04:00
Roland Häder d7b420a44e
opps, re-introduced this out-dated code by mistake
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-16 20:13:08 +02:00
Roland Häder 79d524a9ad
opps, added missing curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-16 17:56:36 +02:00
rabuzarus 4a47361116 Merge pull request #3380 from fabrixxm/feature/frio/fixedaside2
Frio: better UX for aside bar
2017-05-16 17:31:06 +02:00
Roland Häder f4a33ed3f0
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-16 14:40:07 +02:00
Roland Häder 701e761c68
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-16 14:37:12 +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
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
Hypolite Petovan 6f6b029c4d Merge pull request #3456 from annando/1704-mastodon-html
HTML for OStatus posts look better (in Mastodon and GNU Social)
2017-05-08 16:54:45 -04:00
rabuzarus 899bfacb73 Merge pull request #3457 from annando/1705-probe
Small bugfix for PR 3454
2017-05-08 22:28:42 +02:00
Michael f6fe11ff49 Small bugfix for PR 3454 2017-05-08 20:01:18 +00:00
Michael 3db3d2f1f7 This should make posts fine on GNU Social as well 2017-05-08 19:11:47 +00:00
Hypolite Petovan 63b900a5cd Merge pull request #3455 from rabuzarus/20170508_-_fix_frio_register_tooltip
Bugfix: frio - make register tooltip work
2017-05-08 14:13:03 -04:00
Michael f602ec30cc Shared links create now a better HTML 2017-05-08 18:11:37 +00:00
rabuzarus 757f3a3f5d Bugfix: frio - make register tooltip work 2017-05-08 19:39:06 +02:00
Michael 722e03cc58 Added documentation 2017-05-08 17:29:46 +00:00