Commit Graph

  • 3fb690a0f6 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-18 15:50:18 -07:00
  • 76d41fc250 re-organise the protocol disabled logic redmatrix 2015-10-18 15:49:52 -07:00
  • 15fa300e04 Updated help page about Hubzilla on OpenShift with new info on using mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift - fixed link Haakon Meland Eriksen 2015-10-18 20:45:26 +02:00
  • 47c86828c6 Updated help page about Hubzilla on OpenShift with new info on using mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift Haakon Meland Eriksen 2015-10-18 20:39:24 +02:00
  • 6eaf35a142 Update es+nl jeroenpraat 2015-10-18 19:09:38 +02:00
  • ea8364eba5 Added config settings sensible for Hubzilla on OpenShift - fixes Haakon Meland Eriksen 2015-10-18 18:51:29 +02:00
  • fc4b1693f9 Added config settings sensible for Hubzilla on OpenShift Haakon Meland Eriksen 2015-10-18 18:40:55 +02:00
  • 52f3d6722d Update nl+es jeroenpraat 2015-10-18 16:45:11 +02:00
  • 126628546b tweak justify gallery options to not load to large previews Mario Vavti 2015-10-18 14:21:42 +02:00
  • 2540ecc0ac Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-17 16:53:14 -07:00
  • b49972a623 start pointing people to hubzilla instead of redmatrix redmatrix 2015-10-17 16:51:07 -07:00
  • b82a9a6594 messages.po got truncated due to a failed cron job redmatrix 2015-10-17 16:47:18 -07:00
  • be701677d6 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-17 16:38:57 -07:00
  • 1e8fc8b062 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-17 16:34:00 -07:00
  • b6c765c9dc allow homepage content to be a full redirect redmatrix 2015-10-17 16:33:28 -07:00
  • 1d2797dc1f bring back chat expiration setting and adjust chat size for our now smaller content region redmatrix 2015-10-17 14:54:27 -07:00
  • 4b984f9819 filter delivery reports redmatrix 2015-10-17 13:26:55 -07:00
  • e8882a5167 remove one more Friendica table reference from the API redmatrix 2015-10-16 15:24:48 -07:00
  • 4f0490f26f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-16 13:06:47 -07:00
  • 7fe6bc52d0 change setup defaults to 127.0.0.1 instead of localhost for DB server, add documentation to the INSTALL.txt explaining the choice. redmatrix 2015-10-16 13:05:40 -07:00
  • b7408fa39e we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size Mario Vavti 2015-10-16 16:27:51 +02:00
  • 7ca5b5c928 Update Dutch strings jeroenpraat 2015-10-16 15:31:11 +02:00
  • 6f5f613d9f Merge pull request #90 from anaqreon/theme-doc redmatrix 2015-10-16 22:26:38 +11:00
  • 52f2509280 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-16 04:22:09 -07:00
  • c07f694a07 another try at issue #89 - rotating photos redmatrix 2015-10-16 04:21:40 -07:00
  • c49198fd71 this is all the info we need Mario Vavti 2015-10-16 12:24:27 +02:00
  • 864bad0ebb Updated text Andrew Manning 2015-10-16 06:23:15 -04:00
  • 051858300e Updated formatting and typos Andrew Manning 2015-10-16 06:21:02 -04:00
  • 75d16e4852 New documentation for theme repo management Andrew Manning 2015-10-16 06:18:47 -04:00
  • a756c0b182 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-15 21:40:59 -07:00
  • 550cab41fb missing xchan_mail_query redmatrix 2015-10-15 21:39:33 -07:00
  • 45bd81fe8c missed the xchan_mail_query redmatrix 2015-10-15 21:38:16 -07:00
  • 3f7ee613fc mail sync debugging redmatrix 2015-10-15 20:40:24 -07:00
  • 93f061f78a mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop. redmatrix 2015-10-15 18:52:04 -07:00
  • 7517c76ae4 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-15 16:02:37 -07:00
  • e26f771cbe dummy update redmatrix 2015-10-15 16:00:31 -07:00
  • bf5a1f662a generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes. redmatrix 2015-10-15 14:18:40 -07:00
  • d9753989bf issue #89 - rotating photos does not work redmatrix 2015-10-15 13:23:40 -07:00
  • 391b98f72c fix webpages Mario Vavti 2015-10-15 20:57:05 +02:00
  • d40a087ec2 really fix label name Mario Vavti 2015-10-15 16:07:13 +02:00
  • 138c14d43f wrong logic Mario Vavti 2015-10-15 15:48:13 +02:00
  • dc6a594277 fix label name Mario Vavti 2015-10-15 15:41:08 +02:00
  • 9f5c61b1fd reflect default image size changes in mod/photos Mario Vavti 2015-10-15 14:52:31 +02:00
  • 3bca640521 do not try to remove photos twice Mario Vavti 2015-10-15 13:57:15 +02:00
  • 73082a338b (re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now Mario Vavti 2015-10-15 12:56:22 +02:00
  • 1593ebec1f update conv_list.tpl Mario Vavti 2015-10-15 11:49:33 +02:00
  • 2413968021 double up default photo sizes - even the mos simple camera can now do images > 1024px Mario Vavti 2015-10-15 11:20:56 +02:00
  • 44b542814a if photo deleted from /cloud or /dav also delete from /photos Mario Vavti 2015-10-15 10:29:39 +02:00
  • 2848f5dab4 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-10-15 09:36:51 +02:00
  • f0f5a8f2b5 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-14 18:03:20 -07:00
  • 0563ce93a1 change name of matrix app redmatrix 2015-10-14 18:03:05 -07:00
  • 6a927be76c Merge pull request #88 from anaqreon/grid-app redmatrix 2015-10-15 12:02:50 +11:00
  • c8e3ea955d more mail sync work redmatrix 2015-10-14 17:49:35 -07:00
  • b33a9a71f6 more work on import & sync of private mail and conversations redmatrix 2015-10-14 17:40:50 -07:00
  • dc80431438 Replaced RedMatrix icon and label in app list Andrew Manning 2015-10-14 19:43:40 -04:00
  • 8af3dc140e issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud redmatrix 2015-10-14 15:08:07 -07:00
  • 3c7d2d4cea updating the local item only does not make much sense in this case Mario Vavti 2015-10-14 23:23:06 +02:00
  • de697a4267 issue #86 - like/dislike in photos not working redmatrix 2015-10-14 14:16:16 -07:00
  • ca35db76b8 wrong variable Mario Vavti 2015-10-14 23:07:49 +02:00
  • b6eded1119 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-10-14 22:57:03 +02:00
  • c8d8ae89d7 remove $item from $prep_arr - we probably do not need it Mario Vavti 2015-10-14 22:46:40 +02:00
  • b2d949ce9a issue #82 - args not defined (should be arr) redmatrix 2015-10-14 13:25:58 -07:00
  • f12ebffa39 really check for large photos feature Mario Vavti 2015-10-14 22:24:13 +02:00
  • 9b4d32b68c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-14 13:19:52 -07:00
  • f4e708a02f port of mail encoding redmatrix 2015-10-14 13:19:28 -07:00
  • b4e83b6537 allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. Mario Vavti 2015-10-14 22:14:19 +02:00
  • c7637a0c53 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-14 13:13:12 -07:00
  • 9b1195c896 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-14 13:12:00 -07:00
  • 732c6134dd support for mail sync redmatrix 2015-10-14 13:11:24 -07:00
  • e98c871781 Regenerated messages.po. jeroenpraat 2015-10-14 14:31:51 +02:00
  • d616099de6 Merge pull request #80 from git-marijus/master redmatrix 2015-10-14 18:19:32 +11:00
  • e3070eb170 Merge pull request #81 from tuscanhobbit/master Wave 2015-10-14 09:12:58 +02:00
  • 319b02a757 Italian strings updated Paolo Tacconi 2015-10-14 09:11:05 +02:00
  • 64cdbb8e3b Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-13 16:19:33 -07:00
  • edeba4ca34 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-13 16:19:25 -07:00
  • 7e03f612b3 file migration - continued redmatrix 2015-10-13 16:16:51 -07:00
  • 578f1b8ece api extenesions for file migration redmatrix 2015-10-13 16:15:34 -07:00
  • e2a15d0ec9 fix photo visibility switch on photo upload Mario Vavti 2015-10-13 14:05:27 +02:00
  • 3c74aec973 fix /channel not updating after posting comment Mario Vavti 2015-10-13 12:05:55 +02:00
  • 61e3ef2552 do not collapse content which is just slightly higher than we allow Mario Vavti 2015-10-13 10:45:22 +02:00
  • 136e5fdf95 port of file detail api call redmatrix 2015-10-12 23:39:55 -07:00
  • 75fe9f9cc4 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-12 23:37:35 -07:00
  • 73dad85867 file detail api call (will not work for huge files) redmatrix 2015-10-12 23:36:26 -07:00
  • 91895c52ca missing underscore redmatrix 2015-10-12 19:54:01 -07:00
  • fc28af8518 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-12 19:52:21 -07:00
  • 3545626950 attach_list_files had some problems - wasn't used until now apparently redmatrix 2015-10-12 19:49:06 -07:00
  • 6a7079a594 small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. redmatrix 2015-10-12 18:55:02 -07:00
  • 42db2bc93d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-12 16:16:14 -07:00
  • a2f5b55d10 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-12 16:12:51 -07:00
  • 8e7e9b7040 version roll redmatrix 2015-10-12 16:11:55 -07:00
  • 43eefb5929 update es + nl strings jeroenpraat 2015-10-13 00:43:23 +02:00
  • dcdcba9f1f Merge pull request #79 from HaakonME/master redmatrix 2015-10-12 17:29:34 +11:00
  • dec37b3dbe another collapseHeight() fix Mario Vavti 2015-10-11 22:58:59 +02:00
  • 9431112f77 fix an issue with collapseHeight() and css margins/paddings in directory Mario Vavti 2015-10-11 22:49:36 +02:00
  • 7bdd5c9e0d Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-10-11 22:32:27 +02:00
  • c963aa98e8 some conv-item restructuring to allow full width elements Mario Vavti 2015-10-11 22:32:06 +02:00
  • 0f6e1c1c05 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-11 12:41:39 -07:00
  • ce8d49a47d Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-11 12:41:28 -07:00
  • 70dc305f12 version roll redmatrix 2015-10-11 12:40:23 -07:00
  • df45374041 Updated Hubzilla on OpenShift HOWTO with use of logging Haakon Meland Eriksen 2015-10-11 14:32:01 +02:00