Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 4 | -420/+464 |
|\ | |||||
| * | Merge branch 'photo-hook' into 'dev' | M. Dent | 2018-12-10 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425 | ||||
| | * | add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵ | Mario Vavti | 2018-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | variable which resultet in a javascript error | ||||
| * | | change redbasic dark schema to make categories and highlights readable | phani00 | 2018-12-10 | 1 | -0/+19 |
| |/ | | | | | | | | | | | | | | | additions to /view/theme/redbasic/schema/dark.css to change the appearance of category badges and highlighted text ([hl]...[/hl]). hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class selector that works in master but not in dev anymore. | ||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-04 | 2 | -419/+444 |
| |\ | | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418 | ||||
| | * | Update hstrings.php | Max Kostikov | 2018-12-04 | 1 | -20/+26 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2018-12-04 | 1 | -399/+418 |
| | | | |||||
* | | | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 1 | -2/+2 |
|/ / | | | | | | | the ordering | ||||
* | | quickfix for es-es language | Mario Vavti | 2018-12-03 | 1 | -2/+2 |
| | | | | | | (cherry picked from commit 6b68a76bbe2869c505e4c12d2b25ceb59d3ab813) | ||||
* | | more notifications fixes | Mario Vavti | 2018-12-03 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
* | | fix filtering by addr in handleNotificationsItems() | Mario Vavti | 2018-12-02 | 2 | -2/+3 |
| | | | | | | (cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8) | ||||
* | | Merge branch 'sticky_aside_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | redbasic sticky aside fixes See merge request hubzilla/core!1415 | ||||
| * | | 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 | 2 | -7/+8 |
|\ \ | |/ |/| | |||||
| * | typo | zotlabs | 2018-11-30 | 1 | -1/+1 |
| | | |||||
| * | allow notification filtering by name or addr | zotlabs | 2018-11-30 | 2 | -7/+8 |
| | | |||||
* | | Merge branch 'default2flex-conversion' into 'dev' | M. Dent | 2018-11-28 | 3 | -17/+35 |
|\ \ | | | | | | | | | | | | | use flex for the default template See merge request hubzilla/core!1409 | ||||
| * | | use flex for the default template | Mario | 2018-11-26 | 3 | -17/+35 |
| | | | |||||
* | | | Merge branch 'update-imagesloaded' into 'dev' | M. Dent | 2018-11-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | update imagesloaded to version 4.1.4 via composer See merge request hubzilla/core!1407 | ||||
| * | | update imagesloaded to version 4.1.4 via composer | Mario | 2018-11-25 | 1 | -1/+1 |
| | | | |||||
* | | | Update es-es | Manuel Jiménez Friaza | 2018-11-24 | 2 | -27/+27 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-11-20 | 2 | -712/+693 |
|\ \ | |/ |/| | | | | | Update Russian translation See merge request hubzilla/core!1400 | ||||
| * | Replace hmessages.po | Max Kostikov | 2018-11-19 | 1 | -688/+673 |
| | | |||||
| * | Replace hstrings.php | Max Kostikov | 2018-11-19 | 1 | -24/+20 |
| | | |||||
* | | fix dreport link | zotlabs | 2018-11-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-activity-filter-widget' into 'dev' | M. Dent | 2018-11-12 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | use the correct javascript function for this case See merge request hubzilla/core!1390 | ||||
| * | | use the correct javascript function for this case | Mario Vavti | 2018-11-11 | 1 | -1/+1 |
| | | | |||||
* | | | fix css issues in bbcode conversion and focus-light schema | Mario Vavti | 2018-11-12 | 2 | -6/+2 |
|/ / | |||||
* / | fix shared_header img expanding to 100% width when sharing a share | Mario Vavti | 2018-11-10 | 1 | -5/+2 |
|/ | |||||
* | fix es-es hstrings.php | Mario Vavti | 2018-11-07 | 1 | -2/+2 |
| | |||||
* | Update hmessages.po | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | Update hmessages.po | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New pt-br plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New nl plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New nb-no plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New it plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New he plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New fi plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New es plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New fr plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | New plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | Fixed typo at view/es-es/hstrings.php | Manuel Jiménez Friaza | 2018-11-03 | 1 | -1/+1 |
| | |||||
* | Merge branch 'patch-3' into 'dev' | Mario | 2018-11-03 | 1 | -3/+3 |
|\ | | | | | | | | | Update hmessages.po See merge request hubzilla/core!1365 | ||||
| * | Update hmessages.po | gia vec | 2018-11-02 | 1 | -3/+3 |
| | | |||||
* | | Update hstrings.php | gia vec | 2018-11-02 | 1 | -1/+1 |
|/ | |||||
* | css fix for reshared-content images and whitespace | Mario Vavti | 2018-10-31 | 1 | -3/+14 |
| | |||||
* | yet another blueimp vulnerability. Move to composer. | Mike Macgirvin | 2018-10-31 | 3 | -9/+9 |
| | |||||
* | allow wiki_list widget to be used in any page | Mario Vavti | 2018-10-29 | 1 | -1/+0 |
| | |||||
* | New strings in Spanish translation | Manuel Jiménez Friaza | 2018-10-25 | 2 | -443/+516 |
| | |||||
* | fix get on {1} | Mario Vavti | 2018-10-24 | 1 | -1/+1 |
| |