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

Commit Graph

  • b5b57523f1 more perms work redmatrix 2016-07-18 16:45:43 -07:00
  • 7524948a97 Merge branch 'dev' into perms redmatrix 2016-07-18 16:10:41 -07:00
  • f9b67d3630 more perms work redmatrix 2016-07-18 13:44:39 -07:00
  • 3beb94dc52 whitespace Mario Vavti 2016-07-18 13:52:26 +02:00
  • 4371e6ad97 resolve merge conflict Mario Vavti 2016-07-18 13:50:32 +02:00
  • f44ca74e99 do not transform hashes to tags in [code=xxx] or [code] blocks Mario Vavti 2016-07-18 13:48:09 +02:00
  • 8bbe2569dc Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-18 11:53:23 +02:00
  • 10fa5c20e7 export/import channel permissions redmatrix 2016-07-17 22:40:39 -07:00
  • f7833411a1 clone channel perms redmatrix 2016-07-17 22:18:35 -07:00
  • de4f9d68bd Merge branch 'dev' into perms redmatrix 2016-07-17 21:40:04 -07:00
  • 571b8cc85b roll version redmatrix 2016-07-17 19:57:19 -07:00
  • 883fc5d753 update changelog redmatrix 2016-07-17 19:54:59 -07:00
  • 25b2a6e0cf update changelog redmatrix 2016-07-17 19:54:59 -07:00
  • 4febdc3bcd jquery update issue prevents comments from reloading and resetting watch cursor redmatrix 2016-07-17 18:32:38 -07:00
  • c3617f5d1e jquery update issue prevents comments from reloading and resetting watch cursor redmatrix 2016-07-17 18:32:38 -07:00
  • fc78ba7c2f change std_version redmatrix 2016-07-17 16:38:21 -07:00
  • 279359c1bd Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-17 16:05:46 -07:00
  • dc9fa7cf64 include attach.php at the module level since 2d4b75428a wasn't backported to dev and we're about to branch an RC redmatrix 2016-07-17 16:04:00 -07:00
  • d6b28cdc57 Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported. Andrew Manning 2016-07-17 16:05:26 -04:00
  • 75fb065526 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-17 11:54:36 -04:00
  • 6c5086a933 Added functions to check cloud files path and return path with hashed names Andrew Manning 2016-07-17 11:52:21 -04:00
  • 2b674d4cd9 hide fullscreen button in embedphotos modal album view Mario Vavti 2016-07-17 12:54:10 +02:00
  • 5d0ddb3123 booboo redmatrix 2016-07-17 02:49:41 -07:00
  • 2d4b75428a Merge pull request #452 from anaqreon/patch-1 hubzilla 2016-07-17 19:40:26 +10:00
  • f39d20ac97 some work on guest access token ui Mario Vavti 2016-07-17 11:29:37 +02:00
  • db2b6f1268 Fixed whitescreen when creating folders via cloud files web interface Andrew Manning 2016-07-16 21:23:29 -04:00
  • 99354ac576 Merge remote-tracking branch 'upstream/dev' into website-import-remote Andrew Manning 2016-07-16 21:04:04 -04:00
  • e7b8531751 Stash changes to merge from dev Andrew Manning 2016-07-16 21:02:13 -04:00
  • ff2f599142 Postpone remote folder import until filesystem mirroring matures. Andrew Manning 2016-07-16 19:25:44 -04:00
  • f396b1bf73 check for variables after schema files have been added Mario Vavti 2016-07-16 16:18:36 +02:00
  • e237dfc660 check for variables in schemes Mario Vavti 2016-07-16 12:32:22 +02:00
  • 641029ab18 hide/show mixup Mario Vavti 2016-07-16 10:56:46 +02:00
  • 065ef29de2 only use visibility for tabs Mario Vavti 2016-07-16 10:52:06 +02:00
  • aac0fa2b5f os_delete_prohibit redmatrix 2016-07-16 01:02:41 -07:00
  • 17edec8e4a add new service class restriction to the doco redmatrix 2016-07-15 21:59:41 -07:00
  • 8e667866fd add service class restrictions to access_tokens redmatrix 2016-07-15 21:57:41 -07:00
  • 01fe7d6620 remove expired access tokens redmatrix 2016-07-15 17:34:44 -07:00
  • f3aff45042 provide examples for using access tokens in urls redmatrix 2016-07-15 16:31:21 -07:00
  • d6d94d9427 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-15 15:31:50 -07:00
  • acb78205c8 login isn't always your email. redmatrix 2016-07-15 15:30:52 -07:00
  • dcb3c2c299 mod_home: if using an atoken login on the home page redirect to the channel page of the channel that owns the atoken. redmatrix 2016-07-15 15:26:36 -07:00
  • 9048f8cffe bump minor version because of jquery update Mario Vavti 2016-07-15 14:53:15 +02:00
  • 4a2fb8336e round up height Mario Vavti 2016-07-15 14:23:10 +02:00
  • 34a16e0ab9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-07-15 13:21:07 +02:00
  • c2779b6f33 add jquery migrate for version 3 Mario Vavti 2016-07-15 13:20:55 +02:00
  • 2e32b5f467 upgrade to jquery-3.1 and minor fixes Mario Vavti 2016-07-15 13:20:00 +02:00
  • da5ec98f98 make lockview work with throwaway identities redmatrix 2016-07-15 02:07:27 -07:00
  • d54f5a3831 more cleanup of atoken UI redmatrix 2016-07-15 01:43:09 -07:00
  • 5e475acb85 cleanup and debug of atoken feature redmatrix 2016-07-15 01:33:28 -07:00
  • f666d8a083 enforce non-empty name and token/password on access tokens until better checks are instituted. redmatrix 2016-07-15 01:06:25 -07:00
  • 7ee7f00bf3 Here's the basic UI for the Zot Access Tokens, requires some minor cleanup redmatrix 2016-07-14 22:41:53 -07:00
  • 397a23499d make the xchan_hash for the access token location independent redmatrix 2016-07-14 21:28:17 -07:00
  • d660bde324 missing brace redmatrix 2016-07-14 20:53:38 -07:00
  • 94bd53c0f1 schema updates for zot access tokens redmatrix 2016-07-14 20:51:15 -07:00
  • f70f4a4e85 add zat to acl redmatrix 2016-07-14 20:26:22 -07:00
  • f3eb9af046 more ZAT work redmatrix 2016-07-14 19:43:47 -07:00
  • 0edf248cd1 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-14 22:25:30 -04:00
  • 514ffb74aa Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works. Andrew Manning 2016-07-14 22:24:23 -04:00
  • e6c8614801 first cut at zot access tokens redmatrix 2016-07-14 19:24:15 -07:00
  • 05a9f2f0f5 markdown is whitespace sensitive redmatrix 2016-07-14 17:46:21 -07:00
  • 115ef3249c who are we redmatrix 2016-07-14 17:45:09 -07:00
  • a2461d9816 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-14 20:49:26 +02:00
  • 191cd21028 more perms work redmatrix 2016-07-13 23:05:19 -07:00
  • b3a785711c deprecate/remove json_decode_plus redmatrix 2016-07-13 22:11:06 -07:00
  • 503b420292 rework perm_is_allowed redmatrix 2016-07-13 20:23:20 -07:00
  • 0aa205044b Merge branch 'dev' into perms redmatrix 2016-07-13 20:19:11 -07:00
  • 00afe56cad let abconfig specify a family redmatrix 2016-07-13 20:17:40 -07:00
  • 1fd65c934d lots more permission work redmatrix 2016-07-13 19:53:28 -07:00
  • 960e9edff5 Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though. Andrew Manning 2016-07-13 21:46:59 -04:00
  • b72720f6b6 Merge branch 'dev' into perms redmatrix 2016-07-13 18:24:45 -07:00
  • f60a0c5ce0 document mod_acl a bit better and try to remove some redundancies and consolidate the various options redmatrix 2016-07-13 17:51:19 -07:00
  • ba903e21ed Updated import_blocks for database calls Andrew Manning 2016-07-13 06:17:12 -04:00
  • 75b943b98a Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-13 05:50:31 -04:00
  • 18565600b2 missing namespace prefix \ redmatrix 2016-07-12 22:58:12 -07:00
  • f4e4e734de more work on perms redmatrix 2016-07-12 21:47:24 -07:00
  • 6424bac47c Merge branch 'dev' into perms redmatrix 2016-07-12 20:50:27 -07:00
  • bdd7d24ac1 update_remote_id - updated to work with iconfig redmatrix 2016-07-12 19:08:36 -07:00
  • 5131759823 Merge remote-tracking branch 'upstream/dev' into website-import Andrew Manning 2016-07-12 21:43:05 -04:00
  • 1e4ef81244 Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2 Andrew Manning 2016-07-12 21:41:37 -04:00
  • 0fa807e7ad don't try to send sync packets to dead sites. redmatrix 2016-07-12 18:38:39 -07:00
  • b6987b4287 the abconfig defaults weren't changed in the schema files when they were changed in the code redmatrix 2016-07-12 13:15:20 -07:00
  • ed0e2b52d7 move permissiondescription class to zotlabs/lib redmatrix 2016-07-11 21:46:16 -07:00
  • 168d35747d use the get_hostname function rather than parse the url redmatrix 2016-07-11 18:59:54 -07:00
  • a01baab4f0 Merge branch 'dev' into perms redmatrix 2016-07-11 17:45:10 -07:00
  • 17c3e12eab document the new change_channel hook redmatrix 2016-07-11 17:43:10 -07:00
  • 71b001fdb7 more perms work - notably the stuff in public_perms redmatrix 2016-07-11 17:02:49 -07:00
  • 833de9180e create change_channel hook redmatrix 2016-07-11 13:46:06 -07:00
  • fb36561a68 force non-null sess_data redmatrix 2016-07-11 13:27:44 -07:00
  • 67c60229ca use the profile_uid here. redmatrix 2016-07-11 13:20:12 -07:00
  • f4bcb82041 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-07-11 13:19:13 -07:00
  • 983ccef87c NOT NULL constraint without default and INSERT does not provide one Habeas Codice 2016-07-11 10:55:42 -07:00
  • a849dcadb6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-07-11 12:50:12 +02:00
  • d5afd0d7c2 do not use visibility for fullscreen button and move fullscreen button to the right Mario Vavti 2016-07-11 12:49:53 +02:00
  • ecc06aad24 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-07-11 10:33:51 +02:00
  • cc83983ae5 perms work redmatrix 2016-07-10 17:45:14 -07:00
  • ba5183b244 Merge pull request #451 from git-marijus/dev hubzilla 2016-07-11 09:06:11 +10:00
  • 3d3584b36c remove check for mcrypt Mario Vavti 2016-07-10 13:42:04 +02:00
  • c5e534c0cb Clearer import control interface Andrew Manning 2016-07-10 07:21:52 -04:00
  • a338a97d5b First draft of website import tools Andrew Manning 2016-07-10 06:58:20 -04:00
  • e11219888d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-07-10 11:34:10 +02:00