aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-134-420/+464
|\
| * Merge branch 'photo-hook' into 'dev'M. Dent2018-12-101-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 Vavti2018-12-101-1/+1
| | | | | | | | | | | | variable which resultet in a javascript error
| * | change redbasic dark schema to make categories and highlights readablephani002018-12-101-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 Kostikov2018-12-042-419/+444
| |\ | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418
| | * Update hstrings.phpMax Kostikov2018-12-041-20/+26
| | |
| | * Update hmessages.poMax Kostikov2018-12-041-399/+418
| | |
* | | regression: the ability to order apps messed up since adding pinned apps to ↵zotlabs2018-12-121-2/+2
|/ / | | | | | | the ordering
* | quickfix for es-es languageMario Vavti2018-12-031-2/+2
| | | | | | (cherry picked from commit 6b68a76bbe2869c505e4c12d2b25ceb59d3ab813)
* | more notifications fixesMario Vavti2018-12-031-1/+1
| | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
* | fix filtering by addr in handleNotificationsItems()Mario Vavti2018-12-022-2/+3
| | | | | | (cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8)
* | Merge branch 'sticky_aside_fixes' into 'dev'M. Dent2018-12-021-3/+3
|\ \ | | | | | | | | | | | | redbasic sticky aside fixes See merge request hubzilla/core!1415
| * | redbasic sticky aside fixesMario Vavti2018-12-011-3/+3
| |/
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-012-7/+8
|\ \ | |/ |/|
| * typozotlabs2018-11-301-1/+1
| |
| * allow notification filtering by name or addrzotlabs2018-11-302-7/+8
| |
* | Merge branch 'default2flex-conversion' into 'dev'M. Dent2018-11-283-17/+35
|\ \ | | | | | | | | | | | | use flex for the default template See merge request hubzilla/core!1409
| * | use flex for the default templateMario2018-11-263-17/+35
| | |
* | | Merge branch 'update-imagesloaded' into 'dev'M. Dent2018-11-281-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 composerMario2018-11-251-1/+1
| | |
* | | Update es-esManuel Jiménez Friaza2018-11-242-27/+27
|/ /
* | Merge branch 'dev' into 'dev'Mario2018-11-202-712/+693
|\ \ | |/ |/| | | | | Update Russian translation See merge request hubzilla/core!1400
| * Replace hmessages.poMax Kostikov2018-11-191-688/+673
| |
| * Replace hstrings.phpMax Kostikov2018-11-191-24/+20
| |
* | fix dreport linkzotlabs2018-11-141-1/+1
| |
* | Merge branch 'fix-activity-filter-widget' into 'dev'M. Dent2018-11-121-1/+1
|\ \ | | | | | | | | | | | | use the correct javascript function for this case See merge request hubzilla/core!1390
| * | use the correct javascript function for this caseMario Vavti2018-11-111-1/+1
| | |
* | | fix css issues in bbcode conversion and focus-light schemaMario Vavti2018-11-122-6/+2
|/ /
* / fix shared_header img expanding to 100% width when sharing a shareMario Vavti2018-11-101-5/+2
|/
* fix es-es hstrings.phpMario Vavti2018-11-071-2/+2
|
* Update hmessages.poMax Kostikov2018-11-061-1/+1
|
* Update hmessages.poMax Kostikov2018-11-061-1/+1
|
* New pt-br plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New nl plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New nb-no plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New it plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New he plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New fi plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New es plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New fr plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* New plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|
* Fixed typo at view/es-es/hstrings.phpManuel Jiménez Friaza2018-11-031-1/+1
|
* Merge branch 'patch-3' into 'dev'Mario2018-11-031-3/+3
|\ | | | | | | | | Update hmessages.po See merge request hubzilla/core!1365
| * Update hmessages.pogia vec2018-11-021-3/+3
| |
* | Update hstrings.phpgia vec2018-11-021-1/+1
|/
* css fix for reshared-content images and whitespaceMario Vavti2018-10-311-3/+14
|
* yet another blueimp vulnerability. Move to composer.Mike Macgirvin2018-10-313-9/+9
|
* allow wiki_list widget to be used in any pageMario Vavti2018-10-291-1/+0
|
* New strings in Spanish translationManuel Jiménez Friaza2018-10-252-443/+516
|
* fix get on {1}Mario Vavti2018-10-241-1/+1
|