Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 7 | -38/+132 |
|\ | |||||
| * | Remove local_channel() check on cache_body_hook call | Max Kostikov | 2018-12-02 | 1 | -9/+7 |
| * | Check local_channel() before cache call | Max Kostikov | 2018-11-30 | 1 | -6/+8 |
| * | Move cache code to addon | Max Kostikov | 2018-11-30 | 1 | -17/+7 |
| * | Fix wrong parameter | Max Kostikov | 2018-11-29 | 1 | -4/+3 |
| * | Update text.php | Max Kostikov | 2018-11-29 | 1 | -5/+0 |
| * | Better cache settings logic | Max Kostikov | 2018-11-29 | 1 | -4/+4 |
| * | Skip sslify for images if it already were cached with https enabled | Max Kostikov | 2018-11-29 | 1 | -1/+6 |
| * | Update text.php | Max Kostikov | 2018-11-29 | 1 | -1/+2 |
| * | Cache for viewer channel | Max Kostikov | 2018-11-29 | 1 | -5/+4 |
| * | Disable links to cached photos for non logged viewers | Max Kostikov | 2018-11-29 | 1 | -1/+1 |
| * | Code cleanup | Max Kostikov | 2018-11-29 | 1 | -3/+3 |
| * | Update text.php | Max Kostikov | 2018-11-29 | 1 | -2/+2 |
| * | Add photo cache support using sslify() | Max Kostikov | 2018-11-29 | 1 | -6/+27 |
| * | Add photo cache hooks | Max Kostikov | 2018-11-29 | 1 | -33/+57 |
| * | Add photo cache cleanup | Max Kostikov | 2018-11-29 | 1 | -0/+23 |
| * | Update database with expires field for photo | Max Kostikov | 2018-11-29 | 1 | -0/+32 |
| * | Add expires for photo | Max Kostikov | 2018-11-29 | 1 | -0/+2 |
| * | Add expires for photo | Max Kostikov | 2018-11-29 | 1 | -0/+2 |
| * | Add PHOTO_CACHE photo type | Max Kostikov | 2018-11-29 | 1 | -1/+2 |
* | | fallback to url if we have not got an addr | Mario Vavti | 2018-12-02 | 1 | -1/+1 |
* | | fix filtering by addr in handleNotificationsItems() | Mario Vavti | 2018-12-02 | 2 | -2/+3 |
* | | Merge branch 'pdf_embed_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -1/+5 |
|\ \ | |||||
| * | | make pdf preview 100% width and 300px height to match it openstreetmaps preview | Mario Vavti | 2018-12-01 | 1 | -1/+5 |
| |/ | |||||
* | | Merge branch 'sticky_aside_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -3/+3 |
|\ \ | |||||
| * | | redbasic sticky aside fixes | Mario Vavti | 2018-12-01 | 1 | -3/+3 |
| |/ | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-01 | 7 | -12/+52 |
|\ \ | |/ |/| | |||||
| * | typo | zotlabs | 2018-11-30 | 1 | -1/+1 |
| * | allow notification filtering by name or addr | zotlabs | 2018-11-30 | 4 | -8/+16 |
| * | attached photo permissions regression | zotlabs | 2018-11-30 | 1 | -4/+4 |
| * | prevent incompatible export files (osada/zap) from being imported. This is to... | zotlabs | 2018-11-27 | 2 | -0/+32 |
* | | Merge branch 'es-es' into 'dev' | M. Dent | 2018-11-28 | 1 | -14/+21 |
|\ \ | |||||
| * \ | Merge branch 'cherry-pick-5ac08ec3' into 'es-es' | Manuel Jiménez Friaza | 2018-11-26 | 1 | -14/+21 |
| |\ \ | |||||
| | * | | Revision 1 doc/es-es/about/about.bb | Manuel Jiménez Friaza | 2018-11-26 | 1 | -14/+21 |
| |/ / | |||||
* | | | Merge branch 'default2flex-conversion' into 'dev' | M. Dent | 2018-11-28 | 3 | -17/+35 |
|\ \ \ | |||||
| * | | | use flex for the default template | Mario | 2018-11-26 | 3 | -17/+35 |
* | | | | Merge branch 'composer-updates' into 'dev' | M. Dent | 2018-11-28 | 19 | -118/+139 |
|\ \ \ \ | |||||
| * | | | | update jquery-file-upload and psr-log via composer | Mario | 2018-11-25 | 21 | -175/+164 |
* | | | | | Merge branch 'update-imagesloaded' into 'dev' | M. Dent | 2018-11-28 | 40 | -98/+1870 |
|\ \ \ \ \ | |||||
| * | | | | | update imagesloaded to version 4.1.4 via composer | Mario | 2018-11-25 | 40 | -98/+1870 |
| |/ / / / | |||||
* | | | | | Merge branch 'pg-fixes' into 'dev' | M. Dent | 2018-11-28 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | fix db upgrade 1228 for postgres | Mario | 2018-11-22 | 1 | -2/+2 |
* | | | | | Merge branch 'patch-20181120a' into 'dev' | Mario | 2018-11-25 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Do not store serialized pconfig value received via to Module/Pconfig.php | M. Dent | 2018-11-25 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'es-es' into 'dev' | Mario | 2018-11-24 | 2 | -27/+27 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Update es-es | Manuel Jiménez Friaza | 2018-11-24 | 2 | -27/+27 |
| * | | | Resolved merge conflicts | Manuel Jiménez Friaza | 2018-11-24 | 54 | -1060/+1770 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-23 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Organization actor type was missing | zotlabs | 2018-11-23 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-23 | 3 | -18/+20 |
|\| | | | |_|/ |/| | |