Commit Graph

  • f12b0fe316 Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2016-02-25 02:05:16 +01:00
  • 8944d7a7a2 another dutch update jeroenpraat 2016-02-25 02:03:58 +01:00
  • 6300f47cdc schema change to support channel move (a completely different operation than channel clone) redmatrix 2016-02-24 16:59:50 -08:00
  • 2b95580cc0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-24 16:41:46 -08:00
  • 93b84f1262 interim dutch string update jeroenpraat 2016-02-25 01:39:50 +01:00
  • 1ffae1327f Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2016-02-25 01:05:31 +01:00
  • 01a8292d65 fix TOS jeroenpraat 2016-02-25 01:04:37 +01:00
  • 9d3ce55978 fix boxy scheme Mario Vavti 2016-02-25 00:24:58 +01:00
  • 7e6febe2a6 add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled redmatrix 2016-02-24 15:19:28 -08:00
  • e73df9ed1d give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to much of the text in some situations Mario Vavti 2016-02-24 23:16:42 +01:00
  • b101a8f6fb missing function redmatrix 2016-02-24 11:20:46 -08:00
  • ddeab48f9b Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-24 17:44:27 +01:00
  • d074c53889 function to process atom stream without actually storing anything redmatrix 2016-02-23 16:34:53 -08:00
  • 039eb58524 Merge pull request #297 from bashrc/bashrc/comma git-marijus 2016-02-23 22:53:14 +01:00
  • 29c9e7c0a2 Remove stray comma Bob Mottram 2016-02-23 19:50:45 +00:00
  • f15a06c0c2 Merge pull request #296 from wave72/master Wave 2016-02-23 11:55:23 +01:00
  • ab89eb050a Updated Italian strings Paolo Tacconi 2016-02-23 11:52:45 +01:00
  • eca1f84328 change wording in case where registration is by apprval only Mario Vavti 2016-02-23 11:23:43 +01:00
  • 3bde7b8f18 add salmon key param redmatrix 2016-02-22 16:20:19 -08:00
  • 9db1148650 pubsites: network column is not needed anymore (mentioned in intro text). Because of more vertical space Access and Register columnis separate again. jeroenpraat 2016-02-22 19:28:32 +01:00
  • 502fed198d only hubs from local configured project on pubsites (hubzilla by default). as agreed with Mike. jeroenpraat 2016-02-22 19:10:01 +01:00
  • 411c510778 change wording Mario Vavti 2016-02-22 13:42:05 +01:00
  • dd6e3d873d some work on mod/register Mario Vavti 2016-02-22 13:04:48 +01:00
  • f9b092c619 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-21 18:15:40 -08:00
  • edc7c0837b remove bookmark identifier from embedded links since they aren't bookmarkable without an associated taxonomy entry. redmatrix 2016-02-21 18:14:28 -08:00
  • f535d438b2 I don't think we need redmatrix hubs (or hubs without no project name) in this list. The other way around (hubzilla in redmatrix pubsites) is no problem I think. If not agreed, please revert. jeroenpraat 2016-02-22 03:03:32 +01:00
  • 119ffd2d2d Merge pull request #290 from anaqreon/homeinstall redmatrix 2016-02-22 12:43:41 +11:00
  • 2c3bec3d7c Merge pull request #291 from phellmes/de201602201300 redmatrix 2016-02-22 12:43:15 +11:00
  • f1564b4cff retry the move of AccessList to composer format (one or more third-party plugins will likely break as a result) redmatrix 2016-02-21 16:49:49 -08:00
  • c9252d49f7 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-21 14:54:59 -08:00
  • 411abdf8a7 fix double encoding redmatrix 2016-02-21 14:54:34 -08:00
  • 1fcc863298 There was nothing wrong with my pimped pubsites (was another problem). Took the opportunity to update schemas. Plus updated spanish and dutch strings. jeroenpraat 2016-02-21 23:00:12 +01:00
  • e37c1ed981 Revert pubsites.php. There seems something wrong. Let me troubleshoot that first. jeroenpraat 2016-02-21 20:00:09 +01:00
  • 0c5a2925ad Pimped the pubsites page. I tried to get this into a .tpl-file, but it was to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page. jeroenpraat 2016-02-21 19:31:11 +01:00
  • 272ffe6983 Renamed homeinstall config file and added check for required config parameters. Spelling corrections. Andrew Manning 2016-02-20 14:04:11 -05:00
  • 368bb18935 Merge branch 'master' of https://github.com/redmatrix/hubzilla into homeinstall Andrew Manning 2016-02-20 13:53:00 -05:00
  • 22f172d697 grid->network, whitespace and bootstrapify create button Mario Vavti 2016-02-20 14:01:20 +01:00
  • fe9abcfaae Update DE strings phellmes 2016-02-20 13:47:25 +01:00
  • dfbe2eaf98 Revert "move accesslist class to namespace" redmatrix 2016-02-20 00:49:37 -08:00
  • a9711895cf move accesslist class to namespace redmatrix 2016-02-20 19:39:54 +11:00
  • 8882ffc0de ensure auto_channel_create() is executed for all workflows when UNO is set. redmatrix 2016-02-19 19:21:57 -08:00
  • fdd7faab51 string update redmatrix 2016-02-19 19:12:26 -08:00
  • d004017b01 issue #288 allow relative_date() to be translated into languages with more than two plural forms, such as pl. redmatrix 2016-02-19 19:07:07 -08:00
  • f2d27d543d Added sendmail installation to .homeinstall script so that hub can send email notifications Andrew Manning 2016-02-19 20:43:28 -05:00
  • 1db3409f36 add router class redmatrix 2016-02-19 16:19:15 -08:00
  • cfa2ac2d0a move dreport to zotlabs\zot namespace redmatrix 2016-02-19 14:02:55 -08:00
  • ebc66d7008 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-19 13:36:48 -08:00
  • 3f0eb84ecf get_feature_default() was using filtered view, preventing it from working in all cases redmatrix 2016-02-19 13:34:29 -08:00
  • fbc6c60805 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-02-19 22:28:57 +01:00
  • 02e82e496e pimp up mod new_channel Mario Vavti 2016-02-19 22:28:21 +01:00
  • 8e586008dd issue #287 require old password to change password redmatrix 2016-02-19 13:18:51 -08:00
  • 50c7c33ed1 no linefeed at end redmatrix 2016-02-19 12:02:23 -08:00
  • ca52d39abe finish up the storage move redmatrix 2016-02-19 11:58:17 -08:00
  • 28d07fd6b2 move storage assets to zotlabs/storage redmatrix 2016-02-19 00:06:10 -08:00
  • 5a7b994e59 siteinfo regression with Zotlabs\Project - add an autoloader redmatrix 2016-02-18 19:32:06 -08:00
  • 4512a4cdd4 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-18 15:26:50 -08:00
  • 342fda94e4 Provide Zotlabs\Project and System class for querying details about the project/version info. Move these out of /boot.php redmatrix 2016-02-18 15:24:58 -08:00
  • cc264b2d60 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-18 20:33:25 +01:00
  • 33c34984e6 h1>h2 (thanks to Mario) and help text below label on register page (like on new channel). jeroenpraat 2016-02-18 19:48:11 +01:00
  • fe392a3144 Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings. jeroenpraat 2016-02-18 16:53:04 +01:00
  • eeed7077ca Merge pull request #286 from wave72/master Wave 2016-02-18 15:06:19 +01:00
  • dba1854837 updated Italian strings Paolo Tacconi 2016-02-18 15:01:53 +01:00
  • c107bcfbd9 some necessary doco for set_iconfig() redmatrix 2016-02-18 00:51:36 -08:00
  • 912ebfebff Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-18 00:23:31 -08:00
  • 76bf892f9f iconfig - add sharing variable redmatrix 2016-02-18 00:20:08 -08:00
  • 12a9b49c6d Merge pull request #285 from anaqreon/master redmatrix 2016-02-18 13:53:13 +11:00
  • aecf9e32ef Added the installation of curl to the .homeinstall script Andrew Manning 2016-02-17 21:15:43 -05:00
  • 879bc71927 this qualifies as an interface change redmatrix 2016-02-17 17:29:06 -08:00
  • 4da7fcb41d schema updates for iconfig redmatrix 2016-02-17 16:24:26 -08:00
  • 3a84e7051e Merge branch 'iconfig' redmatrix 2016-02-17 16:21:22 -08:00
  • 161050df07 format atom event renderings so they are reasonably compatible with GNU-social redmatrix 2016-02-17 15:56:30 -08:00
  • 29284319a5 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-17 14:36:16 -08:00
  • 86e73fd313 add ca help files (per Paco) redmatrix 2016-02-17 14:35:45 -08:00
  • 62e141a89c provide del_iconfig for completeness redmatrix 2016-02-17 14:14:42 -08:00
  • cd8b7687c1 More clarification about privacy of private content. Changed Channel Name to simply Name when registering/creating an account or channel. First time when people see this they get confused (by experience on my hubs). This will even be more with UNO. jeroenpraat 2016-02-17 20:47:52 +01:00
  • 4436cd9ade Change description Mario Vavti 2016-02-17 12:37:02 +01:00
  • ddbe3c7426 make always preload images before rendering the page a display setting Mario Vavti 2016-02-17 12:32:12 +01:00
  • b8c7b2f81d more refinement on collapsing Mario Vavti 2016-02-17 11:07:47 +01:00
  • 696c6e88ea iconfig debugging - federation now working redmatrix 2016-02-17 01:05:28 -08:00
  • a83eb14ff6 iconfig debugging redmatrix 2016-02-17 00:42:51 -08:00
  • 8e6dc0b66b revup redmatrix 2016-02-17 00:14:49 -08:00
  • 41ec5403e1 slight changes to set_iconfig - if passed an item structure only update the structure. Update the DB only if passed an item_id. This makes a clean separation of behaviour that's easy to document. One could get into some weird situations the original way which tried to update and sync both. redmatrix 2016-02-16 22:53:27 -08:00
  • 77eb6c5761 more work on iconfig redmatrix 2016-02-16 20:49:32 -08:00
  • 89c6cda303 allow admin to set and lock features when UNO is enabled redmatrix 2016-02-16 18:58:29 -08:00
  • d49afead67 allow redirection to site workflow page even if auto channel create is applied redmatrix 2016-02-16 18:36:29 -08:00
  • 0a10215371 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-16 18:15:40 -08:00
  • 64f5d80ff2 some iconfig basics redmatrix 2016-02-16 18:15:19 -08:00
  • 28a593e1ce revup redmatrix 2016-02-16 15:19:52 -08:00
  • f738902107 @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) jeroenpraat 2016-02-16 21:46:24 +01:00
  • 364972a292 Thats probably better but there are still edge cases... Mario Vavti 2016-02-16 21:29:09 +01:00
  • 0eb0256502 typo Mario Vavti 2016-02-16 21:02:28 +01:00
  • 679fb7d0d2 content -> viewport Mario Vavti 2016-02-16 20:58:10 +01:00
  • 45247d1595 only prefetch images on update_mode update Mario Vavti 2016-02-16 20:53:38 +01:00
  • 3be6ef6bfc since we preload images now we also can collapse and calculate posts above the viewport Mario Vavti 2016-02-16 14:42:13 +01:00
  • c5827c8b4f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-15 20:33:10 -08:00
  • bb381daae3 update fr strings from transifex redmatrix 2016-02-15 20:32:42 -08:00
  • d0090f09fb Merge pull request #283 from phellmes/connedit redmatrix 2016-02-16 10:33:39 +11:00
  • afb86aa908 clean up some unused stuff and start loading content a bit earlier Mario Vavti 2016-02-15 22:20:55 +01:00
  • 3b97a9f766 Add string translation to auto approval option phellmes 2016-02-15 21:23:04 +01:00
  • d3c779f635 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-14 16:17:15 -08:00