zotlabs
|
e60fb17524
|
total_identities restriction off by one
|
2018-12-09 11:20:57 -08:00 |
|
Mario Vavti
|
7f65d82a74
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-06 12:50:23 +01:00 |
|
zotlabs
|
8ab1f31058
|
reset page title if article has no title.
|
2018-12-05 16:24:30 -08:00 |
|
Mario Vavti
|
5d9f993352
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-12-04 11:39:14 +01:00 |
|
Mario
|
eaa52c19a8
|
Merge branch 'photocache' into 'dev'
Less dependence on cache logic
See merge request hubzilla/core!1417
|
2018-12-04 11:38:58 +01:00 |
|
zotlabs
|
42aeb19562
|
partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld']
|
2018-12-03 20:09:57 -08:00 |
|
zotlabs
|
ffc3dba682
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-03 19:19:31 -08:00 |
|
zotlabs
|
7a693500c4
|
fix generated plink
|
2018-12-03 14:21:33 -08:00 |
|
Max Kostikov
|
1c44912aff
|
Update Photo.php
|
2018-12-03 21:33:32 +01:00 |
|
Max Kostikov
|
b586fcebab
|
Update Photo.php
|
2018-12-03 21:21:23 +01:00 |
|
Max Kostikov
|
244c0d828a
|
Update Photo.php
|
2018-12-03 13:29:27 +01:00 |
|
Max Kostikov
|
57ebd7e170
|
New logic for less dependence on cache logic
|
2018-12-03 13:10:55 +01:00 |
|
M. Dent
|
0b38ab259c
|
Merge branch 'photocache' into 'dev'
Add Photo Cache addon support
See merge request hubzilla/core!1412
|
2018-12-02 19:33:54 +01:00 |
|
Mario Vavti
|
fdb0459288
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-01 21:43:54 +01:00 |
|
zotlabs
|
c6acb6191c
|
allow notification filtering by name or addr
|
2018-11-30 19:03:14 -08:00 |
|
Max Kostikov
|
f3831fa77f
|
Better cache settings logic
|
2018-11-29 21:27:06 +01:00 |
|
Max Kostikov
|
6aa99a903f
|
Code cleanup
|
2018-11-29 11:56:56 +01:00 |
|
Max Kostikov
|
bd0fc8a2d7
|
Add photo cache hooks
|
2018-11-29 10:38:25 +01:00 |
|
zotlabs
|
19e4f3c2f0
|
prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
|
2018-11-27 11:53:02 -08:00 |
|
M. Dent
|
6b02c664fb
|
Do not store serialized pconfig value received via to Module/Pconfig.php
|
2018-11-25 10:22:09 +01:00 |
|
Mario
|
85f52d2aed
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-22 10:17:18 +01:00 |
|
zotlabs
|
7aaa1973f4
|
push recent changes
|
2018-11-19 15:04:08 -08:00 |
|
Mario
|
73b836c73d
|
Revert "Fix return on wrong sotred in Content-Length size for full size photos"
This reverts commit 6010b5c619
|
2018-11-19 13:11:18 +01:00 |
|
Mario
|
af0c2f59cc
|
Revert "Add filesize for streaming content"
This reverts commit 238a616292
|
2018-11-19 13:11:04 +01:00 |
|
Mario Vavti
|
0c94747ab1
|
fix typo which prevented propagation of comments
|
2018-11-18 11:02:01 +01:00 |
|
Mario Vavti
|
783cca1e13
|
recalculate photo filesize when rotating an image
(cherry picked from commit f15e32d063 )
|
2018-11-17 09:51:28 +01:00 |
|
Max Kostikov
|
238a616292
|
Add filesize for streaming content
|
2018-11-16 23:33:45 +01:00 |
|
Max Kostikov
|
6010b5c619
|
Fix return on wrong sotred in Content-Length size for full size photos
|
2018-11-16 23:14:10 +01:00 |
|
zotlabs
|
e42a401987
|
more work on the mid/uuid conversion
|
2018-11-15 20:50:47 -08:00 |
|
zotlabs
|
39d914c9df
|
add item.uuid to relevant places
|
2018-11-15 16:34:09 -08:00 |
|
zotlabs
|
8d2f4d9dfd
|
mid -> uuid conversions for basic reactions
|
2018-11-15 16:02:29 -08:00 |
|
zotlabs
|
a7d2f9b530
|
remove checkjs and nojs
|
2018-11-15 15:35:06 -08:00 |
|
zotlabs
|
b64dd7ab57
|
Merge branch 'master' into zvi
|
2018-11-14 16:42:03 -08:00 |
|
Mario
|
6ed9443972
|
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b
See merge request hubzilla/core!1395
|
2018-11-14 09:30:54 +01:00 |
|
Mario
|
08e0f172de
|
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
|
2018-11-14 09:30:28 +01:00 |
|
zotlabs
|
cfc43f6dea
|
Merge branch 'master' into zvi
|
2018-11-13 20:37:52 -08:00 |
|
DM42.Net (Matt Dent)
|
f1d168f781
|
Fix double escaping after xss fix
|
2018-11-13 23:06:00 -05:00 |
|
DM42.Net (Matt Dent)
|
ce8073d25e
|
Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix to search xss and Superblock fix.
|
2018-11-13 20:19:12 -05:00 |
|
zotlabs
|
31f4d9066b
|
xss in search
|
2018-11-13 14:23:56 -08:00 |
|
Max Kostikov
|
cf2f7f2132
|
Update Photo.php
|
2018-11-13 12:52:35 +01:00 |
|
Max Kostikov
|
a145559662
|
Remove uneccessary include/photos.php
|
2018-11-13 11:45:18 +01:00 |
|
Max Kostikov
|
d029e3dc16
|
Text formatting in Photo.php
|
2018-11-13 11:39:42 +01:00 |
|
Max Kostikov
|
286326a98e
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:38:49 +01:00 |
|
Max Kostikov
|
b38ffef2be
|
Revert "Replace fetch_image_from_url() with z_fetch_url()"
This reverts commit 6375f2d73a
|
2018-11-13 11:25:46 +01:00 |
|
Max Kostikov
|
6375f2d73a
|
Replace fetch_image_from_url() with z_fetch_url()
|
2018-11-13 11:25:14 +01:00 |
|
zotlabs
|
1a2df9c51c
|
item uuid changes
|
2018-11-12 18:25:55 -08:00 |
|
zotlabs
|
770fdb2b7d
|
dreport updates
|
2018-11-12 16:08:22 -08:00 |
|
zotlabs
|
da452decf6
|
more z6 debugging
|
2018-11-11 15:12:01 -08:00 |
|
Max Kostikov
|
b57d296adc
|
Preserve photo modification date
|
2018-11-10 20:35:14 +01:00 |
|
Max Kostikov
|
f7b00c62a4
|
Remove unnecessary Zulu timezone mention
|
2018-11-10 10:05:28 +01:00 |
|
Max Kostikov
|
dc59561a95
|
Fixed timezone conversion
|
2018-11-09 22:17:11 +01:00 |
|
zotlabs
|
d56e1f6285
|
begin native summary support
|
2018-11-08 19:49:57 -08:00 |
|
zotlabs
|
22b3ddab66
|
refresh packets
|
2018-11-08 19:24:02 -08:00 |
|
Max Kostikov
|
dc0335d1d5
|
Correct "Content-Length:" calculation added
|
2018-11-08 11:53:27 +01:00 |
|
Mario Vavti
|
e0a0570cc4
|
$data only contains the link to the image if the image is in os storage. The size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length
|
2018-11-08 11:06:44 +01:00 |
|
Max Kostikov
|
3f6cd5a663
|
Disable image caching if personal or group permissions enabled
|
2018-11-07 19:52:38 +01:00 |
|
Max Kostikov
|
eaf117cce1
|
Added If-Modified-Since header support for better image caching and fixed absent 404 for photos
|
2018-11-07 18:22:55 +01:00 |
|
zotlabs
|
d2aa2c080f
|
Merge branch 'master' into zvi
|
2018-11-07 01:43:43 -08:00 |
|
Max Kostikov
|
a5a77d1e7c
|
Revert "remove 'Expiries' HTTP header"
This reverts commit 40d9277ef3
|
2018-11-07 08:41:32 +01:00 |
|
zotlabs
|
bb8b3b9291
|
this is brutal
|
2018-11-06 20:44:40 -08:00 |
|
Max Kostikov
|
40d9277ef3
|
remove 'Expiries' HTTP header
|
2018-11-06 16:22:34 +01:00 |
|
Max Kostikov
|
3491c488d3
|
Update Photo.php
|
2018-11-06 13:51:01 +01:00 |
|
Max Kostikov
|
1828b6daab
|
Update Photo.php
|
2018-11-06 13:41:41 +01:00 |
|
Max Kostikov
|
c26f45b7c2
|
Update Photo.php
|
2018-11-06 13:39:36 +01:00 |
|
Max Kostikov
|
e116b90116
|
'Last-Modified' and 'Content-Length' HTTP headers added for better image caching
|
2018-11-06 13:37:50 +01:00 |
|
Max Kostikov
|
f7ce374a28
|
Update Photo.php
|
2018-11-05 21:26:10 +01:00 |
|
Max Kostikov
|
2dd124d09e
|
Use modern get_config() syntax
|
2018-11-05 21:25:08 +01:00 |
|
Mario Vavti
|
b6938da552
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-05 09:56:52 +01:00 |
|
zotlabs
|
af82aab3a6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-04 13:58:02 -08:00 |
|
zotlabs
|
51b4b6216f
|
z6 updates to owa, linkinfo improved image detection
|
2018-11-04 13:56:32 -08:00 |
|
Mario Vavti
|
de32b0bba5
|
more fixes for forum notifications handling: do not count likes/dislikes if likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled
|
2018-11-03 20:53:23 +01:00 |
|
Max Kostikov
|
46b0510b99
|
Update Linkinfo.php
|
2018-11-03 10:41:31 +01:00 |
|
Max Kostikov
|
a7624ea48b
|
Update Linkinfo.php
|
2018-11-03 00:10:05 +01:00 |
|
Max Kostikov
|
2f3b4a7aaf
|
Update Linkinfo.php
|
2018-11-03 00:01:15 +01:00 |
|
Max Kostikov
|
a9bbe0b128
|
Update Linkinfo.php
|
2018-11-02 22:40:48 +01:00 |
|
Max Kostikov
|
0d9d0a4b70
|
more precise codepage detection
|
2018-11-02 22:37:53 +01:00 |
|
Max Kostikov
|
32c4614a32
|
Workaround for incorrect ISO-8859-5 encoded content conversion
|
2018-11-02 10:52:52 +01:00 |
|
Mike Macgirvin
|
7e1f431eca
|
yet another blueimp vulnerability. Move to composer.
|
2018-10-31 15:56:08 +11:00 |
|
zotlabs
|
70c55da1df
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-10-30 18:11:49 -07:00 |
|
zotlabs
|
623aa7ea48
|
remove primary/clone counts from admin summary. The last checkins should fix this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected.
|
2018-10-30 17:30:59 -07:00 |
|
Mario Vavti
|
1eac4db491
|
fix forum ping results - the term query requires xchan_name instead of xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count
|
2018-10-29 23:01:13 +01:00 |
|
Mario Vavti
|
96bed3a623
|
fix issues with forum handling in mod network and ping. also some code cleanup.
|
2018-10-27 22:34:18 +02:00 |
|
Mario Vavti
|
2b3cbc638b
|
notifications: fix unseen forum count
|
2018-10-26 09:53:56 +02:00 |
|
Mario Vavti
|
ee804cd6b1
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-24 23:08:22 +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
|
615402ea83
|
wrong var
|
2018-10-24 20:34:15 +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 |
|
Max Kostikov
|
24d68a7f09
|
Update Linkinfo.php
|
2018-10-24 10:28:18 +02:00 |
|
Max Kostikov
|
781eeff021
|
Update Linkinfo.php
|
2018-10-23 20:36:30 +02:00 |
|
Max Kostikov
|
3e6c2c6024
|
Update Linkinfo.php
|
2018-10-23 19:57:21 +02:00 |
|
Max Kostikov
|
f180558041
|
Convert non UTF-8 content on link embeding
|
2018-10-23 19:32:36 +02:00 |
|
mike
|
fdb7c115a7
|
fix wrong value being used for menu_id
|
2018-10-20 16:55:54 -04:00 |
|
Mario Vavti
|
ae875734e2
|
improve posting to mod pconfig via ajax
|
2018-10-16 13:46:03 +02:00 |
|
Mario Vavti
|
df62037c4a
|
fix wiki issue with wiki page links when using bbcode
|
2018-10-15 13:13:04 +02:00 |
|
M.Dent
|
bad4ea6e65
|
Add wiki_preprocess hook and documentation
|
2018-10-10 22:46:00 -04:00 |
|
Mario Vavti
|
d2e366a46f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-10 13:33:15 +02:00 |
|
Mario Vavti
|
d29caa099a
|
fix some more wiki issues
|
2018-10-10 10:39:28 +02:00 |
|
zotlabs
|
c6f3298f78
|
SECURITY: signature issue
|
2018-10-09 22:37:53 -07:00 |
|
M.Dent
|
709665846e
|
Rework Wiki encoding scheme.
|
2018-10-08 13:35:18 -04:00 |
|
M.Dent
|
93a310582f
|
Implement custom escaping
|
2018-10-08 13:35:18 -04:00 |
|
Mario Vavti
|
f0b7a7e5d3
|
typo
|
2018-10-08 11:38:45 +02:00 |
|
Mario Vavti
|
e0568f33e8
|
the root cause for doubled entries is fixed now
|
2018-10-08 11:25:49 +02:00 |
|
Mario Vavti
|
a00aae702d
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-08 11:05:53 +02:00 |
|
zotlabs
|
69584f541d
|
hubzilla core issue #1278 - page update always reloads if noscript content is enabled
|
2018-10-07 22:12:49 -07: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
|
96277372d5
|
rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense.
|
2018-10-06 16:40:30 +02:00 |
|
Mario Vavti
|
b8991750c5
|
pubstream app
|
2018-10-06 16:08:15 +02:00 |
|
Mario Vavti
|
18726737d0
|
randprof app
|
2018-10-06 15:27:46 +02:00 |
|
Mario Vavti
|
6a297a8f3d
|
remote diagnostics app
|
2018-10-06 15:21:22 +02:00 |
|
Mario Vavti
|
3f57609b75
|
merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-06 15:00:40 +02:00 |
|
Mario Vavti
|
a522a66715
|
bookmarks: change wording
|
2018-10-06 14:50:17 +02:00 |
|
Mario Vavti
|
c2c891723f
|
bookmark app
|
2018-10-06 14:48:12 +02:00 |
|
Max Kostikov
|
ebb4811a75
|
Respect new table names on import
|
2018-10-06 14:06:24 +02:00 |
|
Mario Vavti
|
69659e9bd5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-05 11:40:50 +02:00 |
|
zotlabs
|
3a0a611f15
|
Merge branch 'dev'
|
2018-10-04 19:20:10 -07:00 |
|
Mario Vavti
|
1eaf6df842
|
fix issues with bs accordions
|
2018-10-04 22:21:20 +02:00 |
|
Mario Vavti
|
9fe9137c96
|
fix displaying of perm cats selector
|
2018-10-04 22:01:34 +02:00 |
|
Mario Vavti
|
363fc5c72b
|
whitespace
|
2018-10-04 21:49:00 +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 Vavti
|
c00dc6120d
|
defperm app
|
2018-10-04 13:26:45 +02:00 |
|
Mario Vavti
|
d0605e8d5f
|
uexport app
|
2018-10-04 11:50:38 +02:00 |
|
zotlabs
|
d33c331abd
|
regression: double linebreaks in viewsrc output
|
2018-10-03 21:18:23 -07:00 |
|
Mario Vavti
|
08a287dea1
|
do not default to channel_startpage if startpage app is not installed
|
2018-10-01 12:38:04 +02:00 |
|
Mario Vavti
|
7dadf387e5
|
indicate locked features
|
2018-10-01 11:01:56 +02:00 |
|
M. Dent
|
ff20370d0b
|
Status editor hook
|
2018-09-29 20:22:27 +02:00 |
|
Mario Vavti
|
cc9ca8bbff
|
do not unset $_GET[search] and adjust activity_order widget
|
2018-09-29 18:38:19 +02:00 |
|
Mario Vavti
|
5906d6cce3
|
improve network search
|
2018-09-29 18:00:14 +02:00 |
|
Mario Vavti
|
8265dac9c0
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-29 16:00:54 +02:00 |
|
Mario Vavti
|
6eeac03a0e
|
appman: query terms also by uid to prevent double entries
|
2018-09-29 16:00:34 +02:00 |
|
M. Dent
|
5f992ffe15
|
Remove servicelevel logic
|
2018-09-29 00:17:55 +02:00 |
|
Max Kostikov
|
c45a9504e7
|
Update Group.php
|
2018-09-28 19:52:11 +02:00 |
|
Max Kostikov
|
403ead44f9
|
Update Wiki.php
|
2018-09-28 19:50:45 +02:00 |
|
Max Kostikov
|
9b0d123217
|
Update Webpages.php
|
2018-09-28 19:50:29 +02:00 |
|
Max Kostikov
|
8e673a6cdf
|
Update Tokens.php
|
2018-09-28 19:50:15 +02:00 |
|
Max Kostikov
|
6d3c1fb7fc
|
Update Sources.php
|
2018-09-28 19:49:56 +02:00 |
|
Max Kostikov
|
01043fa790
|
Update Poke.php
|
2018-09-28 19:49:42 +02:00 |
|
Max Kostikov
|
23d5e15f0f
|
Update Permcats.php
|
2018-09-28 19:49:20 +02:00 |
|
Max Kostikov
|
5500473387
|
Update Pdledit.php
|
2018-09-28 19:49:02 +02:00 |
|
Max Kostikov
|
c8399e8104
|
Update Oauth2.php
|
2018-09-28 19:48:44 +02:00 |
|
Max Kostikov
|
423e1422ef
|
Update Oauth.php
|
2018-09-28 19:48:25 +02:00 |
|
Max Kostikov
|
c34c0c6718
|
Update Notes.php
|
2018-09-28 19:48:09 +02:00 |
|
Max Kostikov
|
e3e96e59d2
|
Update Mood.php
|
2018-09-28 19:47:52 +02:00 |
|
Max Kostikov
|
accb211280
|
Update Lang.php
|
2018-09-28 19:47:37 +02:00 |
|
Max Kostikov
|
f07a4667b6
|
Update Invite.php
|
2018-09-28 19:47:20 +02:00 |
|
Max Kostikov
|
cb768ea23f
|
Update Connect.php
|
2018-09-28 19:46:36 +02:00 |
|
Max Kostikov
|
b3249c10c2
|
Update Chat.php
|
2018-09-28 19:46:20 +02:00 |
|
Max Kostikov
|
c6fce5de24
|
Update Cdav.php
|
2018-09-28 19:46:04 +02:00 |
|
Max Kostikov
|
5c8e1169cd
|
Update Cards.php
|
2018-09-28 19:45:11 +02:00 |
|
Max Kostikov
|
5f7d83bd4d
|
Update Articles.php
|
2018-09-28 19:44:10 +02:00 |
|
Max Kostikov
|
52916bfcec
|
Merge branch 'patch-11' into 'dev'
add translations
See merge request Kostikov/core!21
|
2018-09-28 16:04:29 +02:00 |
|
Max Kostikov
|
cb2646154a
|
Merge branch 'patch-12' into 'dev'
Update Oauth2.php
See merge request Kostikov/core!20
|
2018-09-28 16:03:44 +02:00 |
|
Max Kostikov
|
61a7c4fb33
|
Merge branch 'patch-13' into 'dev'
Update Pdledit.php
See merge request Kostikov/core!19
|
2018-09-28 16:03:05 +02:00 |
|
Max Kostikov
|
3a3abc8087
|
Merge branch 'patch-14' into 'dev'
Update Permcats.php
See merge request Kostikov/core!18
|
2018-09-28 16:02:33 +02:00 |
|
Max Kostikov
|
e9b60cfb26
|
Merge branch 'patch-15' into 'dev'
Update Poke.php
See merge request Kostikov/core!17
|
2018-09-28 16:01:49 +02:00 |
|
Max Kostikov
|
eea9e2c1d0
|
Merge branch 'patch-16' into 'dev'
Update Sources.php
See merge request Kostikov/core!16
|
2018-09-28 16:01:05 +02:00 |
|
Max Kostikov
|
171d129ad1
|
Merge branch 'patch-17' into 'dev'
Update Tokens.php
See merge request Kostikov/core!15
|
2018-09-28 16:00:32 +02:00 |
|
Max Kostikov
|
0154c5d74e
|
Merge branch 'patch-18' into 'dev'
Update Webpages.php
See merge request Kostikov/core!14
|
2018-09-28 15:59:48 +02:00 |
|
Max Kostikov
|
9032a656fa
|
Merge branch 'patch-19' into 'dev'
Update Wiki.php
See merge request Kostikov/core!13
|
2018-09-28 15:58:55 +02:00 |
|
Max Kostikov
|
fda57a93a5
|
Merge branch 'patch-20' into 'dev'
Update Articles.php
See merge request Kostikov/core!12
|
2018-09-28 15:58:05 +02:00 |
|
Max Kostikov
|
4ad208668a
|
Merge branch 'patch-21' into 'dev'
Update Cards.php
See merge request Kostikov/core!11
|
2018-09-28 15:57:29 +02:00 |
|
Max Kostikov
|
23edb51ba4
|
Merge branch 'patch-22' into 'dev'
Update Cdav.php
See merge request Kostikov/core!10
|
2018-09-28 15:56:55 +02:00 |
|
Max Kostikov
|
adf10296f1
|
Merge branch 'patch-23' into 'dev'
Update Chat.php
See merge request Kostikov/core!9
|
2018-09-28 15:56:17 +02:00 |
|
Max Kostikov
|
d3e6d6b6a6
|
Merge branch 'patch-24' into 'dev'
Update Connect.php
See merge request Kostikov/core!8
|
2018-09-28 15:55:41 +02:00 |
|
Max Kostikov
|
82de0862a1
|
Merge branch 'patch-25' into 'dev'
Update Group.php
See merge request Kostikov/core!7
|
2018-09-28 15:54:45 +02:00 |
|
Max Kostikov
|
1969537fd7
|
Merge branch 'patch-26' into 'dev'
Update Invite.php
See merge request Kostikov/core!6
|
2018-09-28 15:54:08 +02:00 |
|
Max Kostikov
|
973afe042a
|
Merge branch 'patch-27' into 'dev'
Update Lang.php
See merge request Kostikov/core!5
|
2018-09-28 15:53:14 +02:00 |
|
Max Kostikov
|
99ceb1691b
|
Merge branch 'patch-28' into 'dev'
Update Mood.php
See merge request Kostikov/core!4
|
2018-09-28 15:52:28 +02:00 |
|
Max Kostikov
|
c13d7e29ef
|
Update Notes.php
|
2018-09-28 15:35:39 +02:00 |
|
Max Kostikov
|
58d9ca1bfd
|
Update Mood.php
|
2018-09-28 15:35:14 +02:00 |
|
Max Kostikov
|
e2115e8ea5
|
Update Lang.php
|
2018-09-28 15:34:45 +02:00 |
|
Max Kostikov
|
ba417894ed
|
Update Invite.php
|
2018-09-28 15:34:20 +02:00 |
|
Max Kostikov
|
a237248388
|
Update Group.php
|
2018-09-28 15:33:50 +02:00 |
|
Max Kostikov
|
7fd332f8cf
|
Update Connect.php
|
2018-09-28 15:33:17 +02:00 |
|
Max Kostikov
|
2811d6ae53
|
Update Chat.php
|
2018-09-28 15:32:27 +02:00 |
|
Max Kostikov
|
d8c6d93c6e
|
Update Cdav.php
|
2018-09-28 15:31:22 +02:00 |
|
Max Kostikov
|
134529a09d
|
Update Cards.php
|
2018-09-28 15:30:30 +02:00 |
|
Max Kostikov
|
24c7bb600e
|
Update Articles.php
|
2018-09-28 15:30:03 +02:00 |
|
Max Kostikov
|
90e9948dbe
|
Update Wiki.php
|
2018-09-28 15:29:33 +02:00 |
|
Max Kostikov
|
db006b911a
|
Update Webpages.php
|
2018-09-28 15:28:57 +02:00 |
|
Max Kostikov
|
eb2c2b9400
|
Update Tokens.php
|
2018-09-28 15:27:54 +02:00 |
|
Max Kostikov
|
86fc5b5ed8
|
Update Sources.php
|
2018-09-28 15:27:16 +02:00 |
|
Max Kostikov
|
f7e9454697
|
Update Poke.php
|
2018-09-28 15:26:46 +02:00 |
|
Max Kostikov
|
02a16050d9
|
Update Permcats.php
|
2018-09-28 15:26:09 +02:00 |
|
Max Kostikov
|
598fe91464
|
Update Pdledit.php
|
2018-09-28 15:25:38 +02:00 |
|
Max Kostikov
|
21272735ae
|
Update Oauth2.php
|
2018-09-28 15:24:45 +02:00 |
|
Max Kostikov
|
52fea09c53
|
add translations
|
2018-09-28 15:23:38 +02:00 |
|
Mario Vavti
|
20285d076b
|
settings for channel home
|
2018-09-28 11:29:05 +02:00 |
|
Mario
|
9e87219aea
|
Merge branch 'patch-10' into 'dev'
rename groups and group_members tables for MySQL 8 compatibility
See merge request hubzilla/core!1290
|
2018-09-28 09:41:21 +02:00 |
|
M. Dent
|
1b7e220de7
|
Merge branch 'channel-limits' into 'dev'
Hide form when at or over service_class['limit_identities']
See merge request hubzilla/core!1292
|
2018-09-28 04:46:48 +02:00 |
|
M.Dent
|
fe8b723622
|
Hide form when at or over service_class['limit_identities']
|
2018-09-27 22:43:36 -04:00 |
|
Max Kostikov
|
5d6c8fd807
|
Update Import.php
|
2018-09-28 00:28:15 +02:00 |
|
Max Kostikov
|
25e8d70786
|
Update Acl.php
|
2018-09-28 00:14:21 +02:00 |
|
Max Kostikov
|
978e45911f
|
Update Connections.php
|
2018-09-28 00:12:00 +02:00 |
|
Max Kostikov
|
da7bce3470
|
Update Contactgroup.php
|
2018-09-28 00:11:03 +02:00 |
|
Max Kostikov
|
4efa5cfa75
|
Update Group.php
|
2018-09-28 00:10:20 +02:00 |
|
Max Kostikov
|
444ae51a3e
|
Update Lockview.php
|
2018-09-28 00:06:26 +02:00 |
|
Max Kostikov
|
07f82e4a14
|
Update Network.php
|
2018-09-28 00:05:43 +02:00 |
|
Max Kostikov
|
3379f6f793
|
Update Channel.php
|
2018-09-28 00:02:58 +02:00 |
|
Max Kostikov
|
56fdc4f3fe
|
Missprint in Oauth.php fixed
|
2018-09-27 20:26:47 +02:00 |
|