Commit Graph

  • c1002557cf Merge branch 'patch-1' into 'dev' Mario 2018-10-04 13:53:00 +02:00
  • cccea911fa remove redundant var Mario Vavti 2018-10-04 13:44:26 +02:00
  • eb10120607 add apd file Mario Vavti 2018-10-04 13:27:16 +02:00
  • c00dc6120d defperm app Mario Vavti 2018-10-04 13:26:45 +02:00
  • d0605e8d5f uexport app Mario Vavti 2018-10-04 11:50:38 +02:00
  • d33c331abd regression: double linebreaks in viewsrc output zotlabs 2018-10-03 21:18:23 -07:00
  • 05b6c33a2c button sticking fixed Max Kostikov 2018-10-03 21:19:13 +02:00
  • 3064f2ced5 bump activity app version Mario 2018-10-03 16:09:31 +02:00
  • 5e7c9b9d4a jot: show settings icon only to local profile owner Mario 2018-10-03 15:21:20 +02:00
  • 009e03c3ba move archives from network to channel_home Mario 2018-10-03 11:47:12 +02:00
  • af3b0146a8 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-10-03 10:44:18 +02:00
  • 883e2ccc91 move filing from conversation to network - it is only functional there. Mario Vavti 2018-10-03 10:43:54 +02:00
  • 7c1e99884c do not propagate channel deletion for an already deleted channel. zotlabs 2018-10-02 19:42:21 -07:00
  • 29e1302f3f Merge branch 'dev' into 'dev' M. Dent 2018-10-03 03:18:43 +02:00
  • 798f2466e4 Fix misplaced comma with period. M.Dent 2018-10-02 21:14:36 -04:00
  • 67f19745fd add app_destroy hook which allows addons to perform post delete actions Mario Vavti 2018-10-02 14:29:56 +02:00
  • 72abe5f3d3 do not rely on startpage pconfig anymore Mario Vavti 2018-10-01 12:47:14 +02:00
  • 08a287dea1 do not default to channel_startpage if startpage app is not installed Mario Vavti 2018-10-01 12:38:04 +02:00
  • 7dadf387e5 indicate locked features Mario Vavti 2018-10-01 11:01:56 +02:00
  • 8febcc2705 Merge branch 'status-editor-hook' into 'dev' M. Dent 2018-09-29 20:22:27 +02:00
  • ff20370d0b Status editor hook M. Dent 2018-09-29 20:22:27 +02:00
  • cc9ca8bbff do not unset $_GET[search] and adjust activity_order widget Mario Vavti 2018-09-29 18:38:19 +02:00
  • 5906d6cce3 improve network search Mario Vavti 2018-09-29 18:00:14 +02:00
  • 8265dac9c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-09-29 16:00:54 +02:00
  • 6eeac03a0e appman: query terms also by uid to prevent double entries Mario Vavti 2018-09-29 16:00:34 +02:00
  • 7ca8f7b5cc allow to install apps by name Mario Vavti 2018-09-29 15:42:22 +02:00
  • d7ed5518d1 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-09-29 15:41:54 +02:00
  • 6f036bc778 hubzilla core issue #1276 zotlabs 2018-09-28 15:44:18 -07:00
  • ba4a8aa762 Merge branch 'remove-servicelevel-logic' into 'dev' M. Dent 2018-09-29 00:17:55 +02:00
  • 5f992ffe15 Remove servicelevel logic M. Dent 2018-09-29 00:17:55 +02:00
  • 2904e58a9f Merge translations for non-installed apps message M. Dent 2018-09-28 21:34:15 +02:00
  • c45a9504e7 Update Group.php Max Kostikov 2018-09-28 19:52:11 +02:00
  • 403ead44f9 Update Wiki.php Max Kostikov 2018-09-28 19:50:45 +02:00
  • 9b0d123217 Update Webpages.php Max Kostikov 2018-09-28 19:50:29 +02:00
  • 8e673a6cdf Update Tokens.php Max Kostikov 2018-09-28 19:50:15 +02:00
  • 6d3c1fb7fc Update Sources.php Max Kostikov 2018-09-28 19:49:56 +02:00
  • 01043fa790 Update Poke.php Max Kostikov 2018-09-28 19:49:42 +02:00
  • 23d5e15f0f Update Permcats.php Max Kostikov 2018-09-28 19:49:20 +02:00
  • 5500473387 Update Pdledit.php Max Kostikov 2018-09-28 19:49:02 +02:00
  • c8399e8104 Update Oauth2.php Max Kostikov 2018-09-28 19:48:44 +02:00
  • 423e1422ef Update Oauth.php Max Kostikov 2018-09-28 19:48:25 +02:00
  • c34c0c6718 Update Notes.php Max Kostikov 2018-09-28 19:48:09 +02:00
  • e3e96e59d2 Update Mood.php Max Kostikov 2018-09-28 19:47:52 +02:00
  • accb211280 Update Lang.php Max Kostikov 2018-09-28 19:47:37 +02:00
  • f07a4667b6 Update Invite.php Max Kostikov 2018-09-28 19:47:20 +02:00
  • cb768ea23f Update Connect.php Max Kostikov 2018-09-28 19:46:36 +02:00
  • b3249c10c2 Update Chat.php Max Kostikov 2018-09-28 19:46:20 +02:00
  • c6fce5de24 Update Cdav.php Max Kostikov 2018-09-28 19:46:04 +02:00
  • 5c8e1169cd Update Cards.php Max Kostikov 2018-09-28 19:45:11 +02:00
  • c0a485083d Update Articles.php Max Kostikov 2018-09-28 19:44:35 +02:00
  • 5f7d83bd4d Update Articles.php Max Kostikov 2018-09-28 19:44:10 +02:00
  • 52916bfcec Merge branch 'patch-11' into 'dev' Max Kostikov 2018-09-28 16:04:29 +02:00
  • cb2646154a Merge branch 'patch-12' into 'dev' Max Kostikov 2018-09-28 16:03:44 +02:00
  • 61a7c4fb33 Merge branch 'patch-13' into 'dev' Max Kostikov 2018-09-28 16:03:05 +02:00
  • 3a3abc8087 Merge branch 'patch-14' into 'dev' Max Kostikov 2018-09-28 16:02:33 +02:00
  • e9b60cfb26 Merge branch 'patch-15' into 'dev' Max Kostikov 2018-09-28 16:01:49 +02:00
  • eea9e2c1d0 Merge branch 'patch-16' into 'dev' Max Kostikov 2018-09-28 16:01:05 +02:00
  • 171d129ad1 Merge branch 'patch-17' into 'dev' Max Kostikov 2018-09-28 16:00:32 +02:00
  • 0154c5d74e Merge branch 'patch-18' into 'dev' Max Kostikov 2018-09-28 15:59:48 +02:00
  • 9032a656fa Merge branch 'patch-19' into 'dev' Max Kostikov 2018-09-28 15:58:55 +02:00
  • fda57a93a5 Merge branch 'patch-20' into 'dev' Max Kostikov 2018-09-28 15:58:05 +02:00
  • 4ad208668a Merge branch 'patch-21' into 'dev' Max Kostikov 2018-09-28 15:57:29 +02:00
  • 23edb51ba4 Merge branch 'patch-22' into 'dev' Max Kostikov 2018-09-28 15:56:55 +02:00
  • adf10296f1 Merge branch 'patch-23' into 'dev' Max Kostikov 2018-09-28 15:56:17 +02:00
  • d3e6d6b6a6 Merge branch 'patch-24' into 'dev' Max Kostikov 2018-09-28 15:55:41 +02:00
  • 82de0862a1 Merge branch 'patch-25' into 'dev' Max Kostikov 2018-09-28 15:54:45 +02:00
  • 1969537fd7 Merge branch 'patch-26' into 'dev' Max Kostikov 2018-09-28 15:54:08 +02:00
  • 973afe042a Merge branch 'patch-27' into 'dev' Max Kostikov 2018-09-28 15:53:14 +02:00
  • 99ceb1691b Merge branch 'patch-28' into 'dev' Max Kostikov 2018-09-28 15:52:28 +02:00
  • 4a904fa3a8 Merge branch 'patch-29' into 'dev' Max Kostikov 2018-09-28 15:46:14 +02:00
  • c13d7e29ef Update Notes.php Max Kostikov 2018-09-28 15:35:39 +02:00
  • 58d9ca1bfd Update Mood.php Max Kostikov 2018-09-28 15:35:14 +02:00
  • e2115e8ea5 Update Lang.php Max Kostikov 2018-09-28 15:34:45 +02:00
  • ba417894ed Update Invite.php Max Kostikov 2018-09-28 15:34:20 +02:00
  • a237248388 Update Group.php Max Kostikov 2018-09-28 15:33:50 +02:00
  • 7fd332f8cf Update Connect.php Max Kostikov 2018-09-28 15:33:17 +02:00
  • 2811d6ae53 Update Chat.php Max Kostikov 2018-09-28 15:32:27 +02:00
  • d8c6d93c6e Update Cdav.php Max Kostikov 2018-09-28 15:31:22 +02:00
  • 134529a09d Update Cards.php Max Kostikov 2018-09-28 15:30:30 +02:00
  • 24c7bb600e Update Articles.php Max Kostikov 2018-09-28 15:30:03 +02:00
  • 90e9948dbe Update Wiki.php Max Kostikov 2018-09-28 15:29:33 +02:00
  • db006b911a Update Webpages.php Max Kostikov 2018-09-28 15:28:57 +02:00
  • eb2c2b9400 Update Tokens.php Max Kostikov 2018-09-28 15:27:54 +02:00
  • 86fc5b5ed8 Update Sources.php Max Kostikov 2018-09-28 15:27:16 +02:00
  • f7e9454697 Update Poke.php Max Kostikov 2018-09-28 15:26:46 +02:00
  • 02a16050d9 Update Permcats.php Max Kostikov 2018-09-28 15:26:09 +02:00
  • 598fe91464 Update Pdledit.php Max Kostikov 2018-09-28 15:25:38 +02:00
  • 21272735ae Update Oauth2.php Max Kostikov 2018-09-28 15:24:45 +02:00
  • 52fea09c53 add translations Max Kostikov 2018-09-28 15:23:38 +02:00
  • d9ccd24b02 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-09-28 13:08:04 +02:00
  • 27fef98a39 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario 2018-09-28 13:05:44 +02:00
  • c6db644c42 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-09-28 12:46:36 +02:00
  • 41108fc4d3 nav_channel_select should be off by default Mario 2018-09-28 11:46:17 +02:00
  • d7a20821c3 move display settings up Mario Vavti 2018-09-28 11:32:00 +02:00
  • 20285d076b settings for channel home Mario Vavti 2018-09-28 11:29:05 +02:00
  • 44bb070203 add transaction, commit and rollback to update 1221 Mario 2018-09-28 09:55:10 +02:00
  • 9e87219aea Merge branch 'patch-10' into 'dev' Mario 2018-09-28 09:41:21 +02:00
  • 1b7e220de7 Merge branch 'channel-limits' into 'dev' M. Dent 2018-09-28 04:46:48 +02:00
  • fe8b723622 Hide form when at or over service_class['limit_identities'] M.Dent 2018-09-27 22:42:42 -04:00
  • 1e85c40c42 Merge branch 'patch-9' into 'dev' M. Dent 2018-09-28 04:15:28 +02:00