Commit Graph

  • 8962d0576b Merge pull request #326 from sierracircle/patch-1 redmatrix 2015-05-19 06:25:24 +10:00
  • 9b64301e0c remove dbg code Mario Vavti 2015-05-18 22:19:08 +02:00
  • 4e3583ab45 allow block title to contain $content title Mario Vavti 2015-05-18 22:18:01 +02:00
  • 51db753638 Merge branch 'tres' redmatrix 2015-05-18 13:14:34 -07:00
  • d50ff49f2a Create Primary-Directory Adam Robertson 2015-05-18 08:26:45 -07:00
  • 6ab7394565 Update Dutch (Projectname variable not translated yet, because of undefined variable) jeroenpraat 2015-05-18 16:25:22 +02:00
  • e271035879 provide a warning redmatrix 2015-05-17 23:06:00 -07:00
  • af27457da5 here's a fair chunk of the new schema - still a lot of bits missing and no migration tools, and only for mysql currently. Oh, and you still don't have the new code to make use of the new schema yet. That's on another branch that I'm not checking in yet because then you might get the idea that bits of it actually work and infect the rest of the matrix with unstable code and bring other sites down that have never even heard of hubzilla. Please do not use this code. Let me repeat, please do not use this code. One more time in case you didn't understand - please do not use this code. redmatrix 2015-05-17 22:43:36 -07:00
  • 048c745607 spelling redmatrix 2015-05-17 22:08:53 -07:00
  • 7c7a5cba8f Merge branch 'master' into tres redmatrix 2015-05-17 19:49:36 -07:00
  • 76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-17 19:48:57 -07:00
  • ac3b886cc4 missing $ redmatrix 2015-05-17 19:00:17 -07:00
  • f985c08d12 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-17 18:19:49 -07:00
  • 3b859aa9ef Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. redmatrix 2015-05-17 18:14:50 -07:00
  • 7233967ad5 Merge pull request #322 from dawnbreak/master redmatrix 2015-05-18 09:41:53 +10:00
  • 1cca24dfdc Merge pull request #323 from dawnbreak/docu redmatrix 2015-05-18 09:41:32 +10:00
  • dd72f580dd update readme redmatrix 2015-05-17 16:40:42 -07:00
  • a7071b17c0 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-17 16:35:17 -07:00
  • 9a67ec8bd4 new string file - isolating the projectname from translated strings so that translation files will work across multiple projects. redmatrix 2015-05-17 16:33:43 -07:00
  • 91d7b0f7eb more work isolating the projectname from core. redmatrix 2015-05-17 16:28:16 -07:00
  • f987f4a049 Merge pull request #324 from Razlo/master Klaus 2015-05-17 11:51:44 +02:00
  • fc1c188a7e updated the templates to the {{}}, compared to Razlo 2015-05-17 02:40:51 +02:00
  • 6757e86e85 Add some more documentation to attach_store() Klaus Weidenbach 2015-05-17 01:24:47 +02:00
  • e2980e871f Add functions to parse and get some values from php.ini. Klaus Weidenbach 2015-05-16 11:12:39 +02:00
  • 70fa00c014 allow a block to contain $content Mario Vavti 2015-05-15 22:20:45 +02:00
  • ed284fd4ea preserve htmlhead in case somebody needs it Mario Vavti 2015-05-15 20:33:38 +02:00
  • 51b6d70996 update to_do redmatrix 2015-05-14 22:42:48 -07:00
  • f0cb3cba12 Merge branch 'master' into tres redmatrix 2015-05-14 22:12:56 -07:00
  • 291f3beccf Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-14 22:12:37 -07:00
  • bceef58584 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-14 22:01:02 -07:00
  • 47564d4310 provide default permissions ('all') for existing and newly created OAuth app clients, which will be extended in the future to allow specific permissions. redmatrix 2015-05-14 21:57:20 -07:00
  • 9de88c49c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-14 20:10:45 -07:00
  • d5803cfd02 Merge pull request #320 from dawnbreak/master redmatrix 2015-05-15 13:10:28 +10:00
  • a6cb90c81c Merge branch 'master' into tres redmatrix 2015-05-14 18:02:29 -07:00
  • c62e75d789 Add sprintf.js v1.0.2. Klaus Weidenbach 2015-05-14 10:39:56 +02:00
  • 51b89f0ed8 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-13 19:23:13 -07:00
  • f866a42a42 not sure how these files ended up here, but they belong with doxygen stuff redmatrix 2015-05-13 18:10:15 -07:00
  • 364025e550 remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. redmatrix 2015-05-13 17:59:45 -07:00
  • 475dc7b686 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-13 17:07:12 -07:00
  • c82082d2bb restrict webpage list to undeleted items redmatrix 2015-05-13 16:27:04 -07:00
  • d6f98e6511 product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons. redmatrix 2015-05-13 16:01:00 -07:00
  • c3c202d650 issue #187 redmatrix 2015-05-12 22:57:55 -07:00
  • 4ca06ebd79 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-12 21:57:06 -07:00
  • 19a2bdeb91 cut/paste error redmatrix 2015-05-12 21:40:49 -07:00
  • a67ada15f3 repo updaters redmatrix 2015-05-12 21:35:30 -07:00
  • 018e702281 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-12 19:00:54 -07:00
  • 1e0e812440 provide a method for loading site/custom widgets redmatrix 2015-05-12 18:11:54 -07:00
  • 1970670596 replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. redmatrix 2015-05-12 17:06:47 -07:00
  • 5dcdb676fd version update redmatrix 2015-05-12 16:45:44 -07:00
  • 643d7db4a3 Dutch 100\% again jeroenpraat 2015-05-12 23:03:13 +02:00
  • f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs redmatrix 2015-05-11 22:57:12 -07:00
  • aeb69dcbbe let the site admin import a record directly from the probe diagnostic redmatrix 2015-05-11 19:36:07 -07:00
  • 61e205f593 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-11 17:50:38 -07:00
  • cddcf9d3ab missing translation redmatrix 2015-05-11 17:50:17 -07:00
  • 5386686a1e missing merge conflict redmatrix 2015-05-11 17:46:58 -07:00
  • aceb7ae8e9 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-11 17:15:07 -07:00
  • f4fc6b7782 Merge pull request #319 from solstag/ptbrupdate redmatrix 2015-05-12 10:13:42 +10:00
  • e9bdd46cc6 update pt-br transation Alexandre Hannud Abdo 2015-05-11 09:09:29 -03:00
  • 1dc5b6a03a Merge branch 'master' of https://github.com/redmatrix/hubzilla into merger redmatrix 2015-05-10 13:33:16 -07:00
  • 2c7a4c254d correcting upstream redmatrix 2015-05-10 13:30:30 -07:00
  • e0b5bce5a6 Merge pull request #1 from anaqreon/patch-1 redmatrix 2015-05-11 06:29:46 +10:00
  • 0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-10 13:26:44 -07:00
  • 2cb8b19972 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-10 13:18:04 -07:00
  • 3140650b8f rev update redmatrix 2015-05-10 13:17:41 -07:00
  • 70e5bf04e1 uid > channel id to make submenus visible for observers Mario Vavti 2015-05-10 21:52:48 +02:00
  • ca36fce9a7 provide drop down submenu suggestions in edit mode Mario Vavti 2015-05-10 21:17:37 +02:00
  • fff5dd5ecd Misspelling anaqreon 2015-05-10 14:57:46 -04:00
  • fad37eb6d0 copy/paste typo Mario Vavti 2015-05-10 15:08:18 +02:00
  • 616338c17e provide ability to create submenus Mario Vavti 2015-05-10 15:00:18 +02:00
  • 2114bfafca Merge pull request #318 from zzottel/master zzottel 2015-05-08 14:57:01 +02:00
  • 9ef31e0402 update to German strings zottel 2015-05-08 14:55:52 +02:00
  • 37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-07 16:44:28 -07:00
  • cd8ecb8649 provide wrap variable for comanche menus Mario Vavti 2015-05-07 23:02:14 +02:00
  • ef384be35f Update Dutch jeroenpraat 2015-05-07 14:32:24 +02:00
  • 4f235de3c5 provide a possibility to include js/css libs Mario Vavti 2015-05-07 13:26:14 +02:00
  • 8ca10dcbab adjust icon size Mario Vavti 2015-05-07 10:35:22 +02:00
  • 90591bcbc9 missed one... redmatrix 2015-05-06 22:56:08 -07:00
  • d01206af5a forgot to save redmatrix 2015-05-06 21:43:52 -07:00
  • e85593e970 Hopefully this will make item_cache the default redmatrix 2015-05-06 21:43:15 -07:00
  • c186e6ed96 change notification colour redmatrix 2015-05-06 21:25:59 -07:00
  • 25b599a4bd convert ITEM_WALL from bitfield to standalone redmatrix 2015-05-06 21:03:33 -07:00
  • 75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-06 18:39:12 -07:00
  • f17c1f9694 no need to obscure the diaspora signature if we're not obscuring the posts redmatrix 2015-05-06 18:38:30 -07:00
  • a1ed2bf2ac comanche doco Mario Vavti 2015-05-06 14:17:52 +02:00
  • 257c670d5c avoid double slash after editing layout Mario Vavti 2015-05-06 12:16:53 +02:00
  • 9391f6f905 allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with Mario Vavti 2015-05-06 10:53:26 +02:00
  • 245080a6d7 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-05 19:24:35 -07:00
  • f559c91b7a turn consensus items into diaspora polls for that network redmatrix 2015-05-05 19:23:21 -07:00
  • c9ec4f46b6 for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts redmatrix 2015-05-05 18:36:05 -07:00
  • ecbe01e3f7 i think this is 100 redmatrix 2015-05-05 13:42:05 -07:00
  • ae1d0e5e75 update 99 redmatrix 2015-05-05 04:40:41 -07:00
  • 5b5f0666f9 second pass name change redmatrix 2015-05-05 03:59:51 -07:00
  • a3c37f1458 first pass name change redmatrix 2015-05-05 03:56:10 -07:00
  • 57fcfc9398 iteration #97 redmatrix 2015-05-05 01:25:27 -07:00
  • b22ae35c1a this will settle down eventually. redmatrix 2015-05-05 01:10:45 -07:00
  • 62f35ced47 change name redmatrix 2015-05-05 00:51:08 -07:00
  • 63823be5fc Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-05 00:50:25 -07:00
  • fd79c59865 are we there yet? redmatrix 2015-05-04 21:49:48 -07:00
  • 25c861c819 readme, ad nauseum redmatrix 2015-05-04 21:38:53 -07:00
  • c57a1441f2 readme, yet again redmatrix 2015-05-04 21:23:47 -07:00