Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 458b023204 Merge branch 'dev' into 'dev' Mario 2018-12-21 21:35:54 +01:00
• 4bad4ec632 Merge branch 'remove-legacy-photo-cache-prevention' into 'dev' Max Kostikov 2018-12-21 15:19:36 +01:00
• e34853e19e do not add timestamp to the photo src. caching is handled in mod photo now. Mario Vavti 2018-12-21 12:51:19 +01:00
• 6cbdb1b4c3 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-21 12:19:52 +01:00
• 60f890ce0d Fix for cURL with default HTTP/2 Max Kostikov 2018-12-20 21:13:05 +01:00
• c82c0a9812 Merge branch 'dev' into 'dev' Max Kostikov 2018-12-20 21:09:16 +01:00
• 123b1d4002 Merge branch 'revert-090fe394' into 'dev' Max Kostikov 2018-12-20 21:04:12 +01:00
• e4958d5bb9 Revert "Fix cURL with HTTP/2" Max Kostikov 2018-12-20 20:58:48 +01:00
• 89e734dcca Merge branch 'dev' into 'dev' Max Kostikov 2018-12-20 20:51:26 +01:00
• 090fe394e4 Fix cURL with HTTP/2 Max Kostikov 2018-12-20 20:38:35 +01:00
• 389b4beba4 like permission issue zotlabs 2018-12-20 11:06:52 -08:00
• d0ee6d1ad2 missing observer check Mario Vavti 2018-12-20 18:45:11 +00:00
• ec769bc9f9 missing observer check Mario Vavti 2018-12-20 19:45:11 +01:00
• 6b259070f0 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-20 12:59:04 +01:00
• 651ea8cc2f edit translation harukin 2018-12-20 20:34:39 +09:00
• 3f0e948981 edit translation harukin 2018-12-20 17:07:24 +09:00
• 24ed7fbf3f edit translation harukin 2018-12-20 17:04:54 +09:00
• b13c3979c2 edit translation harukin 2018-12-20 16:59:24 +09:00
• 7a55dd512a reverse activity mapping improvements zotlabs 2018-12-19 20:03:31 -08:00
• fdd0dbd973 edit translation harukin 2018-12-19 20:48:05 +09:00
• 774dd6d5e3 use count() instead of sizeof() Mario Vavti 2018-12-19 11:08:28 +01:00
• 4cbaddf4c4 Merge branch 'dark-fix-dev' into 'dev' Mario 2018-12-19 10:14:29 +01:00
• 10f1da2736 Merge branch 'util-reload_addons' into 'dev' Mario 2018-12-19 10:12:59 +01:00
• 0e5d76e735 Add reload to util/addons M. Dent 2018-12-19 10:12:59 +01:00
• 339c9cceec check if we deal with an array before sizeof() Mario Vavti 2018-12-19 10:05:18 +01:00
• 2354bb5427 remove color from style.css (default) but add a little padding; add color & border radius to dark.css. phani00 2018-12-18 17:54:39 +01:00
• fe80f8179c Merge branch 'channel_b64_enc_mid' into 'dev' Max Kostikov 2018-12-18 15:10:58 +01:00
• b97143e9db change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css. phani00 2018-12-18 14:02:50 +01:00
• aaab905e72 remove some fancy formatting. phani00 2018-12-18 12:37:51 +01:00
• bc6d384ca9 make mod channel deal with b64 encoded mid\s ; Mario Vavti 2018-12-18 10:43:06 +01:00
• 6fc8c174f9 Merge branch 'dev' into 'dev' Mario 2018-12-18 10:17:57 +01:00
• 63b205c601 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-18 09:59:34 +01:00
• f0a834f7e8 edit translation harukin 2018-12-18 15:05:36 +09:00
• fdb2cf09c7 edit translation harukin 2018-12-18 14:26:16 +09:00
• a67738380c edit translation harukin 2018-12-18 14:19:34 +09:00
• 15ce8bc79b Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-12-17 18:45:42 -08:00
• 8d70b91955 regression: mail from dev to core not delivering zotlabs 2018-12-17 18:14:32 -08:00
• a33ed05bec fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit. zotlabs 2018-12-17 11:32:59 -08:00
• aace8a14ce new fix for dark theme phani00 2018-12-17 15:28:15 +00:00
• d80b8ff30f Merge branch 'dev' into dark-fix-dev phani00 2018-12-17 15:18:24 +00:00
• 3a66255576 Remove scale_external_images() Max Kostikov 2018-12-17 13:29:37 +01:00
• 1541f67eab Remove scale_external_images() Max Kostikov 2018-12-17 13:28:58 +01:00
• a2959c6e9e Remove scale_external_images() Max Kostikov 2018-12-17 13:28:18 +01:00
• 06c71eec65 default curl to http/1.1 zotlabs 2018-12-16 22:38:58 +00:00
• 70a7661711 remove my dark theme fixes. phani00 2018-12-17 10:08:45 +00:00
• d190b1995b Merge branch 'dev' into 'dev' Mario 2018-12-17 10:55:53 +01:00
• a6f8230063 Merge branch 'memory-warn2' into 'dev' Mario 2018-12-17 10:55:29 +01:00
• aabc6c2825 Add return if no local_channel() DM42.Net (Matt Dent) 2018-12-16 00:49:59 +00:00
• 8323458da9 ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. DM42.Net (Matt Dent) 2018-12-14 14:55:27 +00:00
• e4c60d70b0 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-17 10:12:53 +01:00
• 4d8a815932 Keep remote site headers for caching Max Kostikov 2018-12-17 09:34:30 +01:00
• b0e5f5973a Merge branch 'dev' into 'dev' Max Kostikov 2018-12-17 09:19:08 +01:00
• 05cb4fd897 Move SSLify code from Photo cache addon Max Kostikov 2018-12-17 09:13:03 +01:00
• 72dc6ea77c Revert Photos.php code Max Kostikov 2018-12-17 01:16:08 +01:00
• 1b0a6fe9eb SSLify cached URL on redirect if needed Max Kostikov 2018-12-17 00:58:46 +01:00
• 363ad01bce SSLify cached URL on redirect if needed Max Kostikov 2018-12-17 00:30:36 +01:00
• 04a45a407e default curl to http/1.1 zotlabs 2018-12-16 14:38:58 -08:00
• 14735e0a48 Update Zotlabs/Module/Setup.php phani00 2018-12-16 22:04:28 +01:00
• 1c07428f89 add warning if upload_filesize < 4MB. phani00 2018-12-16 20:35:20 +00:00
• e0d68664c4 Remove photo_cache_enable variable Max Kostikov 2018-12-16 20:48:36 +01:00
• 6c72c3d4a5 Merge branch 'patch-20181214a' into 'dev' Mario 2018-12-16 20:08:52 +01:00
• 9df8dbee08 Merge branch 'develop' into 'japanese' harukin 2018-12-16 18:44:51 +09:00
• 140af45bb0 Merge branch 'add-harukin--future' into 'develop' harukin 2018-12-16 18:43:41 +09:00
• 2bf2f2518c add harukin- picture harukin 2018-12-16 18:35:45 +09:00
• 5bcc379530 Add return if no local_channel() DM42.Net (Matt Dent) 2018-12-15 19:49:59 -05:00
• c854ec0686 Merge branch 'dev' into 'dev' M. Dent 2018-12-15 22:33:03 +01:00
• 6a825cc504 Update OAuth2Storage.php - fix email retrieval in getUser Pascal Deklerck 2018-12-15 22:19:18 +01:00
• 3ed6763da9 Merge branch 'custom-item-types' into 'dev' Mario 2018-12-15 20:55:28 +01:00
• dbeabb8ff0 Merge branch 'patch-20181214f' into 'dev' Mario 2018-12-15 20:32:01 +01:00
• cc66e1d966 Merge branch 'patch-20181214d' into 'dev' Mario 2018-12-15 20:31:06 +01:00
• d7c7ff1c12 fix wiki preview issue with hyperlinks Mario Vavti 2018-12-15 17:19:29 +00:00
• 919ea9f750 fix wiki preview issue with hyperlinks Mario Vavti 2018-12-15 18:19:29 +01:00
• 5816ee9f9a Merge branch 'develop' into 'japanese' harukin 2018-12-15 17:20:44 +09:00
• bcb258bcbb Merge branch 'develop' into 'master' harukin 2018-12-15 17:20:18 +09:00
• e02c09d361 merge again upstream/master for 3.8.7 harukin 2018-12-15 17:17:00 +09:00
• 09b2cdd618 Add ITEM_TYPE_CUSTOM and hooks for processing custom item types DM42.Net (Matt Dent) 2018-12-14 20:20:26 -05:00
• 1e526e68ab Merge branch 'patch-20181214b' into 'dev' Max Kostikov 2018-12-14 22:58:22 +01:00
• d77c7d51e3 update changelog Mario Vavti 2018-12-14 20:46:48 +00:00
• 4ff3c57976 update changelog Mario Vavti 2018-12-14 21:46:48 +01:00
• d51d0160d3 fix issue with linkdropper Mario Vavti 2018-12-14 10:23:08 +00:00
• c2ad9d4996 regression: the ability to order apps messed up since adding pinned apps to the ordering zotlabs 2018-12-13 03:11:30 +00:00
• 3416190e4b Set min/maxversion for plugins to STD_VERSION unless otherwise specified DM42.Net (Matt Dent) 2018-12-14 14:22:28 -05:00
• de7cb6d6ad Fix syntax error DM42.Net (Matt Dent) 2018-12-14 13:59:41 -05:00
• eb297104de Make Affinity Slider (optionally) 'sticky' across page loads. (default is current behavior: reset slider with each page load) DM42.Net (Matt Dent) 2018-12-14 12:52:58 -05:00
• dfa6463e5b Merge branch 'develop' into 'japanese' harukin 2018-12-15 00:48:21 +09:00
• 9cd9776b7d Merge branch 'develop' into 'master' harukin 2018-12-15 00:47:46 +09:00
• 097afab9f4 merge from upsream harukin 2018-12-15 00:40:38 +09:00
• 03a214c8b9 Recreate MR#1419 for dev branch DM42.Net (Matt Dent) 2018-12-14 10:05:41 -05:00
• 3f06a857c2 ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. DM42.Net (Matt Dent) 2018-12-14 09:55:27 -05:00
• 79f828125d version bump Mario 2018-12-14 11:47:02 +01:00
• ad4b18cbbe return on readImageBlob() exception Mario Vavti 2018-12-11 11:21:09 +00:00
• 1bd49671b7 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error Mario Vavti 2018-12-10 09:37:29 +00:00
• 9896057549 home notifications won't expand if there are more than 300 unseen network notifications ahead of them. zotlabs 2018-12-10 04:24:04 +00:00
• 44832bbacb change redbasic dark schema to make categories and highlights readable phani00 2018-12-10 03:03:28 +00:00
• f20a923dd7 total_identities restriction off by one zotlabs 2018-12-09 19:20:57 +00:00
• 30403da326 reset page title if article has no title. zotlabs 2018-12-06 00:24:30 +00:00
• f81a3ba45d fix issue with linkdropper Mario Vavti 2018-12-14 11:23:08 +01:00
• 018fa052f2 edit translation harukin 2018-12-14 19:21:10 +09:00
• c771d2809f Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-12-14 10:28:55 +01:00
• fc78206049 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-12-13 16:13:13 -08:00