Commit Graph

  • 8235d0bd50 Update hmessages.po gia vec 2018-11-02 19:41:07 +01:00
  • c2e01bedc5 Update hstrings.php gia vec 2018-11-02 19:27:11 +01:00
  • 32c4614a32 Workaround for incorrect ISO-8859-5 encoded content conversion Max Kostikov 2018-11-02 10:52:52 +01:00
  • 24ae6c91ea Merge branch 'patch-21' into 'dev' Mario 2018-11-02 10:20:18 +01:00
  • 346a4f5933 strpos needs to test with ===0 not ==0 M.Dent 2018-11-01 20:23:22 -04:00
  • c6551336c8 Fix wrong image resize for some external images Max Kostikov 2018-11-01 21:50:36 +01:00
  • a240e1de75 Merge branch 'develop' into 'japanese' harukin 2018-11-01 23:03:58 +09:00
  • a776210aa7 Merge branch 'develop' into 'master' harukin 2018-11-01 23:03:07 +09:00
  • 88a6a2d1de harukin 2018-11-01 23:01:27 +09:00
  • e022a7edee harukin 2018-11-01 22:59:08 +09:00
  • 5d912efb32 harukin 2018-11-01 22:58:08 +09:00
  • 5243af975c harukin 2018-11-01 22:56:50 +09:00
  • 43486e7137 harukin 2018-11-01 22:55:18 +09:00
  • b2430495f5 修正 harukin 2018-11-01 22:53:44 +09:00
  • 1b1a6e357a 修正 harukin 2018-11-01 22:50:16 +09:00
  • 626b5f36ad 修正 harukin 2018-11-01 22:46:40 +09:00
  • 746ceebcdc 5000兆円欲しい!! harukin 2018-11-01 22:39:28 +09:00
  • 2a40051475 Merge branch 'develop' into 'japanese' harukin 2018-11-01 22:06:04 +09:00
  • 2406574041 Merge branch 'develop' into 'master' harukin 2018-11-01 22:04:54 +09:00
  • 23c40b9618 harukin 2018-11-01 21:53:18 +09:00
  • 95e4dca38a harukin 2018-11-01 21:41:46 +09:00
  • 66e562af72 harukin 2018-11-01 14:21:12 +09:00
  • 1f70331a12 harukin 2018-11-01 12:04:21 +09:00
  • 38e3369566 harukin 2018-11-01 10:40:58 +09:00
  • 7303cdbe08 harukin 2018-11-01 10:32:16 +09:00
  • 4677e34ea6 harukin 2018-11-01 10:20:22 +09:00
  • a48dc3ddf6 harukin 2018-11-01 10:13:48 +09:00
  • c548969877 harukin 2018-11-01 09:55:26 +09:00
  • 68150edbb9 harukin 2018-11-01 09:50:24 +09:00
  • 8e347e1b2e harukin 2018-11-01 09:47:43 +09:00
  • b26989f594 harukin 2018-11-01 09:08:25 +09:00
  • 0a3259d77c harukin 2018-11-01 09:07:30 +09:00
  • d95492c5d0 harukin 2018-11-01 09:03:09 +09:00
  • 3555c7f0c5 harukin 2018-10-31 22:04:50 +09:00
  • 272e2d5654 harukin 2018-10-31 21:31:56 +09:00
  • 3dab0d365d css fix for reshared-content images and whitespace Mario Vavti 2018-10-31 13:20:09 +01:00
  • 3abd110d45 harukin 2018-10-31 21:19:37 +09:00
  • cebb406277 harukin 2018-10-31 20:58:18 +09:00
  • 71e4f1c8a7 harukin 2018-10-31 20:01:59 +09:00
  • 403e42b662 harukin 2018-10-31 19:20:29 +09:00
  • a5598c33f3 harukin 2018-10-31 17:54:29 +09:00
  • 0c1cc32017 harukin 2018-10-31 17:52:29 +09:00
  • 994fb6c043 harukin 2018-10-31 17:43:50 +09:00
  • 0252bac4ba Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-10-31 09:39:10 +01:00
  • b468069875 Merge branch 'patch-20' into 'dev' Mario 2018-10-31 09:36:09 +01:00
  • a1842491ad harukin 2018-10-31 17:30:40 +09:00
  • 241e449564 harukin 2018-10-31 16:31:28 +09:00
  • ad8848f96a harukin 2018-10-31 16:23:56 +09:00
  • 7f3c1a89c3 harukin 2018-10-31 16:20:09 +09:00
  • 7e1f431eca yet another blueimp vulnerability. Move to composer. Mike Macgirvin 2018-10-31 15:56:08 +11:00
  • 70c55da1df Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-10-30 18:11:49 -07:00
  • f9ab7647dd Merge branch 'composer-updates' into 'dev' M. Dent 2018-10-31 01:32:44 +01:00
  • 623aa7ea48 remove primary/clone counts from admin summary. The last checkins should fix this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected. zotlabs 2018-10-30 17:30:59 -07:00
  • 046d264688 Merge branch 'forum-ping' into 'dev' M. Dent 2018-10-31 01:25:41 +01:00
  • 944e168120 Merge branch 'wikilist-widget' into 'dev' M. Dent 2018-10-31 01:24:32 +01:00
  • 9594105e57 typo zotlabs 2018-10-30 17:21:39 -07:00
  • 675343f575 issue syncing the channel_primary setting which shows up as a wrong count on the admin summary page zotlabs 2018-10-30 17:18:15 -07:00
  • fc6ff45c49 fix another markdown test Mario Vavti 2018-10-30 22:51:52 +01:00
  • b4bac88c39 fix markdown tests Mario Vavti 2018-10-30 22:37:41 +01:00
  • c622ba84b9 really fix html2markdown() - when using environment, we must set the defaults Mario Vavti 2018-10-30 22:16:37 +01:00
  • 339f95c647 Update oembed.php Max Kostikov 2018-10-30 16:49:48 +01:00
  • ec67e0ab22 Beautiful embedding for Hubzilla links Max Kostikov 2018-10-30 15:38:19 +01:00
  • 0b371c8103 fix html2markdown() and re-enable previously failing tests Mario Vavti 2018-10-30 13:55:08 +01:00
  • 2192ea6fdf update html_to_markdown, smarty and sabredav libs via composer Mario Vavti 2018-10-30 12:12:07 +01:00
  • 0060f88c45 Add tracking of deleted pconfig variables M.Dent 2018-10-29 23:04:13 -04:00
  • 1eac4db491 fix forum ping results - the term query requires xchan_name instead of xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count Mario Vavti 2018-10-29 23:01:13 +01:00
  • 0d2c3be367 allow wiki_list widget to be used in any page Mario Vavti 2018-10-29 22:55:24 +01:00
  • d12c6ccb72 Your Name 2018-10-29 21:44:52 +09:00
  • 1eb63fd8b9 Your Name 2018-10-29 21:41:43 +09:00
  • 2cf2171ac2 test Your Name 2018-10-29 21:25:16 +09:00
  • c8dd516d6c Merge branch 'dev' Mario Vavti 2018-10-29 11:02:51 +01:00
  • 0f19627407 changelog Mario Vavti 2018-10-29 10:59:54 +01:00
  • 3eb71fe7b5 merge Zotlabs/Access/PermissionLimits.php from dev Mario Vavti 2018-10-29 10:21:10 +01:00
  • 0035584d91 merge view/fr/hmessages.po from dev Mario Vavti 2018-10-29 10:20:36 +01:00
  • 8cbd2e3e9e merge view/ru/hstrings.php from dev Mario Vavti 2018-10-29 10:19:55 +01:00
  • b0f5c7f36f merge view/ru/hmessages.po from dev Mario Vavti 2018-10-29 10:19:31 +01:00
  • 412eb0a90b merge view/it/hstrings.php from dev Mario Vavti 2018-10-29 10:18:21 +01:00
  • f8e816629d merge view/it/hmessages.po from dev Mario Vavti 2018-10-29 10:17:54 +01:00
  • 3d0138569d merge view/es-es/hstrings.php from dev Mario Vavti 2018-10-29 10:17:04 +01:00
  • 7bb7d736a2 merge view/es-es/hmessages.po from dev Mario Vavti 2018-10-29 10:16:29 +01:00
  • 7910f39613 merge util/zotsh/zotsh.py from dev Mario Vavti 2018-10-29 10:16:01 +01:00
  • bf6ef2a588 merge util/update_theme_repo from dev Mario Vavti 2018-10-29 10:15:18 +01:00
  • a11d89daa3 merge util/update_autoloader from dev Mario Vavti 2018-10-29 10:14:43 +01:00
  • b8a4a6b959 merge util/hmessages.po from dev Mario Vavti 2018-10-29 10:10:03 +01:00
  • dd6045d9f8 merge install/schema_postgres.sql from dev Mario Vavti 2018-10-29 10:08:37 +01:00
  • e1c3a19420 merge include/zot.php from dev Mario Vavti 2018-10-29 10:08:12 +01:00
  • cc586685e6 merge include/nav.php from dev Mario Vavti 2018-10-29 10:07:54 +01:00
  • 31883f603c merge include/import.php from dev Mario Vavti 2018-10-29 10:07:15 +01:00
  • f377c81c8a merge include/connections.php from dev Mario Vavti 2018-10-29 10:06:44 +01:00
  • 32384eaf07 merge Zotlabs/Widget/Wiki_pages.php from dev Mario Vavti 2018-10-29 10:06:01 +01:00
  • 7c2efa697c merge Zotlabs/Module/Photo.php from dev Mario Vavti 2018-10-29 10:04:34 +01:00
  • e1df69dfcb Merge branch 'dev' Mario Vavti 2018-10-29 07:43:40 +01:00
  • 6dd84fde33 すきまテスト Your Name 2018-10-29 14:12:56 +09:00
  • 60eaedc67f test Your Name 2018-10-29 14:11:09 +09:00
  • ce908b31c1 再共有メッセージ修復 Your Name 2018-10-29 14:05:57 +09:00
  • f687739cfe Merge branch 'develop' into 'master' harukin 2018-10-29 13:40:10 +09:00
  • 56d1e3792a Merge branch 'develop' into 'japanese' harukin 2018-10-29 13:39:02 +09:00
  • ce8215ec6c Your Name 2018-10-29 13:34:25 +09:00
  • db5b86dbac テストコミット Your Name 2018-10-29 11:46:37 +09:00
  • ecab83264c harukinの表示サイズ変更 Your Name 2018-10-29 11:26:30 +09:00