harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,010 Commits 6 Branches 36 Tags 152 MiB
29cb62af3d
Commit Graph

24010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs
29cb62af3d translate name of content filter (addon) app. 2019-02-28 17:51:13 -08:00
zotlabs
1ff97754af issues uncovered testing combined item/file import 2019-02-24 21:43:15 -08:00
zotlabs
20e43311db zot api changes to support combined content (items+files) import addon 2019-02-24 14:46:09 -08:00
zotlabs
a77d7b8442 urlencode links in category widget 2019-02-19 20:51:06 -08:00
zotlabs
51e9f302b0 hubzilla has uuid - use that instead of wildcard 2019-02-19 13:36:53 -08:00
zotlabs
72fd1cc5a6 remove extraneous logging 2019-02-19 13:23:46 -08:00
zotlabs
1a77bdd1d0 fix ability for file storage creators (visitors) to be able to delete their own content 2019-02-19 13:14:19 -08:00
zotlabs
1ea9002fe8 Merge branch 'dev' of https://framagit.org/zot/core into dev 2019-02-19 11:56:26 -08:00
zotlabs
7d1c3920fd mod_id should return object not collection 2019-02-19 11:45:42 -08:00
Mario Vavti
cead10b9af update composer autoload cache 2019-02-19 10:24:20 +01:00
Mario Vavti
382e94e282 update strings 2019-02-19 10:21:53 +01:00
Mario
7e8434404f Merge branch 'patch-20190218a' into 'dev' 
Fix: post_activity_item returns success => true even on failure.

See merge request hubzilla/core!1521
 2019-02-19 08:46:03 +01:00
M.Dent
cfcbaf33af Fix: post_activity_item returns success => true even on failure. 2019-02-18 22:40:19 -05:00
zotlabs
175f78fa84 support zot location independent urls 2019-02-18 18:16:50 -08:00
M. Dent
c8ab2bec5e Merge branch 'js_fixes' into 'dev' 
prevent page jumping on like if comments are expanded (show all x comments)

See merge request hubzilla/core!1520
 2019-02-19 01:24:35 +01:00
M. Dent
136d50a7c5 Merge branch 'mod_display_fixes' into 'dev' 
if local_channel() and updating the page do not query for another item if the...

See merge request hubzilla/core!1519
 2019-02-19 01:23:28 +01:00
M. Dent
0fa653d580 Merge branch 'core_fixes' into 'dev' 
remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary

See merge request hubzilla/core!1518
 2019-02-19 01:21:37 +01:00
Mario Vavti
48f2c85791 prevent page jumping on like if comments are expanded (show all x comments) 2019-02-18 14:40:41 +01:00
Mario Vavti
13ca56d380 if local_channel() and updating the page do not query for another item if the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update 2019-02-18 14:27:01 +01:00
Mario
b5109d2a1a Merge branch 'photo_driver_refactor' into 'dev' 
Photo driver refactor

See merge request hubzilla/core!1515
 2019-02-18 10:02:46 +01:00
Mario Vavti
8ab532efb5 remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary 2019-02-18 10:02:18 +01:00
Mario
f11c17063c Merge branch 'QA' into 'dev' 
Improve gitlab-ci environment.

See merge request hubzilla/core!1516
 2019-02-18 09:44:26 +01:00
Mario
72eb44aebc Merge branch 'dev' into 'dev' 
MySQL 8 admin summary compatibility

See merge request hubzilla/core!1517
 2019-02-18 09:41:38 +01:00
Max Kostikov
b070503e77 MySQL 8 admin summary compatibility 2019-02-17 22:47:08 +01:00
Klaus Weidenbach
f48e1ee0ac Improve gitlab-ci environment. 
Use a custom Hubzilla image to speed up pipeline.
Single test jobs were around 4:30-5:00 minutes, now ~1:30 minute.
Improve Composer cache in Gitlab CI/CD.
Add more recent databases (MySQL8, MariaDB10.3) to the pipeline.
 2019-02-17 18:19:09 +01:00
M. Dent
a5b7590d3a Merge branch 'exclude_addon_common' into 'dev' 
exclude addon_common from addon list

See merge request hubzilla/core!1513
 2019-02-15 22:03:33 +01:00
M. Dent
f0955f1620 Merge branch 'rm_addon_settings' into 'dev' 
Remove deprecated addon settings

See merge request hubzilla/core!1514
 2019-02-15 22:02:33 +01:00
Mario
4769254978 deprecate addon settings 2019-02-15 12:35:19 +01:00
Mario
ca917f7b9a exclude addon_common from addon list 2019-02-15 11:39:59 +01:00
Klaus Weidenbach
b9df4c99cf Remove duplicate code in PhotoDriver classes. 
cropImage is just a special case of cropImageRect, no need to
duplicate all the code.
 2019-02-14 22:06:42 +01:00
Klaus Weidenbach
e6dadb215e Refactor photo_driver to use namespaces. 
Add simple UnitTest, but it is not yet very meaningful.
 2019-02-14 22:06:42 +01:00
Klaus Weidenbach
d70bba2806 Clean up and documentation in photo_drive. 2019-02-14 22:06:42 +01:00
Mario Vavti
3217452b02 missing use app 2019-02-14 14:48:16 +01:00
M. Dent
ff0494b180 Merge branch 'affinity_fixes' into 'dev' 
affinity tool fixes

See merge request hubzilla/core!1511
 2019-02-14 14:06:25 +01:00
M. Dent
8be15c1b5b Merge branch 'disable_repeats' into 'dev' 
disable repeats until issues are resolved

See merge request hubzilla/core!1512
 2019-02-14 14:05:24 +01:00
Mario Vavti
0207b5ba8b disable repeats until issues are resolved 2019-02-14 11:32:43 +01:00
Mario Vavti
5ab917f606 affinity tool fixes 2019-02-14 11:06:52 +01:00
Mario
ea541ca21b Merge branch 'aff2' into 'dev' 
affinity slider as app

See merge request hubzilla/core!1449
 2019-02-14 09:56:53 +01:00
phani00
fc223f5924 affinity slider as app 2019-02-14 09:56:53 +01:00
Mario
7b8eb84cb8 Merge branch 'patch-20190212a' into 'dev' 
Fix: only first lock red with privacy_warning

See merge request hubzilla/core!1510
 2019-02-13 20:36:33 +01:00
M.Dent
c3e2b463e4 Only cascade privacy warning if thread parent has privacy concerns. 2019-02-13 08:26:03 -05:00
M.Dent
5b3ea012ab Fix: only first lock red with privacy_warning 2019-02-12 22:05:57 -05:00
Max Kostikov
07df43aa2a Merge branch 'dev' into 'dev' 
Update Russian translayion

See merge request hubzilla/core!1509
 2019-02-12 11:55:17 +01:00
Max Kostikov
6e3bc77369 Update hstrings.php 2019-02-12 11:48:50 +01:00
Max Kostikov
24ddefe3ad Update hmessages.po 2019-02-12 11:47:53 +01:00
Mario
7db645587b Merge branch 'fix-20190211a' into 'dev' 
Get all listeners

See merge request hubzilla/core!1508
 2019-02-12 08:45:48 +01:00
M.Dent
cbf6d53e84 Get all listeners 2019-02-11 20:24:17 -05:00
Mario Vavti
f52a532771 use ACTIVITY_SHARE to match the verb 2019-02-08 11:33:01 +01:00
Mario Vavti
efc4c53b44 missing use App 2019-02-08 10:15:28 +01:00
zotlabs
4837f9cdad Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-02-07 19:54:07 -08:00