Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 12 | -186/+248 |
|\ | |||||
| * | Merge branch 'patch-20181113a' into 'dev' | M. Dent | 2018-11-14 | 3 | -6/+16 |
| |\ | |||||
| | * | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ... | DM42.Net (Matt Dent) | 2018-11-13 | 2 | -5/+15 |
| | |\ | |||||
| | | * | xss in search | zotlabs | 2018-11-13 | 1 | -3/+3 |
| | | * | enotify::format hook for superblock | zotlabs | 2018-11-12 | 1 | -2/+12 |
| | * | | Filter search box before display | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'revert-6375f2d7' into 'dev' | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
| |\ \ | |||||
| | * | | Revert "Replace fetch_image_from_url() with z_fetch_url()" | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
| |/ / | |||||
| * | | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+9 |
| * | | Merge branch 'fix-activity-filter-widget' into 'dev' | M. Dent | 2018-11-12 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | use the correct javascript function for this case | Mario Vavti | 2018-11-11 | 1 | -1/+1 |
| * | | | Merge branch 'css-fixes' into 'dev' | M. Dent | 2018-11-12 | 3 | -12/+8 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | fix css issues in bbcode conversion and focus-light schema | Mario Vavti | 2018-11-12 | 3 | -12/+8 |
| |/ / | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-11 | 3 | -14/+18 |
| |\ \ | |||||
| | * \ | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 2 | -5/+9 |
| | |\ \ | |||||
| | | * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-11-10 | 1 | -9/+9 |
| | | |\ \ | |||||
| | | * | | | Update photo_driver.php | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | * | | | Preserve photo modification date | Max Kostikov | 2018-11-10 | 1 | -4/+8 |
| | | * | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | * | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 1 | -5/+2 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 1 | -9/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | Remove DNS check for database connection during installation. Causes friction... | Andrew Manning | 2018-11-09 | 1 | -9/+9 |
| * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-10 | 3 | -16/+20 |
| |\| | | | | | | |_|/ / / | |/| | | | | |||||
| | * | | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | * | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 3 | -15/+19 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Do not return default images from vCard | Max Kostikov | 2018-11-10 | 1 | -1/+0 |
| | | * | | | Remove unnecessary Zulu timezone mention | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | * | | | Preserve received image modification date on caching | Max Kostikov | 2018-11-09 | 1 | -11/+16 |
| | | * | | | Fixed timezone conversion | Max Kostikov | 2018-11-09 | 1 | -4/+4 |
| | |/ / / | |||||
| * / / / | fix shared_header img expanding to 100% width when sharing a share | Mario Vavti | 2018-11-10 | 1 | -5/+2 |
| |/ / / | |||||
| * | | | Merge branch 'patch-1' into 'dev' | Mario | 2018-11-09 | 1 | -128/+156 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | remove image type double guess by checking HTTP headers | Max Kostikov | 2018-11-08 | 1 | -23/+7 |
| | * | | Return image modification date using HTTP 'Last-Modified' and '304 Not Modifi... | Max Kostikov | 2018-11-08 | 1 | -115/+159 |
| * | | | Workaround for local resource path to photo from Diaspora | Max Kostikov | 2018-11-09 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge branch 'fix-photo' into 'dev' | M. Dent | 2018-11-08 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge branch 'patch-1' into 'fix-photo' | Mario | 2018-11-08 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Correct "Content-Length:" calculation added | Max Kostikov | 2018-11-08 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'fix-photo' into 'dev' | M. Dent | 2018-11-08 | 1 | -1/+2 |
| |\| | | |||||
| | * | | $data only contains the link to the image if the image is in os storage. The ... | Mario Vavti | 2018-11-08 | 1 | -1/+2 |
| |/ / | |||||
| * | | Merge branch 'patch-1' into 'dev' | Mario | 2018-11-08 | 1 | -6/+6 |
| |\ \ | |||||
| | * | | Disable image caching if personal or group permissions enabled | Max Kostikov | 2018-11-07 | 1 | -6/+6 |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-08 | 1 | -6/+14 |
| |\| | | |||||
| | * | | Merge branch 'patch-1' into 'dev' | M. Dent | 2018-11-07 | 1 | -6/+14 |
| | |\ \ | |||||
| | | * | | Added `If-Modified-Since` header support for better image caching and fixed a... | Max Kostikov | 2018-11-07 | 1 | -6/+14 |
| | |/ / | |||||
| * | | | provide a function to log to syslog | Mario Vavti | 2018-11-08 | 1 | -0/+13 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-07 | 3 | -45/+95 |
| |\ \ \ | |||||
| * | | | | fix es-es hstrings.php | Mario Vavti | 2018-11-07 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | stay ahead of the game | zotlabs | 2018-11-13 | 1 | -2/+2 |
* | | | | item uuid changes | zotlabs | 2018-11-12 | 3 | -21/+14 |
* | | | | dreport updates | zotlabs | 2018-11-12 | 6 | -13/+110 |