Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-11 | 2 | -15/+17 | |
|\ \ \ | ||||||
| * | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendere... | zotlabs | 2019-05-09 | 2 | -15/+17 | |
* | | | | bump version | Mario Vavti | 2019-05-10 | 1 | -1/+1 | |
* | | | | update justified gallery lib | Mario Vavti | 2019-05-10 | 4 | -80/+123 | |
* | | | | css fix for bootstrap 4.3.1 | Mario Vavti | 2019-05-10 | 1 | -0/+4 | |
* | | | | update bootstrap to version 4.3.1 | Mario Vavti | 2019-05-10 | 448 | -23029/+27299 | |
* | | | | fix issue with color selector | Mario Vavti | 2019-05-10 | 1 | -3/+7 | |
* | | | | typo | Mario Vavti | 2019-05-10 | 1 | -1/+1 | |
* | | | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 6 | -21/+22 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 7 | -31/+33 | |
|\ \ \ | ||||||
| * | | | remove the caldav and event app and make calendar the default app | Mario Vavti | 2019-05-09 | 7 | -31/+33 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 2 | -1/+2 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -0/+1 | |
| * | | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -1/+1 | |
* | | | calendar merge: cleanup and comment out some unused code | Mario Vavti | 2019-05-09 | 5 | -81/+69 | |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 4 | -4/+44 | |
|\ \ \ | ||||||
| * | | | another DB update to fix uid_mid index in item table and add xchan_photo_m in... | Mario Vavti | 2019-05-08 | 4 | -4/+44 | |
|/ / / | ||||||
* | | | Merge branch 'channel_update' into 'dev' | Max Kostikov | 2019-05-08 | 4 | -1933/+48 | |
|\ \ \ | ||||||
| * | | | Channel update | Mario | 2019-05-08 | 4 | -1933/+48 | |
|/ / / | ||||||
* | | | remove option which should never have slipped into dev branch | Mario Vavti | 2019-05-08 | 1 | -2/+1 | |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 1 | -6/+5 | |
|\| | | ||||||
| * | | Replace own image URL in clonned channel posts | Max Kostikov | 2019-05-08 | 1 | -6/+5 | |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 2 | -14/+4 | |
|\| | | ||||||
| * | | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 | |
| * | | Update PhotoDriver.php | Max Kostikov | 2019-05-08 | 1 | -13/+3 | |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 2 | -77/+47 | |
|\| | | ||||||
| * | | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 | |
| * | | Add photo usage detection if not exist on thumbnail save | Max Kostikov | 2019-05-08 | 1 | -0/+12 | |
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-06 | 1 | -7/+8 | |
|\ \ \ | ||||||
| * | | | review of last commit | zotlabs | 2019-05-06 | 1 | -2/+2 | |
| * | | | possible xchan (protocol) confusion in include/follow | zotlabs | 2019-05-06 | 1 | -5/+6 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-06 | 1 | -1/+0 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Remove 'os_syspath' from direct 'photo' table update | Max Kostikov | 2019-05-06 | 1 | -1/+0 | |
* | | | | Add system.filesystem_storage_thumbnails description | Max Kostikov | 2019-05-05 | 1 | -1/+2 | |
* | | | | More precise scroll back to initial comment in thread | Max Kostikov | 2019-05-05 | 1 | -8/+6 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-05 | 3 | -4/+11 | |
|\| | | | ||||||
| * | | | Scroll back to initial low level comment | Max Kostikov | 2019-05-05 | 1 | -2/+8 | |
| * | | | Use own variable for "Go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+2 | |
| * | | | Force to add "go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+1 | |
| * | | | Scroll back if more than one level in thread | Max Kostikov | 2019-05-05 | 0 | -0/+0 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-05 | 1 | -2/+3 | |
|\| | | | ||||||
| * | | | Threaded comments navigation elements fixes | Max Kostikov | 2019-05-05 | 1 | -2/+3 | |
|/ / / | ||||||
* | | | Allign arrows position | Max Kostikov | 2019-05-05 | 1 | -1/+1 | |
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-05 | 8 | -150/+222 | |
|\ \ \ | ||||||
| * | | | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 8 | -150/+222 | |
|/ / / | ||||||
* | | | Merge branch 'db_update' into 'dev' | Max Kostikov | 2019-05-04 | 4 | -9/+67 | |
|\ \ \ | ||||||
| * | | | port db update improvements from zap | Mario Vavti | 2019-05-03 | 4 | -9/+67 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-04 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | found another case where channel_r_photos could get referenced | zotlabs | 2019-05-04 | 1 | -1/+1 | |
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-04 | 1 | -1/+2 | |
|\| | | |