Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | provide wiki as a feature (default is on so there aren't any surprises) and ↵ | redmatrix | 2016-06-29 | 1 | -0/+15 |
| | | | | add to channel menu and profile tabs | ||||
* | stream large photos through buffered I/O if possible | redmatrix | 2016-06-29 | 1 | -3/+27 |
| | |||||
* | Merge pull request #444 from git-marijus/dev | hubzilla | 2016-06-30 | 1 | -2/+2 |
|\ | | | | | Merge branch sabre32 into dev | ||||
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-29 | 2 | -2/+5 |
| |\ | |||||
| * \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 8 | -10/+86 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 27 | -27/+72 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 1 | -21/+25 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 11 | -73/+244 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -10/+19 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 6 | -7/+751 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -24/+46 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -4/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 4 | -9/+149 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 13 | -80/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 2 | -15/+183 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 3 | -0/+455 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 4 | -19/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-08 | 6 | -10/+429 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-07 | 1 | -43/+63 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-06 | 2 | -1/+190 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-05 | 4 | -10/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 2 | -7/+103 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-02 | 25 | -196/+189 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-01 | 21 | -184/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-31 | 3 | -5/+171 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-30 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade to sabre32 | Mario Vavti | 2016-05-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | missing backslash leads to wsod on refresh permissions | Mario Vavti | 2016-06-29 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | readability | redmatrix | 2016-06-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | identity_export_year() was a bit short-sighted. We really require arbitrary ↵ | redmatrix | 2016-06-28 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date ranges. A new function was created to tackle this - channel_export_items() which takes a channel, and a start and finish date. Finish date will default to "now" if not set. Will be working this into the interface under a module named "export_items" which will correspond closely to the existing "import_items" module you'll need to do the reverse operation. Will also make it available via the API. Once that is complete, I anticipate removing identity_export_year() as it will then be somewhat redundant, and modifying the documentation on the channel export page accordingly. Note: the function works strictly in GMT so an interface would need to convert from channel local time. | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | still working through some issues with curl magic-auth | redmatrix | 2016-06-27 | 4 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed profile photo upload | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | provide a daemon for implementing zot magic-auth over curl. | redmatrix | 2016-06-27 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registrations | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | replace [+] and [-] with chevron icons | redmatrix | 2016-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | comment on the setup page about the possible need for intermediate certs. | redmatrix | 2016-06-27 | 2 | -4/+10 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | fix for the rendering side of issue #412. We traditionally store all | redmatrix | 2016-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "user generated" content with ENT_COMPAT encoding to reduce the attack vector for JS CSS exploits. This may present compatibility issues sharing wikis to platforms which do not provide such CSS protection. We can either decide that wikis are inherently insecure and filter them on render (with an associated performance penalty), or keep the existing method of filtering on store. I'm not making that choice. I'm merely fixing the obvious rendering issue in mono-platform viewing. | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵ | redmatrix | 2016-06-26 | 26 | -26/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which should fix issue #431 | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | document the daemon classes | redmatrix | 2016-06-26 | 1 | -0/+43 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki | ||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 12 | -81/+261 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | fix pdledit "list layouts" | redmatrix | 2016-06-24 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | SuperCurl to provide a re-usable curl options stack and just change options ↵ | redmatrix | 2016-06-23 | 2 | -1/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that are different from one call to the next | ||||
| * | | | | | | | | | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a ↵ | redmatrix | 2016-06-23 | 4 | -20/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mistake in retrospect | ||||
| * | | | | | | | | | | | | | | | | | | | | | | relocate the cache class | redmatrix | 2016-06-23 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 4 | -47/+62 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | db statement debugging | redmatrix | 2016-06-22 | 2 | -5/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |