harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,583 Commits 6 Branches 36 Tags 152 MiB
52ad5b7df5
Commit Graph

22583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs
2f3c3db020 hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes 2018-06-15 02:02:03 -07:00
zotlabs
967d4da30a wiki: word-wrap code on any character 2018-06-14 22:46:20 -07:00
zotlabs
7a144b90fb re-implement/refactor getQuotaInfo() on DAV storage 2018-06-14 20:40:25 -07:00
zotlabs
4a028b6015 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-06-13 21:36:29 -07:00
zotlabs
8da0f9d356 optionally report total available space when uploading 2018-06-13 21:06:56 -07:00
Mike Macgirvin
fc396f16ff Merge branch 'dev' into 'dev' 
change repo links

See merge request hubzilla/core!1220
 2018-06-14 05:46:28 +02:00
zotlabs
b5e4a5f51c SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. 2018-06-13 20:27:10 -07:00
gia vec
77ba647778 Update README.md 
(cherry picked from commit 7d73543b84507b74c8058da7dd062d7949c34d61)
 2018-06-14 04:33:34 +02:00
gia vec
10491294d8 Update hubzilla-setup.sh 
(cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5)
 2018-06-14 04:26:21 +02:00
zotlabs
65cbc7c2bb uid is integer 2018-06-13 16:37:16 -07:00
zotlabs
1a75e3c24a Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-13 16:29:56 -07:00
zotlabs
b0b67fbcc4 Merge branch 'master' of ../hz into dev 2018-06-13 16:28:08 -07:00
zotlabs
254a6be277 null db fields in mod_invite 2018-06-13 16:25:50 -07:00
Mike Macgirvin
fdf920b374 Merge branch 'master' into 'master' 
Master

See merge request hubzilla/core!1218
 2018-06-13 03:11:05 +02:00
Mike Macgirvin
dffd82cb24 Merge branch 'remove-github-from-README' into 'master' 
remove github from link to INSTALL.txt

See merge request hubzilla/core!1215
 2018-06-13 03:09:39 +02:00
Mike Macgirvin
633693c94b Merge branch 'fix-addons-links' into 'dev' 
fix links to addons repository

See merge request hubzilla/core!1216
 2018-06-13 03:07:05 +02:00
gia vec
9840d1ce73 Update hstrings.php 2018-06-12 20:47:19 +02:00
gia vec
6a45bd4372 Update hmessages.po 2018-06-12 20:42:16 +02:00
Herbert Thielen
b361fb4f89 fix links to addons repository 2018-06-11 15:54:22 +02:00
Herbert Thielen
530bc996ca remove github from link to INSTALL.txt 2018-06-11 15:26:30 +02:00
zotlabs
2f2bd03b15 fixes for immediate expire, channel_active not initialised in DB 2018-06-10 22:19:51 -07:00
zotlabs
a8f179145b Merge branch 'master' of ../hz into dev 2018-06-10 22:16:39 -07:00
zotlabs
912ccb31a1 hubzilla core issue #1218 2018-06-10 19:26:35 -07:00
zotlabs
6959c9e423 fixes for immediate expire, channel_active not initialised in DB 2018-06-10 15:27:55 -07:00
Mario Vavti
53363d6808 fix issue #1221 
(cherry picked from commit d0f7b1d9b7)
 2018-06-10 17:06:12 +02:00
Mario Vavti
1b9a350469 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-10 17:05:05 +02:00
Mario Vavti
d0f7b1d9b7 fix issue #1221 2018-06-10 17:04:34 +02:00
Mario
86c0abe67e Merge branch 'dev' into 'dev' 
Update symbolic link doc/es

See merge request hubzilla/core!1214

(cherry picked from commit 46cc64f2d8)

438ce44a Update symbolic link doc/es
 2018-06-10 16:54:37 +02:00
Mario
46cc64f2d8 Merge branch 'dev' into 'dev' 
Update symbolic link doc/es

See merge request hubzilla/core!1214
 2018-06-10 16:54:22 +02:00
Mario Vavti
9e29c13678 fix issue #1219 2018-06-09 16:38:15 +02:00
Manuel Jiménez Friaza
438ce44af9 Update symbolic link doc/es 2018-06-09 13:41:13 +02:00
Mario Vavti
e37ccb7a63 move cid filter js to the widget 2018-06-09 13:08:14 +02:00
Mario Vavti
afaa8012c8 bump version 2018-06-09 11:04:56 +02:00
Mario Vavti
c4778e5e24 restrict cid filter to unthreaded order (makes much more sense that way imho and the query is a lot faster) and slighty change order of the filters 2018-06-09 10:58:01 +02:00
Mario Vavti
d5ee8d80ab Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-08 23:19:56 +02:00
Mario Vavti
1fbc131469 if unthreaded and cid and not pf, query author only 2018-06-08 23:19:30 +02:00
Mario Vavti
468af29e3e new feature filter network by name 2018-06-08 23:03:05 +02:00
Mario
b05e7943c2 Merge branch 'dev' into 'dev' 
Update github.com git repo URLs with framagit.org URLs

See merge request hubzilla/core!1212
 2018-06-08 21:04:21 +02:00
Mario
dbf0c1893c Merge branch 'dev' into 'dev' 
Update doc/es-es

See merge request hubzilla/core!1213
 2018-06-08 21:02:07 +02:00
Manuel Jiménez Friaza
950006a4de Update doc/es-es 2018-06-08 12:49:21 +02:00
Mario Vavti
2f7dfb0286 update changelog 
(cherry picked from commit 7c98aea524)
 2018-06-08 12:17:33 +02:00
Mario Vavti
7c98aea524 update changelog 2018-06-08 12:16:47 +02:00
Mario
688c5bdd20 bump version 2018-06-08 12:05:06 +02:00
Andrew Manning
4feff1cf89 Update github.com git repo URLs with framagit.org URLs 2018-06-08 05:37:23 -04:00
Andrew Manning
df2d181602 Merge branch 'dev' of framagit.org:hubzilla/core into dev 2018-06-08 05:22:01 -04:00
Mario Vavti
752a9d904c DB update to fix wrong hubloc_url for activitypub hublocs 
(cherry picked from commit eb04dbc5ce)
 2018-06-08 09:41:35 +02:00
Mario Vavti
a5b9fbaf00 github to framagit transition 
(cherry picked from commit 7bf1c5f27b)
 2018-06-08 09:05:27 +02:00
Mario Vavti
7bf1c5f27b github to framagit transition 2018-06-08 09:04:19 +02:00
zotlabs
d841303c04 we probably don't need to delivery local items more than once 
(cherry picked from commit 139c39c2ce)
 2018-06-08 08:38:53 +02:00
zotlabs
5e5b9895df when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to. 
(cherry picked from commit 5d83469621)
 2018-06-08 08:37:36 +02:00