aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* css fix for bootstrap 4.3.1Mario Vavti2019-05-101-0/+4
|
* update bootstrap to version 4.3.1Mario Vavti2019-05-10448-23029/+27299
|
* fix issue with color selectorMario Vavti2019-05-101-3/+7
|
* typoMario Vavti2019-05-101-1/+1
|
* calendar merge: implement channel calendar import in cdav/calendarMario Vavti2019-05-106-21/+22
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-097-31/+33
|\ | | | | | | | | remove the caldav and event app and make calendar the default app See merge request hubzilla/core!1643
| * remove the caldav and event app and make calendar the default appMario Vavti2019-05-097-31/+33
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-092-1/+2
|\ \ | |/ |/| | | | | Add 'Create' button translation in CalDAV See merge request hubzilla/core!1642
| * Add 'Create' button translationMax Kostikov2019-05-091-0/+1
| |
| * Add 'Create' button translationMax Kostikov2019-05-091-1/+1
| |
* | calendar merge: cleanup and comment out some unused codeMario Vavti2019-05-095-81/+69
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-084-4/+44
|\ \ | | | | | | | | | | | | another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table See merge request hubzilla/core!1641
| * | another DB update to fix uid_mid index in item table and add xchan_photo_m ↵Mario Vavti2019-05-084-4/+44
|/ / | | | | | | index to xchan table
* | Merge branch 'channel_update' into 'dev'Max Kostikov2019-05-084-1933/+48
|\ \ | | | | | | | | | | | | Channel update See merge request hubzilla/core!1639
| * | Channel updateMario2019-05-084-1933/+48
|/ /
* | remove option which should never have slipped into dev branchMario Vavti2019-05-081-2/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-081-6/+5
|\| | | | | | | | | Replace own image URL in clonned channel posts See merge request hubzilla/core!1638
| * Replace own image URL in clonned channel postsMax Kostikov2019-05-081-6/+5
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-082-14/+4
|\| | | | | | | | | Change thumbnails processing logic on image edit See merge request hubzilla/core!1637
| * Update Photos.phpMax Kostikov2019-05-081-1/+1
| |
| * Update PhotoDriver.phpMax Kostikov2019-05-081-13/+3
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-082-77/+47
|\| | | | | | | | | Respect thumbnail storage location on image editing See merge request hubzilla/core!1636
| * Respect thumbnail storage location on image editingMax Kostikov2019-05-081-77/+35
| |
| * Add photo usage detection if not exist on thumbnail saveMax Kostikov2019-05-081-0/+12
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-061-7/+8
|\ \ | | | | | | | | | | | | possible xchan confusion include/follow See merge request hubzilla/core!1635
| * | review of last commitzotlabs2019-05-061-2/+2
| | |
| * | possible xchan (protocol) confusion in include/followzotlabs2019-05-061-5/+6
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-061-1/+0
|\ \ \ | | |/ | |/| | | | | | | Remove 'os_syspath' from direct 'photo' table update See merge request hubzilla/core!1634
| * | Remove 'os_syspath' from direct 'photo' table updateMax Kostikov2019-05-061-1/+0
| | |
* | | Add system.filesystem_storage_thumbnails descriptionMax Kostikov2019-05-051-1/+2
| | |
* | | More precise scroll back to initial comment in threadMax Kostikov2019-05-051-8/+6
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-053-4/+11
|\| | | | | | | | | | | | | | Threaded comments usability imrovements See merge request hubzilla/core!1633
| * | Scroll back to initial low level commentMax Kostikov2019-05-051-2/+8
| | |
| * | Use own variable for "Go to previous comment" hintMax Kostikov2019-05-051-1/+2
| | |
| * | Force to add "go to previous comment" hintMax Kostikov2019-05-051-1/+1
| | |
| * | Scroll back if more than one level in threadMax Kostikov2019-05-050-0/+0
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-051-2/+3
|\| | | | | | | | | | | | | | Threaded comments navigation elements fixes See merge request hubzilla/core!1632
| * | Threaded comments navigation elements fixesMax Kostikov2019-05-051-2/+3
|/ /
* | Allign arrows positionMax Kostikov2019-05-051-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-058-150/+222
|\ \ | | | | | | | | | | | | Add arrows to scroll between related comments See merge request hubzilla/core!1629
| * | Add arrows to scroll between related commentsMax Kostikov2019-05-058-150/+222
|/ /
* | Merge branch 'db_update' into 'dev'Max Kostikov2019-05-044-9/+67
|\ \ | | | | | | | | | | | | port db update improvements from zap See merge request hubzilla/core!1628
| * | port db update improvements from zapMario Vavti2019-05-034-9/+67
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-041-1/+1
|\ \ \ | | |/ | |/| | | | | | | found another case where channel_r_photos could get referenced See merge request hubzilla/core!1631
| * | found another case where channel_r_photos could get referencedzotlabs2019-05-041-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-041-1/+2
|\| | | | | | | | | | | | | | strip obsolete channel_(rw)_photos from channel sync packets See merge request hubzilla/core!1630
| * | strip obsolete channel_(rw)_photos from channel sync packetszotlabs2019-05-031-1/+2
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-032-3123/+3206
|\ \ \ | |_|/ |/| | | | | | | | Update Russian translation See merge request hubzilla/core!1627
| * | Update hstrings.phpMax Kostikov2019-05-031-506/+518
| | |
| * | Update hmessages.poMax Kostikov2019-05-031-2617/+2688
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 12:07:36 +0000