 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 |
|
 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 |
|
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 |
|
|
Michael
|
80103f8ad9
|
Issue 3309: Avatar update should work now
|
2017-05-16 21:21:54 +00: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 |
|
|
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 |
|
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
|
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 |
|