Commit Graph

  • fee8503093 Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected Andrew Manning 2015-11-20 21:57:10 -05:00
  • fabf7081d3 Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data. ken restivo 2015-11-20 18:56:41 -08:00
  • 6083cd2559 If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs. Andrew Manning 2015-11-20 21:55:13 -05:00
  • d11e80e1b3 Bump version, migrator needs to depend on it for f164ddf ken restivo 2015-11-20 15:17:33 -08:00
  • 6942c715d0 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-21 00:08:17 +01:00
  • 427652e9bd Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-20 14:41:16 -08:00
  • 106b4fdd2d add v4 project roadmap, partial fix for cloning of profile photos on alternate profiles redmatrix 2015-11-20 14:38:32 -08:00
  • f164ddf155 Report correct HTTP error code, i.e. for API callers. ken restivo 2015-11-20 13:03:16 -08:00
  • d9ddf7561f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-20 12:51:24 -08:00
  • 37368bda65 change _newwin to _blank because the window named _newwin may be hard to find if you have lots of windows/tabs open. redmatrix 2015-11-20 12:49:38 -08:00
  • de1b3d5113 Space between Preview and Submit in jot.tpl Haakon Meland Eriksen 2015-11-20 21:15:12 +01:00
  • 830b01bd2a Space between Preview and Submit in jot.tpl Haakon Meland Eriksen 2015-11-20 21:12:09 +01:00
  • 90187eae37 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-20 19:51:57 +01:00
  • 7399f7a087 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-11-20 16:40:13 +01:00
  • a3e47d26f6 make calendar language aware Mario Vavti 2015-11-20 16:39:55 +01:00
  • d3bef2adc3 update es+nl jeroenpraat 2015-11-20 15:18:51 +01:00
  • 7b459ec355 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-20 00:20:26 -08:00
  • 301072a86c issue #85, community tags and file tags lost during edits. This required splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits. redmatrix 2015-11-20 00:15:48 -08:00
  • 3b7b3ef2bb Rearranging buttons Haakon Meland Eriksen 2015-11-20 07:38:59 +01:00
  • b6e4611a91 Rearranging buttons Haakon Meland Eriksen 2015-11-20 07:35:43 +01:00
  • 2929bb672a Rearranging buttons Haakon Meland Eriksen 2015-11-20 07:29:45 +01:00
  • a4765bf954 Rearranging buttons Haakon Meland Eriksen 2015-11-20 07:03:36 +01:00
  • 0c2045beff Rearranging buttons Haakon Meland Eriksen 2015-11-20 06:52:35 +01:00
  • 22f6687f44 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-20 06:27:46 +01:00
  • e56633d5b0 Throw HTTP error and display error message when database is unavailable. #179 ken restivo 2015-11-19 20:58:13 -08:00
  • a44795e6c3 change action label from 'stop following' to 'unfollow thread' redmatrix 2015-11-19 17:27:07 -08:00
  • 5805a54097 directory search for pubforums using hubzilla directory servers using redmatrix flag value redmatrix 2015-11-19 16:44:12 -08:00
  • 350519d429 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-19 16:15:16 -08:00
  • 8f94c721bf new feature: 'suppress_duplicates' issue #146 triggered with less than two minutes between posts having identical content. redmatrix 2015-11-19 16:05:47 -08:00
  • c7652fc29c Had to switch these 2. Sorry. jeroenpraat 2015-11-20 00:50:54 +01:00
  • e537d53389 Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2015-11-20 00:40:32 +01:00
  • a890ee6864 Some bits jeroenpraat 2015-11-20 00:39:47 +01:00
  • 4f81d64517 issue #160 add blablanet to directory fallback list redmatrix 2015-11-19 15:06:35 -08:00
  • b5875c3af9 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-19 11:47:41 -08:00
  • ed87dbc141 issue #173 redmatrix 2015-11-19 11:46:29 -08:00
  • 059886a1e4 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-19 18:44:33 +01:00
  • ba52af786e move today button from aside to section title Mario Vavti 2015-11-19 11:38:34 +01:00
  • 929f524e77 css fixes Mario Vavti 2015-11-19 11:17:24 +01:00
  • cd49ec92e3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-19 06:36:06 +01:00
  • ee39e3cf72 Bump version so migrator tool can verify that mods to account.php etc in 312cc41 and 1f2a408 were applied. ken restivo 2015-11-18 19:12:22 -08:00
  • a17f280f7d rename some menus Mario Vavti 2015-11-19 00:10:32 +01:00
  • 7b4cfffc03 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-19 00:00:35 +01:00
  • db9c2992e3 remove more unneeded files Mario Vavti 2015-11-18 23:58:47 +01:00
  • b23284cba2 move moment.min.js and remove unneeded files Mario Vavti 2015-11-18 23:56:25 +01:00
  • 0c163c4d03 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-11-18 23:51:00 +01:00
  • e4145deeb7 some events refacturing Mario Vavti 2015-11-18 23:50:42 +01:00
  • 33258803ea Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-18 16:48:56 +01:00
  • 179730e485 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-18 02:45:39 -08:00
  • 106b3257e4 wsod viewing photo widget redmatrix 2015-11-18 02:45:22 -08:00
  • 312cc415ce Pass in account_id. Required for bulk identity importer. ken restivo 2015-11-18 00:26:18 -08:00
  • 1f2a408be0 Use provided account_id instead of user's logged in account_id. Necessary for bulk importer. ken restivo 2015-11-18 00:03:59 -08:00
  • 0d232c612b Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-18 06:48:29 +01:00
  • 68da4d90dc fix admin plugin hooks redmatrix 2015-11-17 20:44:57 -08:00
  • 545dc5cf65 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-18 01:52:11 +01:00
  • a089064588 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-17 15:04:04 -08:00
  • a06f7fbe2e photo album widget permissions issue redmatrix 2015-11-17 15:03:27 -08:00
  • 7c4d9519c8 whitespace Mario Vavti 2015-11-17 23:08:35 +01:00
  • 6fa0807550 more css fixes Mario Vavti 2015-11-17 23:01:24 +01:00
  • c545ada746 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-17 16:49:11 +01:00
  • 868a0d8a90 missing closing " for src attribute Mario Vavti 2015-11-17 13:45:00 +01:00
  • 5079dff338 update bootstrap lib 3.3.4 -> 3.3.5 Mario Vavti 2015-11-17 11:39:47 +01:00
  • 9e3d130ad9 css fixes Mario Vavti 2015-11-17 11:32:37 +01:00
  • b531486dab show jotnets toggle button only if there are jotnets and whitespace fixes Mario Vavti 2015-11-17 10:46:38 +01:00
  • 6df98f080b fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML redmatrix 2015-11-16 19:17:39 -08:00
  • 69487389d3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-16 06:42:08 +01:00
  • 0cb5f009b4 tag_deliver of an edit to an already uplinked item wasn't resetting permissions and ownership bits before starting delivery chain on the edit. redmatrix 2015-11-15 20:52:50 -08:00
  • c7b2ec8bba allow plugins to also log to a different named logfile and also alter the log message redmatrix 2015-11-15 19:40:01 -08:00
  • 12b0a9f35f add logger plugin hook redmatrix 2015-11-15 19:37:26 -08:00
  • fff30b1c3d permission issues editing wall-to-wall posts redmatrix 2015-11-15 19:36:17 -08:00
  • 6ad35e3d84 issue with dead hub detection redmatrix 2015-11-15 18:12:53 -08:00
  • 3d80073a0e revert html in markdown for posts, but trim the input before processing the markdown redmatrix 2015-11-15 18:03:37 -08:00
  • 959c3ba89d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-15 17:29:07 -08:00
  • 1029939f56 issues connecting to local forum redmatrix 2015-11-15 17:28:45 -08:00
  • fd5d1416d9 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-15 00:27:23 +01:00
  • def5edf93c nl+es and some other bits jeroenpraat 2015-11-14 20:43:34 +01:00
  • 6bdde985ce Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-14 08:32:37 +01:00
  • dba38821bc superblock enhancements redmatrix 2015-11-13 15:28:34 -08:00
  • 9d6a4c1d05 Reorder buttons HME Haakon Meland Eriksen 2015-11-13 19:44:42 +01:00
  • 94bef08f15 Adding original jot.tpl from GitHub Haakon Meland Eriksen 2015-11-13 18:32:25 +01:00
  • 0178840c19 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-13 16:45:31 +01:00
  • d04c73ae00 Reorder buttons Haakon Meland Eriksen 2015-11-13 16:31:48 +01:00
  • 495f21c08c Reverted changes - got white screen Haakon Meland Eriksen 2015-11-13 07:36:32 +01:00
  • d238cbea19 Regrouped post buttons Haakon Meland Eriksen 2015-11-13 07:03:30 +01:00
  • 5d0646c9e1 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-12 20:23:17 -08:00
  • 93e5449c08 really basic photo album widget for content regions redmatrix 2015-11-12 20:22:36 -08:00
  • 4872a30e2b Add note about base64 and urlencode. ken restivo 2015-11-12 18:02:20 -08:00
  • f5fcdf1de4 Fix spelling of documentation. ken restivo 2015-11-12 17:53:26 -08:00
  • 888bf76e4b allow pdl content redmatrix 2015-11-12 17:47:38 -08:00
  • 22a650ade8 issue #154 redmatrix 2015-11-12 16:57:02 -08:00
  • 391807b46c small fixes, removed old unused database row, and log more prominently a missing directory server URL redmatrix 2015-11-12 16:45:38 -08:00
  • 921a2e0dc4 Regrouped post buttons Haakon Meland Eriksen 2015-11-13 00:07:09 +01:00
  • 5afe8e5aa1 Small update to Bluegrid and generic-content-wrapper-styled to dreport jeroenpraat 2015-11-12 22:10:20 +01:00
  • ba84d6ff7c Regrouped post buttons Haakon Meland Eriksen 2015-11-12 21:11:47 +01:00
  • d786502f19 Regrouped post buttons Haakon Meland Eriksen 2015-11-12 20:44:41 +01:00
  • 63063450b3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-12 07:46:29 +01:00
  • 90463ee67d Make upload and encrypt easier on phones by editing jot.tpl Haakon Meland Eriksen 2015-11-12 07:45:37 +01:00
  • 6e04dd96a1 will also need api doco redmatrix 2015-11-11 20:51:15 -08:00
  • f7c837aad0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-11 15:13:01 -08:00
  • bd3d323849 run markdown through html purifier for those who insist on mixing html with markdown. redmatrix 2015-11-11 15:09:22 -08:00
  • e26b558e53 Promoted upload of images and encryption Haakon Meland Eriksen 2015-11-11 23:55:05 +01:00