M. Dent
4cb4f17500
Merge branch 'photo-hook' into 'dev'
...
add photo_view_filter hook and fix minor issue with unset auto_save_draft…
See merge request hubzilla/core!1425
2018-12-10 21:49:12 +01:00
Mario Vavti
7894fed741
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
2018-12-10 10:37:29 +01:00
phani00
18caf0273f
change redbasic dark schema to make categories and highlights readable
...
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.
2018-12-10 03:03:28 +00:00
Max Kostikov
d12744011a
Merge branch 'dev' into 'dev'
...
Add strings to Russian translation
See merge request hubzilla/core!1418
2018-12-04 11:50:04 +01:00
Max Kostikov
c0e4c92d47
Update hstrings.php
2018-12-04 11:41:59 +01:00
Max Kostikov
cc3e910194
Update hmessages.po
2018-12-04 11:41:42 +01:00
Mario Vavti
5e14da67e1
quickfix for es-es language
...
(cherry picked from commit 6b68a76bbe
2018-12-03 21:24:29 +01:00
Mario Vavti
c50e3a702a
more notifications fixes
...
(cherry picked from commit 9ef6c57ca5
2018-12-03 10:49:08 +01:00
Mario Vavti
f13b1e8604
fix filtering by addr in handleNotificationsItems()
...
(cherry picked from commit f083c0cba1
2018-12-02 10:59:33 +01:00
M. Dent
132547a9d9
Merge branch 'sticky_aside_fixes' into 'dev'
...
redbasic sticky aside fixes
See merge request hubzilla/core!1415
2018-12-02 05:07:59 +01:00
Mario Vavti
fdb0459288
Merge remote-tracking branch 'mike/master' into dev
2018-12-01 21:43:54 +01:00
Mario Vavti
8d4f6a7865
redbasic sticky aside fixes
2018-12-01 21:30:18 +01:00
zotlabs
6f22e47feb
typo
2018-11-30 22:39:10 -08:00
zotlabs
c6acb6191c
allow notification filtering by name or addr
2018-11-30 19:03:14 -08:00
M. Dent
19f0ce7e37
Merge branch 'default2flex-conversion' into 'dev'
...
use flex for the default template
See merge request hubzilla/core!1409
2018-11-28 04:03:39 +01:00
M. Dent
a4b2eac0f0
Merge branch 'update-imagesloaded' into 'dev'
...
update imagesloaded to version 4.1.4 via composer
See merge request hubzilla/core!1407
2018-11-28 03:52:53 +01:00
Mario
3775be4ce9
use flex for the default template
2018-11-26 12:44:10 +01:00
Mario
c667572d3e
update imagesloaded to version 4.1.4 via composer
2018-11-25 10:09:26 +01:00
Manuel Jiménez Friaza
ca98a566ee
Update es-es
2018-11-24 13:23:20 +01:00
Mario
07fd2dbc99
Merge branch 'dev' into 'dev'
...
Update Russian translation
See merge request hubzilla/core!1400
2018-11-20 11:08:27 +01:00
Max Kostikov
4dea1b5a0d
Replace hmessages.po
2018-11-19 13:52:31 +01:00
Max Kostikov
da44ab0529
Replace hstrings.php
2018-11-19 13:51:54 +01:00
zotlabs
ab2376f8d8
fix dreport link
2018-11-14 17:42:02 -08:00
M. Dent
a7d3a49171
Merge branch 'fix-activity-filter-widget' into 'dev'
...
use the correct javascript function for this case
See merge request hubzilla/core!1390
2018-11-12 21:50:08 +01:00
Mario Vavti
7bd60adfbe
fix css issues in bbcode conversion and focus-light schema
2018-11-12 09:35:12 +01:00
Mario Vavti
c335719e8f
use the correct javascript function for this case
2018-11-11 14:46:35 +01:00
Mario Vavti
fc5dc9717a
fix shared_header img expanding to 100% width when sharing a share
2018-11-10 11:31:06 +01:00
Mario Vavti
b08de33b0b
fix es-es hstrings.php
2018-11-07 10:02:24 +01:00
Max Kostikov
009044b71e
Update hmessages.po
2018-11-06 14:58:06 +01:00
Max Kostikov
4760a3f3e8
Update hmessages.po
2018-11-06 14:57:12 +01:00
Max Kostikov
3302012c02
New pt-br plural function for JavaScript compatibility
2018-11-06 14:55:58 +01:00
Max Kostikov
812c5a314f
New nl plural function for JavaScript compatibility
2018-11-06 14:55:21 +01:00
Max Kostikov
c2da8c3fd4
New nb-no plural function for JavaScript compatibility
2018-11-06 14:54:49 +01:00
Max Kostikov
aa78640491
New it plural function for JavaScript compatibility
2018-11-06 14:54:06 +01:00
Max Kostikov
7c49688e1b
New he plural function for JavaScript compatibility
2018-11-06 14:53:29 +01:00
Max Kostikov
dbe10c7965
New fi plural function for JavaScript compatibility
2018-11-06 14:52:58 +01:00
Max Kostikov
f1f5107282
New es plural function for JavaScript compatibility
2018-11-06 14:52:23 +01:00
Max Kostikov
cc06250bf8
New fr plural function for JavaScript compatibility
2018-11-06 14:50:37 +01:00
Max Kostikov
af1ea7f495
New plural function for JavaScript compatibility
2018-11-06 14:48:58 +01:00
Manuel Jiménez Friaza
71425c3b23
Fixed typo at view/es-es/hstrings.php
2018-11-03 19:19:01 +01:00
Mario
75f7b1e261
Merge branch 'patch-3' into 'dev'
...
Update hmessages.po
See merge request hubzilla/core!1365
2018-11-03 13:22:34 +01:00
gia vec
8235d0bd50
Update hmessages.po
2018-11-02 19:41:07 +01:00
gia vec
c2e01bedc5
Update hstrings.php
2018-11-02 19:27:11 +01:00
Mario Vavti
3dab0d365d
css fix for reshared-content images and whitespace
2018-10-31 13:20:09 +01:00
Mike Macgirvin
7e1f431eca
yet another blueimp vulnerability. Move to composer.
2018-10-31 15:56:08 +11:00
Mario Vavti
0d2c3be367
allow wiki_list widget to be used in any page
2018-10-29 22:55:24 +01:00
Manuel Jiménez Friaza
802a7ff3a8
New strings in Spanish translation
2018-10-25 11:37:06 +02:00
Mario Vavti
25c7e64ded
fix get on {1}
2018-10-24 23:06:32 +02:00
Mario Vavti
5c4fbbebe1
refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
2018-10-24 20:58:25 +02:00
Mario Vavti
8b9acf750b
autocomplete performance: this slightly changes the editor contact autocomplete behaviour. queries using *like* with a prepended % to the query string do not make use of indices. this is no big issue when we query abook but can get really slow when xchan table is involved. this commit changes the xchan table only queries to use the *str%* format. this means that the result set for channels we are not connected with will change in a way that xchan_name and xchan_addr will bematched only from the beginning of the name or address. this commit also changes textcomplete to only start the query after the 3rd character. the result set between 2 and 3 characters is mostly very different and only from 3 chars on there is a high possibility the channel we look for is already in the result.
2018-10-24 20:22:27 +02:00
Mario Vavti
5c36eef039
textcomplete: return up to 100 items and look for for matches in the entire string (not just the beginning) when suggesting emojis
2018-10-22 15:36:02 +02:00
Mario Vavti
26e20f9999
add summary to bbcode autocomplete list
2018-10-22 14:04:09 +02:00
Mario Vavti
a61ce45a32
fix ellipsis for too long nav banner
2018-10-21 09:10:02 +02:00
Max Kostikov
6e75842354
Update hstrings.php
2018-10-18 11:19:02 +02:00
Max Kostikov
ac2b6bcc33
Russian translation for upgrade plugin added
2018-10-18 11:18:14 +02:00
Max Kostikov
d2d6f8c970
Update hstrings.php
2018-10-15 21:28:54 +02:00
Max Kostikov
04edb741a6
Add Russian translations to Newmember widget
2018-10-15 21:28:01 +02:00
Mario
721461dd3e
Merge branch 'patch-16' into 'dev'
...
JS plurals displaying code cleanup
See merge request hubzilla/core!1338
2018-10-15 09:59:17 +02:00
Max Kostikov
ce52c27a8a
Update main.js
2018-10-14 22:45:11 +02:00
Max Kostikov
f9c3b80780
Update main.js
2018-10-14 22:28:47 +02:00
Max Kostikov
8af91b0209
Update hstrings.php
2018-10-14 22:24:36 +02:00
Max Kostikov
ee4a262953
Add JS function code for plurals translation
2018-10-14 15:21:00 +02:00
Max Kostikov
3ac4337aec
Update main.js
2018-10-13 19:52:59 +02:00
Max Kostikov
f68674b35a
Update js_strings.tpl
2018-10-13 19:51:33 +02:00
Mario Vavti
c36773674e
Revert "Merge branch 'patch-11' into 'dev'"
...
This reverts commit e5184458538ce240b95c
2018-10-13 17:18:42 +02:00
Max Kostikov
451ee5a593
Update hmessages.po
2018-10-13 14:22:58 +02:00
Max Kostikov
ba3811a284
Update hstrings.php
2018-10-13 14:22:13 +02:00
Max Kostikov
e2241b9365
Update hstrings.php
2018-10-13 14:20:48 +02:00
Max Kostikov
fe2bb84403
New russian plurals for JavaScript
2018-10-13 14:20:10 +02:00
Mario
e518445853
Merge branch 'patch-11' into 'dev'
...
Add date/time plurals translation in JavaScript
See merge request hubzilla/core!1331
2018-10-13 14:00:12 +02:00
Max Kostikov
3dfe604ba0
Update main.js
2018-10-13 00:15:48 +02:00
Max Kostikov
de59300aaf
Update js_strings.tpl
2018-10-12 23:51:01 +02:00
Max Kostikov
b65ee01aef
Update hmessages.po
2018-10-12 16:39:03 +02:00
Max Kostikov
2b311bd860
Update hstrings.php
2018-10-12 16:38:58 +02:00
Max Kostikov
a841b75b98
Update hstrings.php
2018-10-12 11:50:21 +02:00
Max Kostikov
9b3b7dc098
Update hmessages.po
2018-10-12 11:49:48 +02:00
Max Kostikov
3c5cfd465b
Update hstrings.php
2018-10-11 23:39:58 +02:00
Max Kostikov
f61f9bdc5f
Missed strings added to Russian translation
2018-10-11 23:39:13 +02:00
Manuel Jiménez Friaza
c54ba1fb86
Typos in Spanish translation
2018-10-11 12:23:00 +02:00
Max Kostikov
73e30e8085
Update hstrings.php
2018-10-10 17:45:03 +02:00
Max Kostikov
a53912cc19
Formatting fix in russian translation
2018-10-10 17:43:41 +02:00
Mario Vavti
97fcc495f2
fix minor issue in dark and light schemas
2018-10-10 14:01:03 +02:00
Mario Vavti
c06b37b798
fix even more wiki issues
2018-10-10 11:01:13 +02:00
Mario Vavti
30e3580856
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-10 10:39:42 +02:00
Mario Vavti
d29caa099a
fix some more wiki issues
2018-10-10 10:39:28 +02:00
Mario
cd55298616
Merge branch 'dev' into 'dev'
...
Fixed some errors in Spanish translation
See merge request hubzilla/core!1323
2018-10-10 09:22:32 +02:00
M. Dent
350db4ed9f
Merge branch 'fix-wiki-escaping' into 'dev'
...
Fix escaping quote for wiki_delete_page
See merge request hubzilla/core!1324
2018-10-10 03:04:31 +02:00
M.Dent
1ccca9863c
Fix escaping quote for wiki_delete_page
2018-10-09 21:01:05 -04:00
Manuel Jiménez Friaza
a7b03c1cea
Fixed some errors in Spanish translation
2018-10-09 11:48:08 +02:00
Mario
37b94bf5fa
Merge branch 'fix-wiki-escaping' into 'dev'
...
Fix wiki escaping (Regression tests needed)
See merge request hubzilla/core!1321
2018-10-08 21:20:17 +02:00
Manuel Jiménez Friaza
e877a001ab
Update Spanish translation
2018-10-08 19:57:11 +02:00
M.Dent
709665846e
Rework Wiki encoding scheme.
2018-10-08 13:35:18 -04:00
Max Kostikov
527b0a7065
Update hstrings.php
2018-10-08 00:31:32 +02:00
Max Kostikov
22a7c21886
New russian translation
2018-10-08 00:30:35 +02:00
Mario Vavti
65dcb39bac
those 3px make a difference on medium sized screens
2018-10-06 21:01:00 +02:00
Mario Vavti
62433b5f05
give apps some more space and prevent linebreaks in app names. Add ellipsis to too long names.
2018-10-06 20:55:28 +02:00
Mario Vavti
66cf085272
move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
2018-10-06 20:29:32 +02:00
Max Kostikov
b5ed1de31e
New russian translations hmessages.po
...
(cherry picked from commit ff53da5b0a
2018-10-05 14:54:53 +02:00
Max Kostikov
5cf156f698
New russian translations hstrings.php
...
(cherry picked from commit 9520123f6d
2018-10-05 14:54:22 +02:00
Mario Vavti
1eaf6df842
fix issues with bs accordions
2018-10-04 22:21:20 +02:00
Mario Vavti
d4af745fc8
move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided
2018-10-04 21:38:39 +02:00
Mario Vavti
6e03104e3e
move *_list_mode to features
2018-10-04 20:48:22 +02:00
Mario
e89a84608f
Merge branch 'patch-1' into 'dev'
...
Incorrect block wrapping fixed
See merge request hubzilla/core!1306
2018-10-04 14:57:03 +02:00
Max Kostikov
1dbd83a582
Update settings.tpl
2018-10-04 14:35:32 +02:00
Mario
c1002557cf
Merge branch 'patch-1' into 'dev'
...
button sticking fixed
See merge request hubzilla/core!1305
2018-10-04 13:53:00 +02:00
Mario Vavti
d0605e8d5f
uexport app
2018-10-04 11:50:38 +02:00
Max Kostikov
05b6c33a2c
button sticking fixed
2018-10-03 21:19:13 +02:00
Mario
5e7c9b9d4a
jot: show settings icon only to local profile owner
2018-10-03 15:21:20 +02:00
Mario Vavti
7dadf387e5
indicate locked features
2018-10-01 11:01:56 +02:00
M. Dent
5f992ffe15
Remove servicelevel logic
2018-09-29 00:17:55 +02:00
M.Dent
fe8b723622
Hide form when at or over service_class['limit_identities']
2018-09-27 22:43:36 -04:00
Mario
c15de3b68b
more checks
2018-09-27 22:45:43 +02:00
Mario Vavti
6b23c3e179
implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels
2018-09-27 14:56:47 +02:00
Mario Vavti
bdf6289b32
tokens: add css file and fix argc and argv values
2018-09-26 22:32:06 +02:00
Mario Vavti
e3c04b1fd0
guest access app
2018-09-26 22:24:36 +02:00
Mario Vavti
a7948d7bfe
permcats app
2018-09-26 22:02:50 +02:00
Mario Vavti
aab97adb23
oauth and oauth2 apps manager
2018-09-26 16:22:34 +02:00
Mario Vavti
91502b4104
change wording
2018-09-26 15:13:19 +02:00
Mario Vavti
9bc76b4259
appification of the pdl editor and move advanced_theming to theme settings where it belongs
2018-09-26 15:02:20 +02:00
Mario Vavti
9bb0f1d18e
move advanced_theming switch to settings/display for now
2018-09-25 12:02:00 +02:00
Mario Vavti
39866b7463
move start_menu switch to settings/display for now
2018-09-25 11:37:22 +02:00
Mario Vavti
c748230b35
revert nav settings opacity
2018-09-24 11:51:20 +02:00
Mario Vavti
c3aa15cc16
appification of notes
2018-09-24 11:46:18 +02:00
Mario
4a7c678213
fade in nav settings button
2018-09-24 09:46:19 +02:00
Mario
e735220691
only explain how to select a channel if there are channels to select
2018-09-23 20:54:36 +02:00
Mario
9b7c6e96f7
only show nav settings icon when hovering over nav
2018-09-23 20:41:01 +02:00
Mario
d83fe9d417
minor cleanup
2018-09-23 20:02:28 +02:00
Mario Vavti
6f99ca1d31
opacity for jot settings/reset buttons
2018-09-21 20:59:31 +02:00
Mario Vavti
8efa103041
provide editor settings
2018-09-21 20:57:01 +02:00
Mario Vavti
9638bf2b1e
provide a return path from settings pages
2018-09-21 20:23:31 +02:00
Mario Vavti
18a9ebdb1e
add missing check
2018-09-21 14:07:30 +02:00
Mario
604142af93
Merge branch 'patch-5' into 'dev'
...
save admin page values
See merge request hubzilla/core!1282
2018-09-21 13:55:47 +02:00
Max Kostikov
2d83868ed9
Update admin_account_edit.tpl
2018-09-21 13:50:50 +02:00
Max Kostikov
73195a0215
Update admin_account_edit.tpl
2018-09-21 13:48:44 +02:00
Max Kostikov
13d05549f8
Update admin_accounts.tpl
2018-09-21 13:48:40 +02:00
Max Kostikov
0143bc734c
Update admin_channels.tpl
2018-09-21 13:48:35 +02:00
Max Kostikov
ff860a3310
Update admin_logs.tpl
2018-09-21 13:48:27 +02:00
Max Kostikov
ed0044aeab
Update admin_profiles.tpl
2018-09-21 13:48:22 +02:00
Max Kostikov
1a6d290d71
Update admin_security.tpl
2018-09-21 13:48:12 +02:00
Max Kostikov
dbb7245e22
Update admin_site.tpl
2018-09-21 13:48:07 +02:00
Mario
0f9802a47c
Merge branch 'patch-5' into 'dev'
...
Admin forms buttons design unification
See merge request hubzilla/core!1281
2018-09-21 13:24:29 +02:00
Mario Vavti
4dd1521677
fix position of nav settings icon
2018-09-21 12:16:36 +02:00
Mario Vavti
32fba39915
fix typo
2018-09-21 11:22:11 +02:00
Mario Vavti
c1697ce96b
fix can not enter text in notes widget
2018-09-21 11:15:18 +02:00
Max Kostikov
21ff570c4d
Update admin_account_edit.tpl
2018-09-20 23:40:09 +02:00
Max Kostikov
f2e4cf3a92
Update admin_security.tpl
2018-09-20 23:39:46 +02:00
Max Kostikov
7123de66f9
Update admin_profiles.tpl
2018-09-20 23:39:18 +02:00
Max Kostikov
e4fe202fc6
Update admin_site.tpl
2018-09-20 23:38:48 +02:00
Max Kostikov
bde6caf167
Update admin_accounts.tpl
2018-09-20 23:38:19 +02:00
Max Kostikov
96f45b5fbe
Update admin_channels.tpl
2018-09-20 23:36:35 +02:00
Max Kostikov
4352afeeb0
Update admin_logs.tpl
2018-09-20 23:32:13 +02:00
Mario Vavti
1ca558f011
move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation
2018-09-20 13:22:41 +02:00
Mario Vavti
34fec995f7
allow a second url in apd files for settings, hide pin and star buttons in edit mode and use strpos() instead of strstr() in some places
2018-09-19 15:00:06 +02:00
zotlabs
98bc1ed600
this was needed
2018-09-18 23:18:59 -07:00
zotlabs
7756773683
missing autocomplete (e.g. mentions) in mod_photos comments
2018-09-18 19:52:10 -07:00
Mario Vavti
a9853e6033
seperate settings for mod network
2018-09-17 11:36:11 +02:00
Mario Vavti
f9d43479f2
css issues
2018-09-13 15:14:46 +02:00
Mario Vavti
4bb16b18ed
cover photo: mior issue and more cleanup
2018-09-10 12:12:05 +02:00
Mario Vavti
4cc413cdaf
cover photo: some code cleanup and fix height issue when photo was not cached
2018-09-10 11:12:15 +02:00
Mario Vavti
677ad71b96
fix some issues with latest notification improvements
2018-09-09 19:44:27 +02:00
Mario Vavti
54fa28441c
install bootstrap via composer
2018-09-07 11:26:02 +02:00
Mario Vavti
bb42ec2bfc
apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps
2018-09-07 10:39:15 +02:00
Mario Vavti
d31251c54e
overflow should be auto not visible
2018-09-07 10:07:29 +02:00
Mario Vavti
6a338e28b2
-1 has issues in some browsers
2018-09-06 14:27:56 +02:00
Mario Vavti
5135f236c2
improve cover-photo handling
2018-09-06 11:30:50 +02:00
Mario Vavti
78c847ef7d
improve notification handling on small screens
2018-09-06 11:14:08 +02:00
Mario Vavti
673a2f67f1
sticky-kit: improve handling
2018-09-06 10:08:55 +02:00
Mario Vavti
4f82428a20
hide cover photo by default and show it only if conditions are met
2018-09-05 14:31:34 +02:00
Mario Vavti
e494a76b33
revert "Add bottom margin on aside elements and main to allow for viewport footer."
...
This reverts commit 1d7d604016
2018-09-05 12:34:30 +02:00
Mario Vavti
1753e40466
Revert "Fix jumpy sidebars"
...
This reverts commit 79eb6d3942
2018-09-05 12:32:53 +02:00
Mario Vavti
a821682c8c
instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.
2018-09-05 12:17:32 +02:00
Mario
4c1944a08d
Merge branch 'extend-convitems-dropdown' into 'dev'
...
Extend cog dropdown & temp fix for feed display of corrupt mids
See merge request hubzilla/core!1265
2018-08-27 10:02:58 +02:00
M.Dent
a0c2bbac9d
Add hook to extend conv_item cog dropdown menu
2018-08-26 23:26:10 -04:00
Max Kostikov
f5f6ec3d71
Update wiki.tpl
2018-08-25 21:34:58 +02:00
Max Kostikov
44f639f371
Revert "Update wiki.tpl"
...
This reverts commit c16fda1cb6
2018-08-25 21:31:47 +02:00
Max Kostikov
6767ff5434
Revert "Update wiki.tpl"
...
This reverts commit ff1a0d217f
2018-08-25 21:30:58 +02:00
Max Kostikov
ff1a0d217f
Update wiki.tpl
2018-08-25 21:29:25 +02:00
Max Kostikov
732ce25d7f
Update nwiki_page_history.tpl
2018-08-25 21:17:25 +02:00
Max Kostikov
c16fda1cb6
Update wiki.tpl
2018-08-25 21:16:05 +02:00
Mario Vavti
f036c25dca
Merge remote-tracking branch 'mike/master' into dev
2018-08-24 14:44:45 +02:00
zotlabs
6ecd31a715
tweak archive widget for articles
2018-08-22 13:30:16 -07:00
Max Kostikov
456bc2ef86
Update hstrings.php
2018-08-22 15:13:01 +02:00
Max Kostikov
e071cd4635
Update hmessages.po
2018-08-22 15:12:09 +02:00
Mario Vavti
cc03e1ceef
Merge remote-tracking branch 'mike/master' into dev
2018-08-22 10:47:40 +02:00
Mario
e4d08fc5d7
Merge branch 'redbasic-addroomforfooter' into 'dev'
...
Fix jumpy sidebars
See merge request hubzilla/core!1261
2018-08-22 10:46:02 +02:00
zotlabs
b25192332b
profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
2018-08-21 23:39:49 -07:00
M.Dent
79eb6d3942
Fix jumpy sidebars
2018-08-21 13:18:42 -04:00
Mario
218029ee57
Merge branch 'redbasic-addroomforfooter' into 'dev'
...
Add bottom margin on aside elements and main to allow for viewport footer.
See merge request hubzilla/core!1259
2018-08-21 13:17:14 +02:00
fadelkon
af31bbeba1
Update catalan translations for sstrings up to 18th July 2018
2018-08-20 22:50:46 +02:00
M.Dent
1d7d604016
Add bottom margin on aside elements and main to allow for viewport footer.
2018-08-20 00:15:34 -04:00
zotlabs
f230c07ba5
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
2018-08-15 17:00:37 -07:00
Mario Vavti
759a18685b
Merge remote-tracking branch 'mike/master' into dev
2018-08-12 14:07:16 +02:00
Mario
e07ab65d73
Merge branch 'oauth2-ui-pr' into 'dev'
...
Oauth2 ui pr
See merge request hubzilla/core!1255
2018-08-12 14:06:24 +02:00
zotlabs
5afe779ffc
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
2018-08-11 16:16:54 -07:00
M.Dent
af042ccf07
OAuth2 UI and settings updates
2018-08-10 13:54:26 -04:00
Manuel Jiménez Friaza
edf834188d
Update Spanish translation
2018-07-30 12:03:03 +02:00
Max Kostikov
06b0dbdfba
Update hstrings.php
2018-07-26 12:21:33 +02:00
Max Kostikov
48fb3d3653
Update hmessages.po
2018-07-26 12:20:53 +02:00
Max Kostikov
baa5fd9739
Update passchanged_eml.tpl
2018-07-26 12:19:59 +02:00
Max Kostikov
e01c277c56
Update lostpass_eml.tpl
2018-07-26 12:18:54 +02:00
