Commit Graph

  • 4fe64179c8 disable the inherited checkboxes for notself Mario Vavti 2015-07-14 19:29:49 +02:00
  • cc1764989f fix mod_connedit.js after cleanup Mario Vavti 2015-07-14 17:37:33 +02:00
  • f267bd55d6 revert this until further investigation Mario Vavti 2015-07-14 14:20:23 +02:00
  • dd57864867 revert provide inherited perms for connection default permissions Mario Vavti 2015-07-14 13:46:22 +02:00
  • d8edb66287 remove dbg Mario Vavti 2015-07-14 13:21:39 +02:00
  • 711dd1468d provide inherited perms for connection default permissions Mario Vavti 2015-07-14 13:16:08 +02:00
  • a28da40fa8 css fixes Mario Vavti 2015-07-14 12:52:50 +02:00
  • 7f71297383 cleanup connedit Mario Vavti 2015-07-14 12:46:40 +02:00
  • da5cec24e0 Merge branch 'master' of https://github.com/redmatrix/hubzilla redmatrix 2015-07-13 17:48:54 -07:00
  • 800eec5bee merge from redmatrix redmatrix 2015-07-13 17:48:11 -07:00
  • 6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-13 17:43:10 -07:00
  • 86633bda48 Merge pull request #373 from zzottel/master redmatrix 2015-07-14 09:01:02 +10:00
  • a07be48017 change account_default_channel if default channel is removed zottel 2015-07-13 17:30:04 +02:00
  • b7d3eb1605 Only let local logins install webpage elements redmatrix 2015-07-11 16:36:58 -07:00
  • 3ec2dc81f2 allow sys editing of menu redmatrix 2015-07-11 16:30:06 -07:00
  • 04c794da10 whitespace and comment out info again Mario Vavti 2015-07-12 01:12:20 +02:00
  • f81874ca49 fix sys channel menu in a morre standard way Mario Vavti 2015-07-12 01:04:57 +02:00
  • 6ca4240d96 menu_id is still needed Mario Vavti 2015-07-12 00:49:03 +02:00
  • dd32c3053c Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-07-12 00:40:29 +02:00
  • d8f03450e7 make menu creation for sys channel work Mario Vavti 2015-07-12 00:40:12 +02:00
  • e91d4906d1 Merge pull request #14 from git-marijus/master redmatrix 2015-07-12 08:04:12 +10:00
  • 69a4cf73a3 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-11 15:03:23 -07:00
  • 8f9895f26a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-11 15:02:08 -07:00
  • bc6efba68a revision update redmatrix 2015-07-11 15:01:41 -07:00
  • f41bab6f8a Merge remote-tracking branch 'redmatrix/master' Mario Vavti 2015-07-11 13:26:27 +02:00
  • 138e0fe445 fix issue with profile photo Mario Vavti 2015-07-11 13:25:06 +02:00
  • ec2df365de Merge remote-tracking branch 'redmatrix/master' Mario Vavti 2015-07-11 12:53:34 +02:00
  • d3581d8562 more revert Mario Vavti 2015-07-11 12:52:06 +02:00
  • d8e7f36c74 revert moving section and aside padding to style.css - it brings trouble to other layouts Mario Vavti 2015-07-11 12:42:11 +02:00
  • f7da424b8b Merge remote-tracking branch 'redmatrix/master' Mario Vavti 2015-07-11 12:07:47 +02:00
  • edb3d970ca Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-07-11 12:05:56 +02:00
  • d592d911c5 add css file for mod display Mario Vavti 2015-07-11 12:05:39 +02:00
  • 54bb2651f5 merge Mario Vavti 2015-07-11 11:58:53 +02:00
  • a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-10 14:27:41 -07:00
  • 4bf7e4a34d Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-10 14:20:38 -07:00
  • ae6541cf74 revision update redmatrix 2015-07-10 14:20:08 -07:00
  • 6e30ccdd22 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-07-10 21:48:42 +02:00
  • b6f28900e6 show status editor in /display on share action. Mario Vavti 2015-07-10 21:48:24 +02:00
  • 115097f139 update Dutch strings jeroenpraat 2015-07-10 21:46:19 +02:00
  • b1f926ba89 merge redmatrix fixes Mario Vavti 2015-07-10 20:46:46 +02:00
  • 071a233fb8 css fixes Mario Vavti 2015-07-10 13:44:23 +02:00
  • 39d68bf7c7 do not change selected/active class color on hover Mario Vavti 2015-07-10 13:34:36 +02:00
  • ebb07de788 re-enable selected/active class Mario Vavti 2015-07-10 13:25:50 +02:00
  • fee607db56 more webpages - generic-content-wrapper fixes Mario Vavti 2015-07-10 13:16:45 +02:00
  • 1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly Mario Vavti 2015-07-10 12:46:20 +02:00
  • 7eb614c8aa schema focus: refine content width to be more in balance with the recent aside width Mario Vavti 2015-07-10 11:15:05 +02:00
  • e1f64b6748 move section and aside padding from default.css to style.css Mario Vavti 2015-07-10 10:09:54 +02:00
  • c7b55f7753 revert do not show status editor in /display - we most probably want to read the thread or comment. Mario Vavti 2015-07-09 22:31:21 +02:00
  • 2b9a480c2f fix vcard title spacing Mario Vavti 2015-07-09 22:23:24 +02:00
  • 0bec45e570 do not show status editor in /display - we most probably want to read the thread or comment. Mario Vavti 2015-07-09 21:03:10 +02:00
  • 08996e5b9b fix aside width for collapsed state Mario Vavti 2015-07-09 20:54:13 +02:00
  • 115c18353e move profile image up and refine the aside width Mario Vavti 2015-07-09 14:44:24 +02:00
  • 59cddef032 remove padding Mario Vavti 2015-07-09 14:05:35 +02:00
  • efa55437d4 increase width of the aside area and make default profile image size 300x300 Mario Vavti 2015-07-09 13:59:16 +02:00
  • 43354ab385 inconsistent naming of block item types redmatrix 2015-07-08 18:05:38 -07:00
  • e12d58a75c fix typo to make directory safe mode default to on work again Mario Vavti 2015-07-08 21:28:36 +02:00
  • 07e890a79a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-07-08 14:38:00 +02:00
  • 6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-07 16:50:25 -07:00
  • 09e365c797 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-07 16:48:54 -07:00
  • 78f0138270 version update redmatrix 2015-07-07 16:48:36 -07:00
  • 7db1bd23f0 Merge branch 'master' of https://github.com/redmatrix/hubzilla redmatrix 2015-07-07 16:07:53 -07:00
  • dad4ac6c89 incorrect value for hubloc_deleted in zot_get_hublocs() query redmatrix 2015-07-07 16:06:34 -07:00
  • f6cf992aee fix sorting of channel suggestions Mario Vavti 2015-07-07 22:48:01 +02:00
  • f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar Mario Vavti 2015-07-07 22:29:27 +02:00
  • 75469a61bf Merge pull request #4 from git-marijus/master redmatrix 2015-07-08 06:19:48 +10:00
  • 9c577e0422 make public forums only setting sticky and simplify function to get directory settings Mario Vavti 2015-07-07 21:41:37 +02:00
  • 3f9e39a9e3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-07-07 19:24:36 +02:00
  • cc7eaa0d05 code style correction Mario Vavti 2015-07-07 14:52:06 +02:00
  • b50151d7bf make directory suggest work with directory options Mario Vavti 2015-07-07 14:46:47 +02:00
  • 18798b1d12 schema focus: adjust width to match photo width in /photos Mario Vavti 2015-07-07 12:23:19 +02:00
  • adfb4072e8 various css fixes Mario Vavti 2015-07-07 12:13:15 +02:00
  • 2d0d5876ba more word wrap fixes Mario Vavti 2015-07-07 10:23:39 +02:00
  • 807471d2a5 move if clause outside of the div Mario Vavti 2015-07-07 09:56:30 +02:00
  • 3456e7ca67 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-07-07 09:42:00 +02:00
  • ee01e67fa7 use default style for default webpage Mario Vavti 2015-07-07 09:41:27 +02:00
  • 862bfbdd2b incorrectly named doc file redmatrix 2015-07-06 20:29:21 -07:00
  • 7cfaae8d4f ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files. redmatrix 2015-07-06 20:21:41 -07:00
  • 1b3e046cd2 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-06 17:54:29 -07:00
  • f8898ba573 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-06 17:39:03 -07:00
  • 48972d1e8a version update redmatrix 2015-07-06 17:38:50 -07:00
  • 53f4b260cf abook_pending should probably be 1 in this place Mario Vavti 2015-07-06 22:48:12 +02:00
  • 05b231b087 fix word wrapping in tagblock and dirtagblock and possibly other places Mario Vavti 2015-07-06 10:36:57 +02:00
  • 8fad0187ec Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-05 21:38:21 -07:00
  • 49239c936a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-05 21:37:30 -07:00
  • f7c562fd21 version update redmatrix 2015-07-05 21:37:04 -07:00
  • 4abb114474 very crude but working doc search redmatrix 2015-07-05 21:09:04 -07:00
  • f20933e1e0 more work on db storage of doco redmatrix 2015-07-05 19:52:41 -07:00
  • b51bcba263 Added cron script to exexute poller every 5 minutes Haakon Meland Eriksen 2015-07-05 23:38:10 +02:00
  • 17d004d52b Merge remote-tracking branch 'openshift/master' Haakon Meland Eriksen 2015-07-05 22:43:43 +02:00
  • 2011784faf schema focus: adjust default width Mario Vavti 2015-07-05 22:37:52 +02:00
  • d94e61a7b6 Creating template Template builder 2015-07-05 16:27:08 -04:00
  • df8f6e45e2 mod/help: read doc files from the database if present and newer than the copy in the filesystem. redmatrix 2015-07-04 14:46:40 -07:00
  • a74631b554 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-03 15:03:56 -07:00
  • aa58f68bfd Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-03 14:59:04 -07:00
  • 37c78bcf05 start doco cleanup redmatrix 2015-07-03 14:56:48 -07:00
  • cbfb94c55c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-03 14:32:17 -07:00
  • 0b9332fde9 in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly. redmatrix 2015-07-03 14:30:42 -07:00
  • 2f12039941 Merge pull request #370 from tuscanhobbit/master redmatrix 2015-07-03 20:24:13 +10:00
  • 7d4615e319 Updated Italian localization Paolo Tacconi 2015-07-03 12:01:30 +02:00
  • b0a6e2ce26 Merge pull request #369 from zzottel/master zzottel 2015-07-03 11:03:08 +02:00