Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | still working through some issues with curl magic-auth | redmatrix | 2016-06-27 | 1 | -0/+7 | |
| | | | | | | | | | | | | fixed profile photo upload | |||||
| | * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 2 | -3/+19 | |
| | | | | | | | | | | | | registrations | |||||
| | * | replace [+] and [-] with chevron icons | redmatrix | 2016-06-27 | 1 | -4/+4 | |
| | | | ||||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 3 | -3/+26 | |
| |\| | ||||||
| | * | remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵ | redmatrix | 2016-06-26 | 1 | -2/+1 | |
| | | | | | | | | | | | | which should fix issue #431 | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-26 | 2 | -12/+42 | |
| | |\ | ||||||
| | * | | issue #442, tables contain too much whitespace (there's a definite issue ↵ | redmatrix | 2016-06-26 | 2 | -1/+25 | |
| | | | | | | | | | | | | | | | | here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem). | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 2 | -12/+42 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-25 | 1 | -9/+8 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 7 | -104/+62 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 4 | -7/+10 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 5 | -46/+61 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 5 | -12/+53 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 2 | -11/+16 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 4 | -2/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 4 | -8/+38 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 4 | -12/+114 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 2 | -1/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 11 | -75/+101 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 4 | -24/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 2 | -0/+471 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | more style work | Mario Vavti | 2016-06-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵ | Andrew Manning | 2016-06-30 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings. | |||||
* | | | | | | | | | | | | | | | | | | Added table of contents generator. Table is inserted wherever [toc] is ↵ | Andrew Manning | 2016-06-26 | 1 | -1/+75 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encountered. | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #441 from Treer/cdn | hubzilla | 2016-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix absolute .js urls | |||||
| * | | | | | | | | | | | | | | | | | fix absolute .js urls | Treer | 2016-06-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wiki | hubzilla | 2016-06-26 | 1 | -4/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Wiki post generation option and image embed tool | |||||
| * | | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki | |||||
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 9 | -120/+80 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵ | Andrew Manning | 2016-06-25 | 1 | -4/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser. | |||||
* | | | | | | | | | | | | | | | | | Allow absolute links to css and js files | Treer | 2016-06-25 | 1 | -8/+20 | |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | media (e.g. video) files weren't being detected correctly in oembed, causing ↵ | redmatrix | 2016-06-25 | 1 | -9/+8 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the stream to try and load large videos (and failing) | |||||
* | | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a ↵ | redmatrix | 2016-06-23 | 3 | -12/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mistake in retrospect | |||||
* | | | | | | | | | | | | | | | relocate the cache class | redmatrix | 2016-06-23 | 3 | -72/+6 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 1 | -20/+45 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 2 | -2/+2 | |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | |||||
* | | | | | | | | | | | | | vcard spec changes | redmatrix | 2016-06-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | 1. provide automatic relocation of important links in items that are ↵ | redmatrix | 2016-06-21 | 5 | -46/+60 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | | | | | | | | | | make sure the optimisations are reliable | redmatrix | 2016-06-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | code optimisation | redmatrix | 2016-06-20 | 3 | -9/+8 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | update attach on import if exists | redmatrix | 2016-06-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 1 | -1/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Wiki page revision comparison viewer | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 6 | -13/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -8/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -1/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | | | | | | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | |