Commit Graph

  • 672c3d7c6d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-26 22:51:07 -07:00
  • 72479041ae don't include deleted or orphaned xchans in ratings search redmatrix 2016-07-26 22:50:31 -07:00
  • e286b510f1 Merge pull request #463 from git-marijus/dev hubzilla 2016-07-27 14:54:51 +10:00
  • 315dafbe12 restrict url cache to 254 maxlen redmatrix 2016-07-26 20:05:40 -07:00
  • 80e4338314 missing s redmatrix 2016-07-26 19:28:28 -07:00
  • db176eec40 set App::$error on 404 so we don't get two 'Page not found.' page bodies. redmatrix 2016-07-26 17:24:17 -07:00
  • 02f88fc7b2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-26 15:59:06 -07:00
  • 56957b60e2 issue #460 - remove reference to $a which was passed by value since it doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier. redmatrix 2016-07-26 15:57:33 -07:00
  • 7126fd4b31 fix drag and drop Mario Vavti 2016-07-26 15:57:47 +02:00
  • 560af7a5b8 allow multiple-file cloud upload Mario Vavti 2016-07-26 13:17:46 +02:00
  • e38880a686 Merge pull request #462 from wave72/dev Wave 2016-07-26 09:51:54 +02:00
  • 29dd4ad39b Updated Italian strings Wave72 2016-07-26 09:51:06 +02:00
  • 54ecf0f45f URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav clients Mario Vavti 2016-07-26 09:04:52 +02:00
  • 6900dd34a4 URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav clients Mario Vavti 2016-07-26 09:04:52 +02:00
  • 11b97af250 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-26 08:43:28 +02:00
  • 70dae328b5 check for new permissions and update channels and connections with defaults if any are found and if there are defaults for any channel roles which are being used on this site. redmatrix 2016-07-25 21:59:52 -07:00
  • 5d4245ff01 move openid to addon redmatrix 2016-07-25 17:16:41 -07:00
  • 24d28bc23a issue #460 redmatrix 2016-07-25 13:29:06 -07:00
  • d786eca126 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-25 13:27:42 -07:00
  • 2fb4952137 issue #460 redmatrix 2016-07-25 13:27:17 -07:00
  • dcf2c07f29 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-25 13:38:12 +02:00
  • da512cef64 revert multiple test Mario Vavti 2016-07-25 11:43:01 +02:00
  • f41b037fbe css fixes Mario Vavti 2016-07-25 11:41:27 +02:00
  • 0f5f1c98ca revert cloud acl selector (branched so as to continue development) redmatrix 2016-07-25 01:46:40 -07:00
  • 01338a7610 make drag/drop work with acl, which bypassed the form redmatrix 2016-07-24 22:58:26 -07:00
  • 063b4286e7 trace log pconfig cache if for some reason it isn't an array redmatrix 2016-07-24 22:36:37 -07:00
  • 271f85be3b add acl selection to files upload via /cloud (still missing from directory creation) redmatrix 2016-07-24 20:27:59 -07:00
  • b5f2b4af35 string update and some minor comment edits redmatrix 2016-07-24 16:11:34 -07:00
  • 9967f2ab28 call wall_attach rather than wall_upload for drag/drop; which means you can drag/drop any file and not just photos. redmatrix 2016-07-24 16:09:33 -07:00
  • 52c3960946 Merge pull request #459 from anaqreon/jot-drag-attach hubzilla 2016-07-25 08:55:12 +10:00
  • 1b1170bcf6 Drag and drop one image file at a time into the post editor will upload it. Andrew Manning 2016-07-24 17:33:34 -04:00
  • eb03877aa4 Merge pull request #458 from anaqreon/dragdropupload hubzilla 2016-07-24 23:13:05 +10:00
  • 4c4d185937 Remove logger calls Andrew Manning 2016-07-24 08:35:21 -04:00
  • 6998bb1f23 Multiple file upload by drag and drop with progress indicators and auto page reload Andrew Manning 2016-07-24 07:41:53 -04:00
  • 3a60bef2b6 Include credentials for session cookie in xhr Andrew Manning 2016-07-23 08:39:23 -04:00
  • eb1eb38c01 AJAX single upload might be working, but permissions problems seem to cause failure. Andrew Manning 2016-07-23 07:59:28 -04:00
  • 3c5598407e Drag and drop file information display in cloud files upload form. No actual upload implemented yet. Andrew Manning 2016-07-22 21:27:32 -04:00
  • ed82cb108f Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-22 20:16:49 +02:00
  • 4ffc4ee70a rename the patch so that it explains what it does Mario Vavti 2016-07-22 14:29:16 +02:00
  • 52db649022 apply our custom patch to readmore.js Mario Vavti 2016-07-22 14:14:20 +02:00
  • 38e46fff54 upgrade readmore.js and improve collapsing a little Mario Vavti 2016-07-22 14:03:14 +02:00
  • 744ad84714 Merge pull request #6 from redmatrix/dev Wave 2016-07-22 10:55:02 +02:00
  • 7d897a3f03 more work on #453 redmatrix 2016-07-21 23:06:55 -07:00
  • 79eeeaee95 fix birthday addtocal redmatrix 2016-07-21 21:35:26 -07:00
  • 2c1b432613 fix birthday addtocal redmatrix 2016-07-21 21:35:26 -07:00
  • 0c3d5e99a2 PConfig : Check for is_null($uid) as well as false. We actually allow $uid = 0 though it shouldn't normally happen. redmatrix 2016-07-21 20:50:39 -07:00
  • dca8a05026 Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge redmatrix 2016-07-21 20:06:08 -07:00
  • 5cfc286972 zat URL auth updated to match changes to the atoken_login interface redmatrix 2016-07-21 20:04:30 -07:00
  • bc46f70a90 zat URL auth updated to match changes to the atoken_login interface redmatrix 2016-07-21 20:04:30 -07:00
  • 5a63ddd645 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-21 21:14:54 -04:00
  • 8566f91303 fail oembed if it is attempted and less than 80% of the original content is left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link. redmatrix 2016-07-21 17:44:04 -07:00
  • b63aff77df merge 1.10RC into dev Mario Vavti 2016-07-22 01:13:56 +02:00
  • 5a1eb65ed6 missing $ Mario Vavti 2016-07-22 01:07:53 +02:00
  • 98a2dcad90 Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge redmatrix 2016-07-21 15:51:25 -07:00
  • 77a021025f DAV auth issue redmatrix 2016-07-21 15:50:07 -07:00
  • 63123759ed DAV auth issue redmatrix 2016-07-21 15:50:07 -07:00
  • 6167291488 issue #411 redmatrix 2016-07-19 05:13:18 -07:00
  • cf0b1f1f15 typo redmatrix 2016-07-21 01:48:20 -07:00
  • 824dedbe9d issue #453 and a bug noted from the logfiles related to the schema change last month redmatrix 2016-07-20 23:04:07 -07:00
  • da707736a0 issue #453 and a bug noted from the logfiles related to the schema change last month redmatrix 2016-07-20 23:04:07 -07:00
  • 8f57bb95fe undefined function redmatrix 2016-07-20 21:55:23 -07:00
  • 0c3543ac43 undefined function redmatrix 2016-07-20 21:55:23 -07:00
  • d2e5b7cb76 delete test doc redmatrix 2016-07-20 20:29:33 -07:00
  • 6a56a509d3 Merge branch 'dev' into perms redmatrix 2016-07-20 19:03:18 -07:00
  • dffa08adcc fix vevent multi-line formatting redmatrix 2016-07-20 18:59:51 -07:00
  • 779885f9af fix vevent multi-line formatting redmatrix 2016-07-20 18:59:51 -07:00
  • d504197a78 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-20 21:22:53 -04:00
  • 542fcaff9a Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge redmatrix 2016-07-20 17:57:42 -07:00
  • bc8c74eb42 sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for. redmatrix 2016-07-20 17:55:40 -07:00
  • 3affb2e817 sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for. redmatrix 2016-07-20 17:55:40 -07:00
  • df0cd4dbc7 Merge branch 'dev' into perms redmatrix 2016-07-20 13:39:10 -07:00
  • d54ad98802 Merge branch '1.10RC' into dev Mario Vavti 2016-07-20 22:01:58 +02:00
  • 1d90c4ea99 Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC Mario Vavti 2016-07-20 22:00:58 +02:00
  • 4da005e209 type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid Mario Vavti 2016-07-20 22:00:41 +02:00
  • c3149a8d59 Merge pull request #456 from anaqreon/1.10RC-updates git-marijus 2016-07-20 20:50:50 +02:00
  • fd507ff597 Merge pull request #455 from anaqreon/wiki git-marijus 2016-07-20 20:50:17 +02:00
  • 8c2b93da72 Merge branch '1.10RC' into dev Mario Vavti 2016-07-20 20:44:20 +02:00
  • ca82b45fe4 fix /mail wsod issue reported by giac hellvecio Mario Vavti 2016-07-20 20:43:12 +02:00
  • 43def0873e Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-20 14:53:58 +02:00
  • da49befb18 Wiki delete page confirmation and max image width Andrew Manning 2016-07-20 05:44:29 -04:00
  • e0d9d30bcf Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-07-20 05:39:08 -04:00
  • 99f7dd0fd4 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-20 05:38:19 -04:00
  • 0c7ad924a8 Starting to make the import selection page after element scan. Andrew Manning 2016-07-20 05:33:40 -04:00
  • a3e5307b93 fix the forum detection in include/zot redmatrix 2016-07-19 22:57:23 -07:00
  • ae6256f95a another couple of minor perms fixes redmatrix 2016-07-19 22:32:22 -07:00
  • a961d5e6c8 permission fixes redmatrix 2016-07-19 20:49:54 -07:00
  • 237cca7a0d fixes to perms redmatrix 2016-07-19 19:33:48 -07:00
  • 2c9938f0d5 add test sequence redmatrix 2016-07-19 18:41:36 -07:00
  • ea83032863 translate more old perms calls redmatrix 2016-07-19 17:52:45 -07:00
  • 6a4573b935 Merge branch 'dev' into perms redmatrix 2016-07-19 17:05:59 -07:00
  • 9421e42dad doc correction redmatrix 2016-07-19 17:04:38 -07:00
  • f4b658d7b1 issue #411 redmatrix 2016-07-19 05:13:18 -07:00
  • 7272b97e9a yet more grungy perms work. redmatrix 2016-07-19 01:26:28 -07:00
  • 8a9f062b95 Merge branch 'dev' into perms redmatrix 2016-07-18 22:35:31 -07:00
  • eac35c05e9 Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge redmatrix 2016-07-18 22:34:16 -07:00
  • 07b96f2430 runaway cron emails redmatrix 2016-07-18 22:33:26 -07:00
  • 269b3cef72 runaway cron emails redmatrix 2016-07-18 22:33:26 -07:00
  • 99cf2cbaa9 missing bracket redmatrix 2016-07-18 21:46:40 -07:00
  • b63165b6e0 more perms work (a lot more) redmatrix 2016-07-18 21:37:34 -07:00
  • 32ce790717 move legacy code inside the legacy check redmatrix 2016-07-18 19:09:27 -07:00