Commit Graph

  • 10ea759282 Don't update the conversation only because the source changed Michael 2017-04-29 08:30:43 +00:00
  • fa14096ea8 Added documentation Michael 2017-04-29 08:11:54 +00:00
  • 0e4cd900d5 Improved dba:update function. Michael 2017-04-29 07:50:09 +00:00
  • 46371242e5 Merge pull request #3407 from Hypolite/issue/#3406 rabuzarus 2017-04-29 09:08:33 +02:00
  • edbbdf9761 Store conversation data for self created posts as well Michael 2017-04-29 05:44:13 +00:00
  • 2c9c867393 frio: Fix typo in various button callbacks Hypolite Petovan 2017-04-28 21:50:09 -04:00
  • c0b5339691 There is now a function to store conversations Michael 2017-04-28 16:35:53 +00:00
  • 2172a162f9 Merge pull request #3405 from annando/1704-remove-discard Tobias Diekershoff 2017-04-28 12:42:10 +02:00
  • ba5780c4a1 Remove the "discard" button for contact requests from Diaspora. Michael 2017-04-28 08:36:10 +00:00
  • 62b6bbeef0 Merge pull request #3403 from tobiasd/20170428-typo Michael Vogel 2017-04-28 10:10:46 +02:00
  • 50da541860 Merge pull request #3402 from annando/1704-conversation Tobias Diekershoff 2017-04-28 10:00:12 +02:00
  • 06f5ce89b0 a typo Tobias Diekershoff 2017-04-28 09:48:07 +02:00
  • 9900d28c4b We should return a return value when we say that we have a return value. Michael 2017-04-28 06:21:12 +00:00
  • 7240b2198b Missed protocol ... Michael 2017-04-28 06:03:04 +00:00
  • 782783aa52 New function "dba::update" and changed unique index for the conversations Michael 2017-04-28 05:50:27 +00:00
  • 3b5e1bbfc3 dba:p and dba:e can now be called with a parameter array as well. Michael 2017-04-28 04:47:28 +00:00
  • 615197e044 We should escape the table name as well. Michael 2017-04-28 04:05:50 +00:00
  • 4493f37af3 Merge pull request #3390 from annando/1704-cleaned_install Hypolite Petovan 2017-04-27 21:17:13 -04:00
  • 15355850f7 Set the database version Michael 2017-04-27 20:47:52 +00:00
  • 35dc56c9c2 Salmons with Mastodon seem to work now Michael 2017-04-27 20:38:46 +00:00
  • 57366e391f frio: admin aside template fabrixxm 2017-04-27 21:25:53 +02:00
  • 7bed3e909a frio: hilight selectet item in generic_links_widget.tpl fabrixxm 2017-04-27 19:34:01 +02:00
  • 1da4b9d942 frio: add comment note about sticky aside hack fabrixxm 2017-04-27 19:21:14 +02:00
  • 671170f0e0 Merge pull request #3398 from tobiasd/20170427-blockdocde Michael Vogel 2017-04-27 11:06:31 +02:00
  • 069f8bf5a9 a cookie for the Rechtschreib-Nerd Tobias Diekershoff 2017-04-27 11:00:30 +02:00
  • 09aa02796e Merge pull request #3400 from tobiasd/20170427-credits Michael Vogel 2017-04-27 10:47:08 +02:00
  • b5f95db9f7 Merge pull request #3399 from tobiasd/20170427-messages Michael Vogel 2017-04-27 10:46:54 +02:00
  • 44e1cbabee Merge pull request #3397 from tobiasd/20170427-robots fabrixxm 2017-04-27 09:27:55 +02:00
  • 0ffe426ff1 Frio: Enable stiky aside only on desktop-size windows. fabrixxm 2017-04-27 08:39:35 +02:00
  • 8e88a84881 regen credits Tobias Diekershoff 2017-04-27 07:42:21 +02:00
  • c76dcc6bab regenerated master messages.po file Tobias Diekershoff 2017-04-27 07:35:43 +02:00
  • 7adb968653 removed commented out line Tobias Diekershoff 2017-04-27 07:31:57 +02:00
  • 67aae6fca9 DE Server Blocklist docs Tobias Diekershoff 2017-04-27 07:29:49 +02:00
  • ae580e5829 Merge pull request #3393 from Shnoulle/develop_feature3334 Tobias Diekershoff 2017-04-27 07:23:01 +02:00
  • 4aac140749 Merge pull request #3392 from Hypolite/issue/#3387 Tobias Diekershoff 2017-04-27 07:22:45 +02:00
  • 5d3021fd5a Add documentation about the new admin page Hypolite Petovan 2017-04-26 22:22:01 -04:00
  • 9c53108a3e Use Config::get instead of get_config Hypolite Petovan 2017-04-26 22:08:47 -04:00
  • 45d73b106b Conversation data is now stored in another table Michael 2017-04-26 21:16:25 +00:00
  • 20d4fbffef Coding standards : doxygen + tab + single quote Denis Chenu 2017-04-26 17:26:13 +02:00
  • e354a75dc8 Doxygen standard Denis Chenu 2017-04-26 17:09:10 +02:00
  • 6ef8d18297 Coding standards part and bad empty Disallow - Unsure PHP_EOL is the best here : PHP_EOL are not the same on *nux and win, it's not for server , but for browser - _content vs _init : seems not really a web content ? Denis Chenu 2017-04-26 17:07:24 +02:00
  • 4942c97785 Simple robots.txt for server 404 log Denis Chenu 2017-04-26 15:39:35 +02:00
  • 0afc732059 frio mobile aside: add overlay transition fabrixxm 2017-04-26 10:16:39 +02:00
  • bd4ce2daee mobile aside: max-width and transparent overlay fabrixxm 2017-04-26 08:58:45 +02:00
  • ea9d44c20a Fix sticky aside when height change fabrixxm 2017-04-26 08:56:47 +02:00
  • 188d3a6f5e Renamed check_domain_blocklist to blocked_url Hypolite Petovan 2017-04-26 00:23:01 -04:00
  • 8d469c155a Add check_blocklist to z_fetch_url and post_url Hypolite Petovan 2017-04-25 22:59:11 -04:00
  • c7e1a8e871 Added check_domain_blocklist Hypolite Petovan 2017-04-25 22:45:56 -04:00
  • 7d9d22914f Refactor "URL" to "domain" for blocklist Hypolite Petovan 2017-04-25 22:45:42 -04:00
  • 0b8f80c747 Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel Hypolite Petovan 2017-04-25 21:23:20 -04:00
  • 2e4db2e64e Merge remote-tracking branch 'upstream/develop' into 1704-conversation Michael 2017-04-25 20:23:38 +00:00
  • 53fbd7e7c3 Merge pull request #3389 from annando/1704-db-query Hypolite Petovan 2017-04-25 13:02:43 -04:00
  • f146c85e75 standards Tobias Diekershoff 2017-04-25 18:57:50 +02:00
  • bc2c0b0864 Added PDO in documentation. Michael 2017-04-25 16:10:38 +00:00
  • d11e3afc6c Added class description Michael 2017-04-25 16:05:26 +00:00
  • efcb166c2d Added check for MySQL driver for PDO. Michael 2017-04-25 06:10:14 +00:00
  • 49ba2f9d6d Added a PDO check in the install routine and cleaned it up Michael 2017-04-25 05:55:20 +00:00
  • 4c131362b3 Better debugging Michael 2017-04-25 05:20:34 +00:00
  • 67bae59c66 Small corrections Michael 2017-04-25 05:11:04 +00:00
  • 82ea7ead66 Merge pull request #3374 from rabuzarus/20170407_-_group_edit Hypolite Petovan 2017-04-24 19:50:46 -04:00
  • 8de510e635 We weren't able to test mysqlnd, so better remove the code Michael 2017-04-24 21:51:47 +00:00
  • eeb72bd879 docstrings for the admin panel functions Tobias Diekershoff 2017-04-24 23:47:05 +02:00
  • f969f44603 added subpage for blocklist management to the admin panel Tobias Diekershoff 2017-04-24 23:45:05 +02:00
  • 1a436281c5 added template for the blocklist editor in the admin panel Tobias Diekershoff 2017-04-24 23:44:27 +02:00
  • 7f837a9205 add the contents from the blocklist to the /friendica page Tobias Diekershoff 2017-04-24 23:43:39 +02:00
  • eb63ce5df5 Free results Michael 2017-04-24 21:36:04 +00:00
  • ec0d2a1a03 Little spelling problem Michael 2017-04-24 21:23:00 +00:00
  • b5f10e5ddb Replace spaces by tabs Michael 2017-04-24 21:20:24 +00:00
  • ed437e978a Code cleanup Michael 2017-04-24 21:18:30 +00:00
  • 82f13441bc Removed old functions Michael 2017-04-24 21:02:51 +00:00
  • 9959da5a1c New function to calculate rows Michael 2017-04-24 20:32:35 +00:00
  • d67338a895 New function to check for the existance of data Michael 2017-04-24 19:23:49 +00:00
  • 0c8a2fd345 Örgs Michael 2017-04-24 06:28:57 +00:00
  • d636bcb9d3 Restored privates variables Michael 2017-04-24 06:27:59 +00:00
  • 311c029bcf Rearranged lines Michael 2017-04-24 06:26:49 +00:00
  • 34bb34b9a4 Lost lines are back Michael 2017-04-24 06:24:03 +00:00
  • 28a28f00a4 New function skeleton for execution of queries Michael 2017-04-24 06:13:42 +00:00
  • bc2dd690fd Merge pull request #3386 from rabuzarus/20170422_-_Stream_content_update_2 Hypolite Petovan 2017-04-23 21:43:27 -04:00
  • 63b0b05445 We now can work with prepared statements Michael 2017-04-23 23:15:38 +00:00
  • 05dcedb54c Merge remote-tracking branch 'upstream/develop' into 1704-conversation Michael 2017-04-23 14:25:35 +00:00
  • 88602de604 fall back to unseen items if no timestamp is available rabuzarus 2017-04-23 16:22:53 +02:00
  • 20a53e14ca add a visual indicator (fade) on group membership change rabuzarus 2017-04-23 15:26:26 +02:00
  • e7914ecc95 add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template rabuzarus 2017-04-23 14:58:23 +02:00
  • 772825690f Merge pull request #3384 from strk/openid-register Hypolite Petovan 2017-04-23 08:55:51 -04:00
  • 46291b2e2b fix smarty PHP warnings rabuzarus 2017-04-23 14:51:41 +02:00
  • cd521b2dcc Urlencode query parameters Sandro Santilli 2017-04-23 13:48:46 +02:00
  • ebc926a716 Add missing query string introducing character Sandro Santilli 2017-04-23 13:48:05 +02:00
  • 4cccb450cb Merge pull request #3382 from annando/1704-myisam Hypolite Petovan 2017-04-22 20:55:06 -04:00
  • 2628ff91f4 Call it "toinnodb" Michael 2017-04-22 21:55:16 +00:00
  • 1dc4b60a5a added spaces + some curly braces + some usage of dbm::is_result() Roland Haeder 2017-04-04 19:48:03 +02:00
  • 2ef3251293 added spaces + some curly braces + some usage of dbm::is_result() Roland Haeder 2017-04-04 19:47:45 +02:00
  • aaa558f7ea New command in dbstructure.php to convert all tables from MyISAM to InnoDB Michael 2017-04-22 21:36:01 +00:00
  • c0784f7301 New tables for conversations Michael 2017-04-22 20:46:40 +00:00
  • 5a7b9676ff fixed typo rabuzarus 2017-04-22 22:10:43 +02:00
  • 53c1bf6ba3 improve profile update for non logged in ussers and remote users rabuzarus 2017-04-22 22:08:05 +02:00
  • e569e20caf Frio: sitck aside on page scroll fabrixxm 2017-04-22 20:36:48 +02:00
  • 5b731a60ae Frio: Fix aside in mobile view fabrixxm 2017-04-22 20:34:52 +02:00
  • 0f67934e05 Merge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2 Hypolite Petovan 2017-04-22 09:11:18 -04:00
  • affb3938d2 Merge pull request #3376 from annando/1704-key-length Hypolite Petovan 2017-04-21 20:41:45 -04:00
  • cc3bc3f785 Merge pull request #3377 from Alkarex/dfrn-date-format Michael Vogel 2017-04-22 00:07:47 +02:00