Commit Graph

  • 55792d5528 fix css issue Mario Vavti 2019-06-07 09:51:26 +02:00
  • a3f726baa8 fix embedphotos image size Mario Vavti 2019-06-07 06:45:08 +00:00
  • ebc2b23c3a fix embedphotos image size Mario Vavti 2019-06-07 08:45:08 +02:00
  • e4ca3609d9 Merge branch '4.2RC' Mario Vavti 2019-06-04 10:19:04 +02:00
  • bc092d8d78 version 4.2 Mario Vavti 2019-06-04 10:16:06 +02:00
  • dd5933b048 Merge branch 'dev' into 4.2RC Mario Vavti 2019-06-04 10:13:59 +02:00
  • 5d6128b25c update changelog Mario Vavti 2019-06-04 10:13:25 +02:00
  • 24cb04c346 do not change default timezone in parse_ical_file() Mario Vavti 2019-06-03 20:37:03 +00:00
  • f1b54cf0a4 do not change default timezone in parse_ical_file() Mario Vavti 2019-06-03 22:37:03 +02:00
  • e64a7b87a8 fix timezone issue when importing adjusted events Mario Vavti 2019-06-03 19:03:43 +00:00
  • 2b452ea3e8 fix timezone issue when importing adjusted events Mario Vavti 2019-06-03 21:03:43 +02:00
  • 66c6c6c7d1 regard timezones in calendar import/export Mario 2019-06-03 11:25:48 +00:00
  • 5b4aa1afc2 regard timezones in calendar import/export Mario 2019-06-03 13:25:48 +02:00
  • 89205276ab update changelog Mario Vavti 2019-06-03 09:48:30 +00:00
  • 6d2ab6a7d6 update changelog Mario Vavti 2019-06-03 11:48:30 +02:00
  • e6da910ee2 Merge branch 'dev' into 4.2RC Mario Vavti 2019-06-03 11:44:31 +02:00
  • 2100ac3cfc Merge branch 'dev' into 'dev' Max Kostikov 2019-05-31 23:28:09 +02:00
  • c7476a1d96 fix category widget when using articles zotlabs 2019-05-31 14:19:04 -07:00
  • d8c3033941 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-30 19:50:58 +02:00
  • 7e26ee5a73 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-30 13:45:20 +02:00
  • a8e25ccfe6 Add single photo URL rewrite for clonned channel Max Kostikov 2019-05-30 13:41:32 +02:00
  • b6267ec7c2 live-update not triggering on mod_search zotlabs 2019-05-29 17:04:27 -07:00
  • b6bd2884d5 Merge branch 'dev' into 4.2RC Mario Vavti 2019-05-29 09:08:40 +02:00
  • 767a235611 Merge branch 'dev' into 'dev' Mario 2019-05-29 09:06:52 +02:00
  • 620fc06b6c anomolies in calls to datetime_convert in include/import zotlabs 2019-05-28 23:14:22 -07:00
  • 0fa4c89a1b convert AS "instrument" objects to the more appropriate "generator" - this probably should happen in pubcrawl addon also zotlabs 2019-05-28 20:23:03 -07:00
  • 1bf046c142 Revert "another forum -> group wording change" (wrong tree) zotlabs 2019-05-28 16:35:41 -07:00
  • 52f8429218 support 'expires' over Zot6 zotlabs 2019-05-28 16:28:03 -07:00
  • 932b414063 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-05-28 16:16:29 -07:00
  • 097b2390db update changelog Mario Vavti 2019-05-28 10:07:14 +00:00
  • ca8d252ad7 update changelog Mario Vavti 2019-05-28 12:07:14 +02:00
  • 23a0dbe3cc 4.2RC2 Mario Vavti 2019-05-27 08:19:23 +02:00
  • 545ece82b3 Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RC Mario Vavti 2019-05-27 08:09:36 +02:00
  • eaea947b74 Merge branch 'dev' into 4.2RC Mario Vavti 2019-05-27 08:07:26 +02:00
  • f1b61d5882 mod cal band-aid fixes Mario Vavti 2019-05-26 20:22:40 +02:00
  • e466d72058 adjust birthday handling according to community decision and slightly change display of allday event items Mario Vavti 2019-05-26 18:05:11 +02:00
  • 385be35ed5 fix #1374 Mario Vavti 2019-05-24 08:27:45 +00:00
  • 528b9b6a60 fix #1374 Mario Vavti 2019-05-24 10:27:45 +02:00
  • dd374eaebf get channel from photo uid Mario Vavti 2019-05-24 07:57:46 +00:00
  • 9ea483d1dc get channel from photo uid Mario Vavti 2019-05-24 09:57:46 +02:00
  • d8a396bf24 new style translation harukin 2019-05-23 18:08:19 +09:00
  • b1813df61a add new directory fallback server Mario Vavti 2019-05-23 08:46:16 +02:00
  • 8715f74d29 Merge branch 'dev' into 4.2RC Mario Vavti 2019-05-23 08:44:44 +02:00
  • 152224944b add new directory fallback server Mario Vavti 2019-05-23 08:43:48 +02:00
  • f86d12c8f4 Merge branch 'dev' into 4.2RC Mario Vavti 2019-05-23 08:37:52 +02:00
  • 94d4bc4bac Merge branch 'dev' into 'dev' Mario 2019-05-22 12:59:41 +02:00
  • c95488549d Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2019-05-22 12:41:01 +02:00
  • 39613aa2d9 improve timezone detection for caldav and remove smart birthday feature. Force adjust birthdays until we agree on how to deal with this. Mario Vavti 2019-05-22 12:40:37 +02:00
  • 7c2aafd4ee another forum -> group wording change zotlabs 2019-05-21 18:23:45 -07:00
  • e834c7fe3e remove unused code Mario Vavti 2019-05-21 12:31:50 +02:00
  • f96958adf8 fix all day events for caldav calendars Mario Vavti 2019-05-21 12:29:00 +02:00
  • 776074b24f translate make-friend activities to zot6 zotlabs 2019-05-20 19:03:10 -07:00
  • c9d64d75f3 move smart birthday feature to calendar settings and override the adjust flag at display time instead of import Mario Vavti 2019-05-20 13:51:53 +02:00
  • 9651689bb8 fix event notifications viewall url Mario Vavti 2019-05-20 13:14:54 +02:00
  • 75be0475ba Merge branch 'es-es' into 'dev' Mario 2019-05-20 13:08:37 +02:00
  • e130b58b20 Merge branch 'es-es' into '4.2RC' Mario 2019-05-20 13:06:55 +02:00
  • e44f0c497f be more precise with table selection Mario Vavti 2019-05-20 12:34:05 +02:00
  • 2d0f96d28b Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2019-05-20 12:27:00 +02:00
  • 34d1f79777 calendar merge: initial commit for timezone support Mario Vavti 2019-05-20 12:26:33 +02:00
  • 2185ccd4ea Merge branch 'cherry-pick-350e636e' into 'es-es' Manuel Jiménez Friaza 2019-05-19 14:03:17 +02:00
  • 125634759d Updated Spanish translation Manuel Jiménez Friaza 2019-05-19 11:52:17 +00:00
  • 350e636e3d Updated Spanish translation Manuel Jiménez Friaza 2019-05-19 13:52:17 +02:00
  • 429140df97 Merge remote-tracking branch 'upstream/dev' into dev Manuel Jiménez Friaza 2019-05-19 13:25:00 +02:00
  • a921deafd1 Fix a really disturbing comment Xanthor 2019-05-17 03:23:12 +00:00
  • 071fba2f71 wiki: urlencode the entire share link Mario Vavti 2019-05-17 10:24:25 +00:00
  • 9de729e3e7 wiki: urlencode the entire share link Mario Vavti 2019-05-17 10:24:25 +00:00
  • 7cf5bd30f2 use escape_tags() wiki headers Mario Vavti 2019-05-17 09:57:41 +00:00
  • e6cee2965a use escape_tags() wiki headers Mario Vavti 2019-05-17 09:57:41 +00:00
  • af2b263bc7 Fix a really disturbing comment Xanthor 2019-05-17 03:23:12 +00:00
  • aa120e0478 wiki: urlencode the entire share link Mario Vavti 2019-05-17 12:24:25 +02:00
  • b07c55a0d9 Merge branch 'patch-1' into 'master' Mario 2019-05-17 12:01:21 +02:00
  • e7f1f496c5 use escape_tags() wiki headers Mario Vavti 2019-05-17 11:57:41 +02:00
  • 823c0434eb Fix a really disturbing comment Xanthor 2019-05-17 05:23:12 +02:00
  • 22162635e7 calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries Mario Vavti 2019-05-15 16:21:52 +00:00
  • 8be0031602 calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries Mario Vavti 2019-05-15 18:21:52 +02:00
  • 29c5e74d31 missing backslash Mario Vavti 2019-05-15 09:38:23 +00:00
  • 3c8867a1e8 missing backslash Mario Vavti 2019-05-15 11:38:23 +02:00
  • c439fe0437 add autocomplete js to calendar and fix issue with extended likes mid Mario Vavti 2019-05-14 07:09:48 +00:00
  • b21db670b4 Fix comments scroll button CSS Max Kostikov 2019-05-13 21:16:36 +00:00
  • 1f84aa9809 css fixes Mario Vavti 2019-05-13 20:00:40 +00:00
  • 4ac249c26c deal with privacy mentions in event descriptions Mario Vavti 2019-05-13 13:45:05 +00:00
  • 85a29fce94 bbcode map bypass wasn't catching all map forms. zotlabs 2019-05-13 12:14:43 +00:00
  • 71ecb470b6 Merge branch 'dev' into 'dev' Mario 2019-05-14 09:10:48 +02:00
  • 15a000bb45 add autocomplete js to calendar and fix issue with extended likes mid Mario Vavti 2019-05-14 09:09:48 +02:00
  • 18e4a7ac6e Merge branch 'dev' into 'dev' Max Kostikov 2019-05-13 23:19:19 +02:00
  • d0322f5fbd Fix comments scroll button CSS Max Kostikov 2019-05-13 23:16:36 +02:00
  • c1f01b7e35 css fixes Mario Vavti 2019-05-13 22:00:40 +02:00
  • 71064f481b deal with privacy mentions in event descriptions Mario Vavti 2019-05-13 15:45:05 +02:00
  • 436293713b bbcode map bypass wasn't catching all map forms. zotlabs 2019-05-13 05:14:43 -07:00
  • fc726bfb4b fix button size Mario Vavti 2019-05-13 13:02:23 +02:00
  • b0c3780667 fix button size Mario Vavti 2019-05-13 13:02:23 +02:00
  • 3e431c65be bump version Mario Vavti 2019-05-13 12:17:08 +02:00
  • 5b0b90d1f5 bump version, update autoload cache and update strings Mario Vavti 2019-05-13 12:13:18 +02:00
  • d16714e84b calendar merge: cleanup Mario Vavti 2019-05-13 11:30:13 +02:00
  • 1d5fff9f58 upgrade jgrowl Mario Vavti 2019-05-13 10:53:10 +02:00
  • fbe8d6144a port db_indexes() from zap Mario Vavti 2019-05-13 10:46:12 +02:00
  • d5f59a57bf don't do oembed processing on naked links and smarty lib cleanup. ported from zap. Mario Vavti 2019-05-13 10:39:40 +02:00
  • 7465c79884 optimise oembed pdf processing so we do not actually load the content, which could cause performance issues. ported from zap. Mario Vavti 2019-05-13 10:28:06 +02:00
  • 769195fcff Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2019-05-13 10:14:06 +02:00
  • dc786bd1cc form security token for mod register ported from zap Mario Vavti 2019-05-13 10:13:51 +02:00