Michael Vogel
|
27905cc21a
|
Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion
|
2016-03-06 20:37:51 +01:00 |
|
|
Michael Vogel
|
ef2bc47cc6
|
New way of fetching the conversation id for thread completion
|
2016-03-06 20:36:28 +01:00 |
|
fabrixxm
|
d30d13959b
|
Merge pull request #2328 from rabuzarus/0602_contact_profile
polishing of the contact-edit page
|
2016-03-06 19:56:59 +01:00 |
|
Tobias Diekershoff
|
bdfd81e723
|
Merge pull request #2400 from annando/1603-ostatus-thread
Only import OStatus threads that are started by our contacts
|
2016-03-06 19:40:01 +01:00 |
|
|
Michael Vogel
|
9579725d4d
|
This should work better ...
|
2016-03-06 19:27:34 +01:00 |
|
|
Michael Vogel
|
279a0453f9
|
Or back ...
|
2016-03-06 15:13:19 +01:00 |
|
|
Michael Vogel
|
7f48df63a3
|
Relocated the check.
|
2016-03-06 15:11:04 +01:00 |
|
|
Michael Vogel
|
4bd1061a09
|
Only import OStatus threads if we follow the thread starter
|
2016-03-06 14:53:30 +01:00 |
|
|
Tobias Diekershoff
|
1127150c79
|
Merge pull request #2399 from annando/1603-default-group
Central function for default group, special setting for OStatus
|
2016-03-06 14:42:27 +01:00 |
|
|
Michael Vogel
|
bb06026147
|
Settings for only importing threads from our ostatus contacts
|
2016-03-06 14:09:04 +01:00 |
|
|
Michael Vogel
|
4ef33b4d5b
|
Clarification of description
|
2016-03-06 13:26:30 +01:00 |
|
|
Michael Vogel
|
8752ec11b2
|
Central function for default group, special setting for OStatus
|
2016-03-06 13:15:27 +01:00 |
|
|
Michael Vogel
|
af7b028b13
|
Preparation for followups
|
2016-03-06 11:41:51 +01:00 |
|
|
Michael Vogel
|
305f6f9a7b
|
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
|
2016-03-06 08:41:24 +01:00 |
|
|
Tobias Diekershoff
|
6072e17a64
|
Merge pull request #2398 from annando/1603-fontawesome4
The Font Awesome library is now updated, the reply button is changed
|
2016-03-06 01:49:46 +01:00 |
|
|
Michael Vogel
|
6468fbb905
|
Retraction could work now as well.
|
2016-03-06 01:37:47 +01:00 |
|
|
Michael Vogel
|
71227b5d0d
|
Receiving should be complete, sending partially works
|
2016-03-06 00:53:30 +01:00 |
|
|
Michael Vogel
|
f05cbf9ed8
|
Merge pull request #2397 from Quix0r/fixes/poller-warning
No processing if error or empty array
|
2016-03-05 13:35:43 +01:00 |
|
|
Michael Vogel
|
996cd8c24e
|
The Font Awesome library is now updated, the replxy button is changed
|
2016-03-05 13:29:01 +01:00 |
|
|
Michael Vogel
|
2a4ebaa438
|
Small cleanup
|
2016-03-05 01:30:49 +01:00 |
|
|
Michael Vogel
|
5bbc8a14ce
|
"import" is now "receive"
|
2016-03-05 00:27:44 +01:00 |
|
|
Michael Vogel
|
ef3620c191
|
Conversations should work now too.
|
2016-03-04 23:28:43 +01:00 |
|
Roland Haeder
|
d5c1ce490b
|
No processing if error or empty array
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-04 22:38:18 +01:00 |
|
|
Michael Vogel
|
2edf4548dc
|
Retractions could work now.
|
2016-03-03 23:34:17 +01:00 |
|
|
Michael Vogel
|
5adecf5b50
|
Some beautification
|
2016-03-02 23:39:50 +01:00 |
|
|
Michael Vogel
|
66919761ab
|
Some work at the retractions.
|
2016-03-02 23:28:20 +01:00 |
|
|
fabrixxm
|
3184a6263b
|
Merge pull request #2392 from Quix0r/minor/logging
Minor: Some more logging to trace down bugs
|
2016-03-02 12:21:18 +01:00 |
|
|
Michael Vogel
|
1f7f964bb7
|
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
|
2016-03-02 11:59:13 +01:00 |
|
|
Tobias Diekershoff
|
73f4c3c8da
|
Merge pull request #2394 from annando/1603-federation
Small bugfix: Fixes problen when version number contains linebreaks
|
2016-03-02 10:41:02 +01:00 |
|
|
Tobias Diekershoff
|
40209b2554
|
Merge pull request #2393 from annando/1603-api-speed
API: Some small speed improvement when calling the home timeline.
|
2016-03-02 10:40:23 +01:00 |
|
|
Michael Vogel
|
f1dae26df8
|
Likes would now work with unlikes and with likes on comments.
|
2016-03-01 23:21:56 +01:00 |
|
|
Michael Vogel
|
411566f48b
|
API: Some small speed improvement when calling the home timeline.
|
2016-03-01 19:17:01 +01:00 |
|
|
Michael Vogel
|
ce5f6fae51
|
Small bugfix: Fixes problen when version number contains linebreaks
|
2016-03-01 19:14:45 +01:00 |
|
|
Michael Vogel
|
009cadf63b
|
Just another commit message :-)
|
2016-03-01 19:10:35 +01:00 |
|
|
Roland Haeder
|
7d5166c9fe
|
Closed TODO: no .= needed here. #2392
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 18:28:06 +01:00 |
|
|
fabrixxm
|
04ccd9a776
|
Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php
Prevent some E_NOTICE
|
2016-03-01 15:50:20 +01:00 |
|
|
fabrixxm
|
be3fa8f8b1
|
Merge pull request #2391 from Quix0r/fixes/http-security
Missing exit() after header('Location: bla') is bad news
|
2016-03-01 15:33:31 +01:00 |
|
|
fabrixxm
|
11310aa93b
|
Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init
$a->theme_info = array() should be avoided
|
2016-03-01 15:32:34 +01:00 |
|
|
fabrixxm
|
fd316fe720
|
Merge pull request #2387 from Quix0r/fixes/html-errors
Some tags should not be self-closed
|
2016-03-01 15:31:28 +01:00 |
|
|
Roland Haeder
|
08abdfda68
|
<form> and <html> or <head> are not self-closing tags.
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:49:56 +01:00 |
|
|
Roland Haeder
|
8616f0cc35
|
Don't miss to add exit() after header('Location: bla') as header() does *NOT*
exit the script quickly enough. Always use an explicit exit() or you get real
trouble.
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:49:07 +01:00 |
|
|
Roland Haeder
|
76b042ddee
|
More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:42:55 +01:00 |
|
|
Roland Haeder
|
04eacb6470
|
Prevent some E_NOTICE in identity.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:36:23 +01:00 |
|
|
Roland Haeder
|
f10d2afca0
|
Prevent some E_NOTICE in boot.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:32:19 +01:00 |
|
|
Roland Haeder
|
04a7d6384e
|
No need to set $a->theme_info = array() everywhere if you can define it in App
itself.
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-03-01 14:27:38 +01:00 |
|
|
Michael Vogel
|
b48880fe52
|
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
|
2016-03-01 10:45:16 +01:00 |
|
|
Michael Vogel
|
cb900c5742
|
Reshares could work now, code is cleaned
|
2016-03-01 07:57:26 +01:00 |
|
|
Michael Vogel
|
8bcbff30e0
|
Account deletion should work, status messages works - reshares are half done.
|
2016-02-29 23:54:25 +01:00 |
|
|
Michael Vogel
|
066ddada17
|
Merge pull request #2386 from tobiasd/20160229-fedcolor
adding some colors to the Federation Statistics page of the admin panel
|
2016-02-29 19:03:31 +01:00 |
|
|
Tobias Diekershoff
|
09060c0ed3
|
adding some colors to the Federation Statistics page of the admin panel
|
2016-02-29 17:24:34 +01:00 |
|