Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-23 | 1 | -6/+6 | |
| |\ \ | ||||||
| * | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 6 | -68/+108 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 8 | -24/+36 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #433 from dissolve/microformats2 | hubzilla | 2016-06-23 | 1 | -6/+6 | |
| |\ \ \ | | |/ / | |/| | | microformats 2 for posts | |||||
| | * | | microformats 2 for posts | Ben Roberts | 2016-06-22 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | set profile when "use existing photo" | redmatrix | 2016-06-22 | 1 | -4/+14 | |
| | | | | ||||||
| * | | | missing class selector when "use photo as profile photo" | redmatrix | 2016-06-22 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | the xchan_query wasn't fully optimised as we were comparing quoted and ↵ | redmatrix | 2016-06-22 | 1 | -4/+4 | |
| | | | | | | | | | | | | unquoted strings when looking for duplicates | |||||
| * | | db statement debugging | redmatrix | 2016-06-22 | 3 | -6/+8 | |
| | | | ||||||
| * | | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 3 | -3/+3 | |
| |/ | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | |||||
* | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 14 | -77/+842 | |
|\| | ||||||
| * | provide a skeleton of the current CalDAVClient with lots of notes about how ↵ | redmatrix | 2016-06-21 | 1 | -0/+739 | |
| | | | | | | | | best to move forward just in case anybody is feeling ambitious or anxious. | |||||
| * | channel homepage not providing content when javascript disabled | redmatrix | 2016-06-21 | 1 | -0/+3 | |
| | | ||||||
| * | vcard spec changes | redmatrix | 2016-06-21 | 4 | -24/+31 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-21 | 0 | -0/+0 | |
| |\ | ||||||
| | * | 1. provide automatic relocation of important links in items that are ↵ | redmatrix | 2016-06-21 | 9 | -53/+69 | |
| | | | | | | | | | | | | | | | | | | imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. | |||||
| * | | 1. provide automatic relocation of important links in items that are ↵ | redmatrix | 2016-06-21 | 9 | -53/+69 | |
| |/ | | | | | | | | | | | | | imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. 3. item_store and item_store_update now return the item that was stored | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 10 | -50/+565 | |
|\| | ||||||
| * | make sure the optimisations are reliable | redmatrix | 2016-06-20 | 1 | -1/+1 | |
| | | ||||||
| * | code optimisation | redmatrix | 2016-06-20 | 4 | -30/+13 | |
| | | ||||||
| * | update attach on import if exists | redmatrix | 2016-06-20 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-20 | 45 | -86804/+62098 | |
| |\ | ||||||
| | * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 5 | -17/+550 | |
| | |\ | | | | | | | | | Wiki page revision comparison viewer | |||||
| | | * | Merge branch 'dev' into wiki | Andrew Manning | 2016-06-20 | 0 | -0/+0 | |
| | | |\ | ||||||
| | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2016-06-20 | 47 | -1150/+22931 | |
| | | | |\ | ||||||
| | | | * \ | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-06-16 | 73 | -553/+25128 | |
| | | | |\ \ | ||||||
| | | | * \ \ | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-06-15 | 35 | -167/+392 | |
| | | | |\ \ \ | ||||||
| | | | * | | | | Move Spanish context help translation from es to es-es and make es a symlink ↵ | Andrew Manning | 2016-06-13 | 15 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to es-es | |||||
| | | * | | | | | Add formatted heading for revision comparison viewer | Andrew Manning | 2016-06-20 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 42 | -1139/+22890 | |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | * | | | | | Do not change active page commit until user reverts the page | Andrew Manning | 2016-06-20 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 6 | -11/+41 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 5 | -17/+548 | |
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | |||||
| * | | | | | | | fix siteinfo plugin list | redmatrix | 2016-06-20 | 1 | -2/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | last merge from master did reset the std_version to 1.8 - set it back to 1.9 ↵ | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for dev | |||||
* | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 40 | -86788/+61549 | |
|\| | | | | | | ||||||
| * | | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 40 | -86788/+61549 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | missing backslash leading to wsod on xconfig changes | Mario Vavti | 2016-06-20 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | merge conflict | redmatrix | 2016-06-19 | 1 | -6/+0 | |
| | | | | | | | ||||||
| | * | | | | | zot_revision should be string, not float1.8 | redmatrix | 2016-06-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | recreate link from the merge kerfuffle | redmatrix | 2016-06-19 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 2861 | -171567/+92849 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 | |
| | | | | | | | | ||||||
| | | * | | | | | hebrew update | redmatrix | 2016-06-18 | 3 | -3548/+1311 | |
| | | | | | | | | ||||||
| | | * | | | | | changelog update for 1.8 | redmatrix | 2016-06-17 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| | | * | | | | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge | redmatrix | 2016-06-15 | 44 | -81254/+77509 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵ | jeroenpraat | 2016-06-15 | 44 | -81254/+77509 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)). | |||||
| | | * | | | | | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 | |
| | | |/ / / / / |