harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 06837bd32b Revert code to use thr_parent for comment replies Max Kostikov 2019-05-01 15:12:01 +02:00
  • b8d8887d5a Merge branch 'dev' into 'dev' Mario 2019-05-01 10:07:07 +02:00
  • 256f8dd41b Merge branch 'dev' into 'dev' Mario 2019-05-01 10:06:24 +02:00
  • e0fdafc7e5 Merge branch 'dev' of ../hz into dev zotlabs 2019-04-30 23:39:56 -07:00
  • 9a55df245f disable directory options when using suggestion mode and only return one page (60 items) so that sorting works correctly zotlabs 2019-04-30 23:38:48 -07:00
  • 9800d95c50 fix suggestion ordering in directory module zotlabs 2019-04-30 23:19:04 -07:00
  • c340416c94 Add 'reply on comment' code Max Kostikov 2019-05-01 06:24:58 +02:00
  • 9af8a1d30c Move JS to main module Max Kostikov 2019-05-01 06:23:56 +02:00
  • 4da96ee980 Remove 'doreply' JS function Max Kostikov 2019-04-30 17:35:53 +02:00
  • 21637e033c Add JS 'doreply' function Max Kostikov 2019-04-30 17:34:56 +02:00
  • 9ebf2dc97b Add "reply to" hint to submit button Max Kostikov 2019-04-30 17:33:54 +02:00
  • a04689b784 do not allow editing events that do not belong to us Mario Vavti 2019-04-30 12:08:19 +02:00
  • 5066945adc Fix add multiple icons on 'Submit' button when reply on comment Max Kostikov 2019-04-30 11:17:22 +02:00
  • e945c12856 Add displaying support for threaded comments Max Kostikov 2019-04-30 11:00:13 +02:00
  • 0b062d0b8a select event by event_hash instead of item_id Mario Vavti 2019-04-30 10:47:48 +02:00
  • 9cc1eff15c remove logging Mario Vavti 2019-04-30 00:12:19 +02:00
  • 327e5d06e1 calendar merge: implement single event editing UI Mario Vavti 2019-04-30 00:09:57 +02:00
  • a2dd0aea92 Merge branch 'cherry-pick-80ca2023' into 'dev' Max Kostikov 2019-04-29 23:45:58 +02:00
  • 39da3459c7 Add 'reply on comment' feature Max Kostikov 2019-04-29 21:19:26 +00:00
  • c0be4c36e1 Update main.js Max Kostikov 2019-04-29 23:40:21 +02:00
  • 31e04378cd Add 'reply to comment' processing Max Kostikov 2019-04-29 23:30:51 +02:00
  • e80c99ad74 Add 'reply to comment' button Max Kostikov 2019-04-29 23:29:16 +02:00
  • d9be443e53 Add initial threaded comments support Max Kostikov 2019-04-29 23:26:20 +02:00
  • 6db323b15e Add variables for threaded comments support Max Kostikov 2019-04-29 23:24:48 +02:00
  • 5abbfd3f19 Add initial threaded comment support Max Kostikov 2019-04-29 23:21:17 +02:00
  • 674215e9e6 Merge branch 'dev' into 'dev' Mario 2019-04-29 11:58:59 +02:00
  • dce6a5763d calendar merge: d&d support and some minor cleanup and fixes Mario Vavti 2019-04-29 11:45:55 +02:00
  • d89d6e8a01 Merge branch 'dev' of ../hz into dev zotlabs 2019-04-28 18:21:41 -07:00
  • 6230dbed2d Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-28 18:21:28 -07:00
  • 9641254443 event attachments still weren't being delivered to zot6 zotlabs 2019-04-28 18:20:40 -07:00
  • 95871fe13c Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-28 17:47:26 -07:00
  • 0cecfceb14 Merge branch 'sql_fixes' into 'dev' Max Kostikov 2019-04-28 20:59:53 +02:00
  • b9f1cb2021 Merge branch 'origin' into 'japanese' harukin 2019-04-28 18:00:17 +09:00
  • 3f208d806c Merge branch 'origin' into 'master' harukin 2019-04-28 17:58:16 +09:00
  • ba9ea3f02a Merge branch 'origin' into 'develop' harukin 2019-04-28 17:52:03 +09:00
  • 13970280d9 Merge branch 'dev' of ../hz into dev zotlabs 2019-04-27 17:22:00 -07:00
  • 55ce80aabe Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-27 17:21:42 -07:00
  • 9536a490b3 Add jot videos inline and with poster if possible zotlabs 2019-04-27 17:20:38 -07:00
  • 405e07f0a2 improve channel date query Mario Vavti 2019-04-27 23:01:05 +02:00
  • d3ce91bd89 Merge branch 'dev' into 'dev' Max Kostikov 2019-04-27 21:47:57 +02:00
  • eb44201c5f Use goaway() base function Max Kostikov 2019-04-27 21:38:54 +02:00
  • 73248aadd5 possible sql performance improvement Mario Vavti 2019-04-27 15:35:41 +02:00
  • f6a4084f81 bump version Mario 2019-04-26 11:30:23 +02:00
  • d5f89c165a update changelog Mario Vavti 2019-04-26 09:28:06 +00:00
  • a518471a27 update changelog Mario Vavti 2019-04-26 11:28:06 +02:00
  • dce5080e53 permissions cleanup zotlabs 2019-04-06 01:06:59 +00:00
  • 2221d4d612 add attachments to zot6 event objects, add zot6 to federated transports (webfinger) zotlabs 2019-04-16 03:51:57 +00:00
  • 5f73a46c05 import/export zot6 hublocs+xchans Zot 2019-04-26 07:34:58 +00:00
  • b782c6bd16 update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master) Zot 2019-04-26 07:12:23 +00:00
  • ab8d8aa552 hubloc confusion in magic auth Zot 2019-04-25 09:54:37 +00:00
  • f955276694 Fix infinite loop using postgres as backend Daniel Lowe 2019-04-21 11:14:17 +00:00
  • 77cc60faf2 required php version not available but allowed to continue zotlabs 2019-04-18 20:53:39 +00:00
  • a6f50b8c85 Merge branch 'dev' into 'dev' Mario 2019-04-26 09:34:58 +02:00
  • e2dfa1d72f import/export zot6 hublocs+xchans Zot 2019-04-26 09:34:58 +02:00
  • 9a61c0a6fc Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-26 00:28:29 -07:00
  • e10b25a12c Merge branch 'dev' of ../hz into dev zotlabs 2019-04-26 00:25:32 -07:00
  • 0c1e803208 import/export zot6 hublocs+xchans zotlabs 2019-04-26 00:24:58 -07:00
  • b57dcc74d1 Merge branch 'dev' into 'dev' Mario 2019-04-26 09:12:23 +02:00
  • f8c583636c update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master) Zot 2019-04-26 09:12:23 +02:00
  • e6521d1cf3 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-25 21:49:18 -07:00
  • 96785e8df1 update fix_system_urls() to handle zot6 hublocs zotlabs 2019-04-25 21:45:04 -07:00
  • d689778465 Merge branch 'dev' into 'dev' Mario 2019-04-25 11:54:37 +02:00
  • 3c8f8b76aa hubloc confusion in magic auth Zot 2019-04-25 11:54:37 +02:00
  • c123fa5422 update blueimp/jquery-file-upload Mario Vavti 2019-04-25 11:50:26 +02:00
  • 0ade8be7f7 add missing files Mario Vavti 2019-04-25 11:47:59 +02:00
  • a60c2f38c6 update sabre/vobject Mario Vavti 2019-04-25 11:47:18 +02:00
  • f1c0797780 Revert "update composer libs" Mario 2019-04-25 11:24:09 +02:00
  • 701167bc12 Revert "fix test" Mario 2019-04-25 11:22:45 +02:00
  • a39e63e324 Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9" Mario 2019-04-25 11:22:21 +02:00
  • 8401e9c2b4 dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9 Mario Vavti 2019-04-25 11:14:40 +02:00
  • c5fca0a1e7 fix test Mario Vavti 2019-04-25 10:52:57 +02:00
  • e779335d06 update composer libs Mario Vavti 2019-04-25 08:52:50 +02:00
  • 26039adf5b compound name warning zotlabs 2019-04-24 16:31:31 -07:00
  • c88286556a hubloc confusion during magic auth where hublocs with more than one network may exist zotlabs 2019-04-24 16:21:59 -07:00
  • 831b9d4433 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-04-24 16:21:13 -07:00
  • e937e8fff9 Merge branch 'dev' into 'dev' Mario 2019-04-24 21:11:19 +02:00
  • f616b2d49a calendar merge: bring back event categories Mario Vavti 2019-04-24 14:48:30 +02:00
  • fe84dae313 Optimize cached photos processing Max Kostikov 2019-04-24 11:18:17 +02:00
  • 9104933b18 Add modified date in Etag hash calculation Max Kostikov 2019-04-24 11:13:17 +02:00
  • 79654635d3 Merge branch 'update-docs' into 'dev' Max Kostikov 2019-04-22 19:49:08 +02:00
  • f0edfca75c Merge branch 'fix-infinite-loop' into 'dev' Max Kostikov 2019-04-22 19:47:49 +02:00
  • e845da2edc Tidy up various bits of documentation Daniel Lowe 2019-04-22 15:50:02 +00:00
  • 7a3050f2c0 Remove section on techlevels Daniel Lowe 2019-04-22 15:49:39 +00:00
  • 9a6531e2a2 Fix infinite loop using postgres as backend Daniel Lowe 2019-04-21 11:14:17 +00:00
  • a6a17a85f3 Merge branch 'calendar_merge' into 'dev' Max Kostikov 2019-04-20 20:14:58 +02:00
  • 9275fd16c2 resolve merge conflict Mario Vavti 2019-04-20 10:23:11 +02:00
  • 904ae05810 Merge branch 'dev' into 'dev' Max Kostikov 2019-04-19 23:19:38 +02:00
  • 54f95389a8 Add anti SEO link properties in directory listing Max Kostikov 2019-04-19 23:17:24 +02:00
  • a8fc70a5b9 Merge branch 'dev' into 'dev' Max Kostikov 2019-04-19 21:26:48 +02:00
  • c374072822 Update cdav_calendar.tpl Max Kostikov 2019-04-19 21:22:42 +02:00
  • 0212de68a4 Merge branch 'dev' into 'dev' Max Kostikov 2019-04-19 21:14:29 +02:00
  • 2ea9b6d409 Add translation to update button Max Kostikov 2019-04-19 21:11:34 +02:00
  • 823d71df28 Merge branch 'dev' into 'dev' Max Kostikov 2019-04-19 21:06:09 +02:00
  • 7560918b32 Add translation to update button Max Kostikov 2019-04-19 21:04:00 +02:00
  • fd87faa7a6 Merge branch 'dev' into calendar_merge Mario Vavti 2019-04-19 19:37:06 +02:00
  • cb2d706fa1 provide location and description information Mario Vavti 2019-04-19 19:06:01 +02:00
  • 6b638ac896 Merge branch 'dev' into 'dev' Mario 2019-04-19 17:23:10 +02:00
  • 2bd5ae3617 provide link to source and some cleanup Mario Vavti 2019-04-19 17:21:45 +02:00
  • 39a5311315 Merge branch 'dev' into calendar_merge Mario Vavti 2019-04-19 15:34:02 +02:00
  • 9b6e46dc6b calendar merge initial commit Mario Vavti 2019-04-19 15:32:56 +02:00