keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11753 commits 4 branches 0 tags 179 MiB
Commit graph

11753 commits

This branch
This branch
All branches
Author SHA1 Message Date
rabuzarus
b93326bb23 contactedit-actions-button: use internal links instead of full links 2016-02-23 19:26:03 +01:00
rabuzarus
0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
fabrixxm
507f8ab4df Merge pull request #2370 from annando/1602-mixed-content 
Initial work to prevent mixed content, allow hidden tor services ...
 2016-02-23 08:45:19 +01:00
Michael Vogel
d27ed6e9d8 Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-23 08:03:30 +01:00
Tobias Diekershoff
556d044cc9 Merge pull request #2377 from annando/1602-abstract 
New BBCode element "abstract" for network depending messages.
 2016-02-23 08:01:13 +01:00
Michael Vogel
148c89a20d Added documentation 2016-02-23 07:56:49 +01:00
Michael Vogel
bc283a5316 The "abstract" has moved after the "nobb" part in bbcode. 2016-02-23 07:21:40 +01:00
Michael Vogel
8ec833f808 New BBCode element "abstract" for network depending messages. 2016-02-22 23:20:59 +01:00
Michael Vogel
d10eee45b9 Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-19 11:55:57 +01:00
fabrixxm
8c8ebb4adc Merge pull request #2372 from annando/issue-2367 
Issue 2367: The data for the gserver table is now sanitized.
 2016-02-19 08:30:54 +01:00
Michael Vogel
8a3de7b186 Issue 2367: The data for the gserver table is now sanitized. 2016-02-19 07:30:28 +01:00
Michael Vogel
2eb461ed2c Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-18 08:15:58 +01:00
Tobias Diekershoff
26463d92da Merge pull request #2366 from annando/1602-array_merge 
Avoid "array_merge" warning.
 2016-02-18 07:50:43 +01:00
Michael Vogel
9619829b4a Avoid "array_merge" warning. 2016-02-18 07:41:08 +01:00
Michael Vogel
f9e2543133 Merge pull request #2354 from fabrixxm/issues/api-errors 
api: throw HTTPException instead of calling api_error directly
 2016-02-18 07:26:33 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
fabrixxm
063bc5480f Merge pull request #2365 from tobiasd/20160217-it 
IT update to the strings
 2016-02-17 15:18:15 +01:00
Tobias Diekershoff
e22d980e91 IT update to the strings 2016-02-17 15:13:45 +01:00
Michael Vogel
c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel
8af8567567 Some more ... 2016-02-17 12:18:36 +01:00
fabrixxm
fb28713ca3 Merge pull request #2363 from tobiasd/2016ß217-credits 
make_credits.py: handle exception with non-existing addon directory
 2016-02-17 09:01:29 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Tobias Diekershoff
b21275ee9c handle exception with non-existing addon directory 2016-02-17 08:00:38 +01:00
Tobias Diekershoff
406b141e22 Merge pull request #2355 from annando/1602-remove-simplepie 
Simplepie is removed since we don't use it anymore
 2016-02-17 07:24:34 +01:00
Tobias Diekershoff
6924cd1fec Merge pull request #2362 from soko1/translate 
Complemented and improved russian translation
 2016-02-17 07:21:33 +01:00
Michael Vogel
f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Sakałoŭ Alaksiej
a9f80d435b Complemented and improved russian translation 2016-02-16 20:57:15 +03:00
Michael Vogel
a18fde458c Added documentation. 2016-02-16 08:06:55 +01:00
Michael Vogel
ade5ef7065 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-16 07:58:01 +01:00
Tobias Diekershoff
e9fe220116 Merge pull request #2356 from annando/1602-redmatrix-name 
We now show the correct platform (redmatrix or hubzilla)
 2016-02-15 07:38:16 +01:00
Tobias Diekershoff
57ddcd626f Merge pull request #2349 from annando/1602-gcontact-cleanup 
Updating of gcontact data has improved
 2016-02-15 07:37:11 +01:00
Michael Vogel
ec1bfe3d22 Merge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name 2016-02-14 21:03:57 +01:00
Michael Vogel
88018b6e73 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-14 20:57:57 +01:00
Michael Vogel
b0548018d8 Simplepie is removed since we don't use it anymore 2016-02-14 19:50:59 +01:00
Michael Vogel
7f1f549c6f Fallback when there is no nick name 2016-02-14 15:08:49 +01:00
Michael Vogel
21fc3c60d4 We now show the correct platform (redmatrix or hubzilla) 2016-02-14 15:05:43 +01:00
Michael Vogel
ec57b61f01 The feed function has now a simulation mode 2016-02-14 15:02:59 +01:00
Michael Vogel
922186bdd1 Small bugfix for the keyword bug in the gcontact table 2016-02-14 12:39:57 +01:00
Michael Vogel
5d35974c19 "addr" and "server_url" are now generated directly in "update_gcontact" if not given. 2016-02-14 11:56:23 +01:00
fabrixxm
3f5f1351b9 api: throw HTTPException instead of calling api_error directly 
there was some places where api_error() was called instead of throwing
correct subclass of HTTPException. This was causing php errors.

Dogygen comment of api_error() is updated as well
 2016-02-14 11:24:51 +01:00
Michael Vogel
b9e1792076 The shadow contact (contact with uid=0) will be updated now as well. 2016-02-14 07:31:57 +01:00
Michael Vogel
5086b8b2a7 DFRN Bugfix: The poco data wasn't sent 2016-02-14 00:14:03 +01:00
Michael Vogel
15296b8036 Avoid errors when noscrape data can't be fetched. 2016-02-13 22:20:00 +01:00
Michael Vogel
f496af08bb OStatus: The gcontact table will now be updated from the conversation as well 2016-02-13 21:35:05 +01:00
Michael Vogel
9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Tobias Diekershoff
d0b5c16a20 Merge pull request #2351 from annando/1602-performance-unread-group 
Optimized query for unread group postings
 2016-02-13 19:43:33 +01:00
Tobias Diekershoff
6268d776af Merge pull request #2350 from annando/1602-vier-aside-img 
Vier: Pictures in the side bar shouldn't be larger than the side bar
 2016-02-13 19:42:35 +01:00
Michael Vogel
bf7dedb03b Optimized query for unread group postings 2016-02-13 18:15:24 +01:00
Michael Vogel
307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar 2016-02-13 14:21:53 +01:00
Michael Vogel
a4da9fb55d Update the gcontact entry when the contact entry is checked for updates 2016-02-13 14:09:08 +01:00