Commit graph

15536 commits

Author SHA1 Message Date
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
85bfbdaeba addons 2017-05-23 12:14:09 +02:00
503e8d46ab issues for the CHANGELOG 2017-05-23 11:54:00 +02:00
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
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
0ae92f0e72 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 06:07:02 +00:00
1bd6d7dd7a Bugfix OStatus: Avoid empty author data 2017-05-23 05:28:51 +00:00
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
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
ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
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
b6d646cb85 removed some more files from doc/de 2017-05-20 11:24:28 +02:00
09b5fea371 removed de/andfinally from docs 2017-05-20 11:22:47 +02:00
617c094beb links in BBCode docs 2017-05-20 11:20:31 +02:00
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
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
192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
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
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
fd5d058156 Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2
Frio: better UX for aside bar
2017-05-17 11:27:37 +02:00
cb3077b7a9 It is better this way 2017-05-17 06:07:55 +00:00
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
80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
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
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
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
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
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