harukin
|
e02c09d361
|
merge again upstream/master for 3.8.7
|
2018-12-15 17:17:00 +09:00 |
|
Mario Vavti
|
d51d0160d3
|
fix issue with linkdropper
(cherry picked from commit f81a3ba45d)
|
2018-12-14 21:32:23 +01:00 |
|
zotlabs
|
c2ad9d4996
|
regression: the ability to order apps messed up since adding pinned apps to the ordering
(cherry picked from commit 6464099364)
|
2018-12-14 21:31:02 +01:00 |
|
harukin
|
097afab9f4
|
merge from upsream
|
2018-12-15 00:40:38 +09:00 |
|
Mario Vavti
|
1bd49671b7
|
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
(cherry picked from commit 7894fed741)
|
2018-12-14 11:30:57 +01:00 |
|
harukin
|
e8acf7e87a
|
merge from upsream 3.8.6 release
|
2018-12-04 23:52:59 +09:00 |
|
Mario Vavti
|
9ef6c57ca5
|
more notifications fixes
|
2018-12-03 10:46:49 +01:00 |
|
Mario Vavti
|
f083c0cba1
|
fix filtering by addr in handleNotificationsItems()
|
2018-12-02 10:58:54 +01:00 |
|
zotlabs
|
51d274961b
|
typo
(cherry picked from commit 6f22e47feb)
|
2018-12-02 10:18:05 +01:00 |
|
zotlabs
|
4b4cc04897
|
allow notification filtering by name or addr
(cherry picked from commit c6acb6191c)
|
2018-12-02 10:17:45 +01:00 |
|
harukin
|
23b65c8e6e
|
Merge Upstream to here. 3.8.4
|
2018-11-14 19:45:51 +09:00 |
|
Mario Vavti
|
c335719e8f
|
use the correct javascript function for this case
|
2018-11-11 14:46:35 +01:00 |
|
harukin
|
d87eece1d2
|
コメント欄ctl+enter対応化
|
2018-11-09 22:22:36 +09:00 |
|
harukin
|
4fe4eacc00
|
ctl+enter試験実装
|
2018-11-09 22:11:12 +09:00 |
|
Mike Macgirvin
|
7e1f431eca
|
yet another blueimp vulnerability. Move to composer.
|
2018-10-31 15:56:08 +11: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 |
|
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 e518445853, reversing
changes made to 8ce240b95c.
|
2018-10-13 17:18:42 +02:00 |
|
Max Kostikov
|
de59300aaf
|
Update js_strings.tpl
|
2018-10-12 23:51:01 +02:00 |
|
Mario Vavti
|
c06b37b798
|
fix even more wiki issues
|
2018-10-10 11:01:13 +02:00 |
|
Mario Vavti
|
d29caa099a
|
fix some more wiki issues
|
2018-10-10 10:39:28 +02:00 |
|
M.Dent
|
1ccca9863c
|
Fix escaping quote for wiki_delete_page
|
2018-10-09 21:01:05 -04:00 |
|
M.Dent
|
709665846e
|
Rework Wiki encoding scheme.
|
2018-10-08 13:35:18 -04: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 |
|
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 |
|
Max Kostikov
|
1dbd83a582
|
Update settings.tpl
|
2018-10-04 14:35:32 +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 |
|
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
|
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
|
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
|
c3aa15cc16
|
appification of notes
|
2018-09-24 11:46:18 +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
|
d83fe9d417
|
minor cleanup
|
2018-09-23 20:02:28 +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 |
|