clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,914 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 096fab0bb5 Merge pull request #3491 from annando/1705-priorities 
Improved priorities for handling the item expiration
 2017-05-24 18:18:43 +02:00
Tobias Diekershoff d48a277624 regen credits 2017-05-24 14:46:27 +02:00
Tobias Diekershoff 960a1b6e9b core 2017-05-24 14:33:43 +02:00
Michael 3d14fa3d81 Priority needs to be integer 2017-05-24 10:36:44 +00:00
Michael d2dd0b3248 Minimal poll intervall 2017-05-24 08:21:05 +00:00
Michael d7de7bb70a Optimized priorities for the automated expiring of items 2017-05-24 06:29:47 +00:00
Michael Vogel 0cc15f5c3d Merge pull request #3481 from Hypolite/issue/#3480 
Remove special case of "url" from insertFormatting
 2017-05-24 07:20:07 +02:00
Hypolite Petovan 471056e989 Merge pull request #3488 from annando/ptobr-no-cache 
Probing via web frontend shouldn't use the cache.
 2017-05-23 17:21:10 -04:00
Michael 07e318e991 some more logging 2017-05-23 20:19:39 +00:00
Michael e37b6bcd41 Probing via web frontend shouldn't use the cache. 2017-05-23 19:38:47 +00:00
Tobias Diekershoff 7e3d7ba3a7 Merge pull request #3487 from AndyHee/3.5.2rc 
EN-GB Translation
 2017-05-23 21:00:44 +02:00
Andy H3 cebe1c00db EN-GB Translation 2017-05-23 22:05:34 +07:00
Andy H3 9ee4532936 Create messages.po 
British English localisation that aims to address various issues in the source, including consistent spelling, appropriate level of capitalisation, succinct wording, and user-centred phrases at basic level.
 2017-05-23 20:05:40 +07:00
Tobias Diekershoff 85bfbdaeba addons 2017-05-23 12:14:09 +02:00
Tobias Diekershoff 503e8d46ab issues for the CHANGELOG 2017-05-23 11:54:00 +02:00
Michael 8abdbb799a Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 08:13:37 +00:00
Hypolite Petovan c72a6d0035 Merge pull request #3484 from annando/fix-empty-author 
Bugfix OStatus: Avoid empty author data
 2017-05-23 03:14:41 -04:00
Tobias Diekershoff 86e2dc2009 Merge pull request #3485 from annando/range-curl 
Bugfix ParseUrl: Only fetch a range to avoid memory issues
 2017-05-23 08:16:34 +02:00
Michael 0ae92f0e72 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 06:07:02 +00:00
Michael 1bd6d7dd7a Bugfix OStatus: Avoid empty author data 2017-05-23 05:28:51 +00:00
Michael c84a2fb1a3 Bugfix ParseUrl: Only fetch a range to avoid memory issues 2017-05-23 05:26:22 +00:00
Michael Vogel e5429b2d17 Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix 
Bugfix: fix frio's event dropdown color
 2017-05-22 17:55:28 +02:00
rabuzarus dc76e81d3e Bugfix: fix frio's event dropdown color 2017-05-22 14:44:51 +02:00
Roland Häder e9c9c47a84
Continued a bit: 
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:09:07 +02:00
Roland Häder 291af19f25
Some improvements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:06:22 +02:00
Hypolite Petovan d14da1214c Remove special case of "url" from insertFormatting 2017-05-21 13:41:28 -04:00
Hypolite Petovan 88e5e06b45 Standards 2017-05-21 13:40:51 -04:00
Michael Vogel 23010d8562 Merge pull request #3479 from Hypolite/3.5.2rc 
Frio: Fix Hubzilla scrollToItem
 2017-05-20 22:13:37 +02:00
Michael ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
Michael 44efdc3e1b Central item expiration routine for external items 2017-05-20 20:02:06 +00:00
Hypolite Petovan 87e7fac397 Frio: Fix hubzilla scrollToItem 
- Removed unnecessary item guid truncation
 2017-05-20 13:18:20 -04:00
Michael Vogel bd62f10697 Merge pull request #3478 from tobiasd/20170520-dedocs 
DE documentation
 2017-05-20 12:22:54 +02:00
Tobias Diekershoff b6d646cb85 removed some more files from doc/de 2017-05-20 11:24:28 +02:00
Tobias Diekershoff 09b5fea371 removed de/andfinally from docs 2017-05-20 11:22:47 +02:00
Tobias Diekershoff 617c094beb links in BBCode docs 2017-05-20 11:20:31 +02:00
Tobias Diekershoff 2e9ab15583 links in Account Basics 2017-05-20 11:12:51 +02:00
Hypolite Petovan 1f81d394de Merge pull request #3477 from beardyunixer/doco-without-making-a-shite-of-it-this-time 
Update doco
 2017-05-19 21:48:11 -04:00
Thomas Willingham e41c983f2e Switch image URL to master branch 2017-05-20 02:38:01 +01:00
Hypolite Petovan 4b8eced7a4 Merge pull request #3476 from rabuzarus/20170519_-_frio_not_experimental 
Frio: remove experimental flag + rise version number to 0.8
 2017-05-19 20:50:01 -04:00
Thomas Willingham 86c4ac80c5 Update doco 2017-05-19 21:37:45 +01:00
rabuzarus 5c9033a7e2 Frio: some correction in grammar/expression - thx Hypolite 2017-05-19 13:32:55 +02:00
Hypolite Petovan cb44ac386a Merge pull request #3475 from annando/bugfix-profile-change 
Bugfix: Timeout problems when saving profile settings
 2017-05-19 07:28:56 -04:00
rabuzarus 3cb5c83fca Frio: a word was missing in the README 2017-05-19 13:18:27 +02:00
rabuzarus 58260021b6 Frio: remove experimental flag + rise version number to 0.8 2017-05-19 13:11:30 +02:00
Michael 6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Hypolite Petovan f1090dd359 Merge pull request #3474 from annando/bugfix-mail 
Bugfix Diaspora: We exited with the wrong return values
 2017-05-17 15:58:17 -04:00
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
Roland Häder b6648215b8
Opps, missed them 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:42:40 +02: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