Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-13 | 2 | -300/+286 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-12 | 2 | -300/+286 |
| |\ | | | | | | | | | | | | | Add new Russian translations See merge request hubzilla/core!1646 | ||||
| | * | Update hstrings.php | Max Kostikov | 2019-05-12 | 1 | -11/+8 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2019-05-12 | 1 | -289/+278 |
| | | | |||||
* | | | form security token for mod register ported from zap | Mario Vavti | 2019-05-13 | 1 | -0/+1 |
|/ / | |||||
* | | css fix for bootstrap 4.3.1 | Mario Vavti | 2019-05-10 | 1 | -0/+4 |
| | | |||||
* | | fix issue with color selector | Mario Vavti | 2019-05-10 | 1 | -3/+7 |
| | | |||||
* | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 1 | -1/+1 |
|\| | | | | | | | | | Add 'Create' button translation in CalDAV See merge request hubzilla/core!1642 | ||||
| * | 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 | 1 | -11/+11 |
| | | |||||
* | | remove option which should never have slipped into dev branch | Mario Vavti | 2019-05-08 | 1 | -2/+1 |
| | | |||||
* | | More precise scroll back to initial comment in thread | Max Kostikov | 2019-05-05 | 1 | -8/+6 |
|/ | |||||
* | Scroll back to initial low level comment | Max Kostikov | 2019-05-05 | 1 | -2/+8 |
| | |||||
* | Force to add "go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+1 |
| | |||||
* | Threaded comments navigation elements fixes | Max Kostikov | 2019-05-05 | 1 | -2/+3 |
| | |||||
* | Allign arrows position | Max Kostikov | 2019-05-05 | 1 | -1/+1 |
| | |||||
* | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 6 | -143/+216 |
| | |||||
* | Merge branch 'db_update' into 'dev' | Max Kostikov | 2019-05-04 | 2 | -6/+16 |
|\ | | | | | | | | | port db update improvements from zap See merge request hubzilla/core!1628 | ||||
| * | port db update improvements from zap | Mario Vavti | 2019-05-03 | 2 | -6/+16 |
| | | |||||
* | | Update hstrings.php | Max Kostikov | 2019-05-03 | 1 | -506/+518 |
| | | |||||
* | | Update hmessages.po | Max Kostikov | 2019-05-03 | 1 | -2617/+2688 |
| | | |||||
* | | Revert "Fix comment edit field expansion on reply on comment" | Max Kostikov | 2019-05-03 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 3528610a51df54e843a2f3d55c8b7d925fa2fac7 | ||||
* | | Fix comment edit field expansion on reply on comment | Max Kostikov | 2019-05-03 | 1 | -1/+1 |
|/ | |||||
* | provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 1 | -1/+1 |
| | |||||
* | calendar merge: fix event_xchan mixup | Mario Vavti | 2019-05-01 | 1 | -7/+13 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 2 | -0/+19 |
|\ | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | ||||
| * | Add 'reply on comment' code | Max Kostikov | 2019-05-01 | 1 | -0/+10 |
| | | |||||
| * | Move JS to main module | Max Kostikov | 2019-05-01 | 1 | -13/+1 |
| | | |||||
| * | Remove 'doreply' JS function | Max Kostikov | 2019-04-30 | 1 | -9/+1 |
| | | |||||
| * | Add JS 'doreply' function | Max Kostikov | 2019-04-30 | 1 | -0/+12 |
| | | |||||
| * | Fix add multiple icons on 'Submit' button when reply on comment | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | |||||
| * | Update main.js | Max Kostikov | 2019-04-29 | 1 | -3/+2 |
| | | |||||
| * | Add 'reply to comment' processing | Max Kostikov | 2019-04-29 | 1 | -0/+13 |
| | | |||||
| * | Add 'reply to comment' button | Max Kostikov | 2019-04-29 | 1 | -0/+5 |
| | | |||||
* | | do not allow editing events that do not belong to us | Mario Vavti | 2019-04-30 | 1 | -1/+5 |
| | | |||||
* | | select event by event_hash instead of item_id | Mario Vavti | 2019-04-30 | 1 | -0/+4 |
| | | |||||
* | | remove logging | Mario Vavti | 2019-04-30 | 1 | -3/+0 |
| | | |||||
* | | calendar merge: implement single event editing UI | Mario Vavti | 2019-04-30 | 1 | -4/+26 |
| | | |||||
* | | calendar merge: d&d support and some minor cleanup and fixes | Mario Vavti | 2019-04-29 | 2 | -37/+80 |
| | | |||||
* | | calendar merge: bring back event categories | Mario Vavti | 2019-04-24 | 2 | -4/+21 |
| | | |||||
* | | resolve merge conflict | Mario Vavti | 2019-04-20 | 2 | -2/+2 |
|\| | |||||
| * | Add anti SEO link properties in directory listing | Max Kostikov | 2019-04-19 | 1 | -1/+1 |
| | | |||||
| * | Update cdav_calendar.tpl | Max Kostikov | 2019-04-19 | 1 | -2/+2 |
| | | |||||
| * | Add translation to update button | Max Kostikov | 2019-04-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 1 | -2/+3 |
|\| | |||||
| * | Add remove profile photo button | Max Kostikov | 2019-04-19 | 1 | -2/+3 |
| | | |||||
* | | provide link to source and some cleanup | Mario Vavti | 2019-04-19 | 2 | -5/+13 |
| | | |||||
* | | calendar merge initial commit | Mario Vavti | 2019-04-19 | 3 | -44/+183 |
|/ | |||||
* | Update Russian hstrings.php | Max Kostikov | 2019-04-15 | 1 | -2785/+2792 |
| |