Commit Graph

15331 Commits

Author SHA1 Message Date
Michael 615197e044 We should escape the table name as well. 2017-04-28 04:05:50 +00:00
Hypolite Petovan 4493f37af3 Merge pull request #3390 from annando/1704-cleaned_install
Added a PDO check in the install routine and cleaned it up
2017-04-27 21:17:13 -04:00
Michael 15355850f7 Set the database version 2017-04-27 20:47:52 +00:00
Michael 35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
fabrixxm 57366e391f frio: admin aside template 2017-04-27 21:25:53 +02:00
fabrixxm 7bed3e909a frio: hilight selectet item in generic_links_widget.tpl
Add a custom generic_links_widget.tpl.
The class ".selected" is add to `li` instead of `a`,
hilighting current item, e.g. in user settings aside.
2017-04-27 19:34:01 +02:00
Michael Vogel 671170f0e0 Merge pull request #3398 from tobiasd/20170427-blockdocde
DE Server Blocklist docs
2017-04-27 11:06:31 +02:00
Tobias Diekershoff 069f8bf5a9 a cookie for the Rechtschreib-Nerd 2017-04-27 11:00:30 +02:00
Michael Vogel 09aa02796e Merge pull request #3400 from tobiasd/20170427-credits
regen credits
2017-04-27 10:47:08 +02:00
Michael Vogel b5f95db9f7 Merge pull request #3399 from tobiasd/20170427-messages
regenerated master messages.po file
2017-04-27 10:46:54 +02:00
fabrixxm 44e1cbabee Merge pull request #3397 from tobiasd/20170427-robots
removed commented out line
2017-04-27 09:27:55 +02:00
Tobias Diekershoff 8e88a84881 regen credits 2017-04-27 07:42:21 +02:00
Tobias Diekershoff c76dcc6bab regenerated master messages.po file 2017-04-27 07:35:43 +02:00
Tobias Diekershoff 7adb968653 removed commented out line 2017-04-27 07:31:57 +02:00
Tobias Diekershoff 67aae6fca9 DE Server Blocklist docs 2017-04-27 07:29:49 +02:00
Tobias Diekershoff ae580e5829 Merge pull request #3393 from Shnoulle/develop_feature3334
Simple robots.txt for server 404 log
2017-04-27 07:23:01 +02:00
Tobias Diekershoff 4aac140749 Merge pull request #3392 from Hypolite/issue/#3387
Enforce the domain blocklist
2017-04-27 07:22:45 +02:00
Hypolite Petovan 5d3021fd5a Add documentation about the new admin page 2017-04-26 22:22:01 -04:00
Hypolite Petovan 9c53108a3e Use Config::get instead of get_config 2017-04-26 22:08:47 -04:00
Michael 45d73b106b Conversation data is now stored in another table 2017-04-26 21:16:25 +00:00
Denis Chenu 20d4fbffef Coding standards : doxygen + tab + single quote 2017-04-26 17:26:13 +02:00
Denis Chenu e354a75dc8 Doxygen standard 2017-04-26 17:09:10 +02:00
Denis Chenu 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 ?
2017-04-26 17:07:24 +02:00
Denis Chenu 4942c97785 Simple robots.txt for server 404 log 2017-04-26 15:39:35 +02:00
Hypolite Petovan 188d3a6f5e Renamed check_domain_blocklist to blocked_url
- Remove debug
2017-04-26 00:23:01 -04:00
Hypolite Petovan 8d469c155a Add check_blocklist to z_fetch_url and post_url
- Standard compliance
2017-04-25 22:59:11 -04:00
Hypolite Petovan c7e1a8e871 Added check_domain_blocklist 2017-04-25 22:45:56 -04:00
Hypolite Petovan 7d9d22914f Refactor "URL" to "domain" for blocklist
- Add slash trimming to domain
- Reformatted mod/friendica
2017-04-25 22:45:42 -04:00
Hypolite Petovan 0b8f80c747 Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel
blocklist front end for the admin panel
2017-04-25 21:23:20 -04:00
Michael 2e4db2e64e Merge remote-tracking branch 'upstream/develop' into 1704-conversation 2017-04-25 20:23:38 +00:00
Hypolite Petovan 53fbd7e7c3 Merge pull request #3389 from annando/1704-db-query
New database functions
2017-04-25 13:02:43 -04:00
Tobias Diekershoff f146c85e75 standards 2017-04-25 18:57:50 +02:00
Michael bc2c0b0864 Added PDO in documentation. 2017-04-25 16:10:38 +00:00
Michael d11e3afc6c Added class description 2017-04-25 16:05:26 +00:00
Michael efcb166c2d Added check for MySQL driver for PDO. 2017-04-25 06:10:14 +00:00
Michael 49ba2f9d6d Added a PDO check in the install routine and cleaned it up 2017-04-25 05:55:20 +00:00
Michael 4c131362b3 Better debugging 2017-04-25 05:20:34 +00:00
Michael 67bae59c66 Small corrections 2017-04-25 05:11:04 +00:00
Hypolite Petovan 82ea7ead66 Merge pull request #3374 from rabuzarus/20170407_-_group_edit
Frio: provide own group template + some restructuring in group.php
2017-04-24 19:50:46 -04:00
Michael 8de510e635 We weren't able to test mysqlnd, so better remove the code 2017-04-24 21:51:47 +00:00
Tobias Diekershoff eeb72bd879 docstrings for the admin panel functions 2017-04-24 23:47:05 +02:00
Tobias Diekershoff f969f44603 added subpage for blocklist management to the admin panel 2017-04-24 23:45:05 +02:00
Tobias Diekershoff 1a436281c5 added template for the blocklist editor in the admin panel 2017-04-24 23:44:27 +02:00
Tobias Diekershoff 7f837a9205 add the contents from the blocklist to the /friendica page 2017-04-24 23:43:39 +02:00
Michael eb63ce5df5 Free results 2017-04-24 21:36:04 +00:00
Michael ec0d2a1a03 Little spelling problem 2017-04-24 21:23:00 +00:00
Michael b5f10e5ddb Replace spaces by tabs 2017-04-24 21:20:24 +00:00
Michael ed437e978a Code cleanup 2017-04-24 21:18:30 +00:00
Michael 82f13441bc Removed old functions 2017-04-24 21:02:51 +00:00
Michael 9959da5a1c New function to calculate rows 2017-04-24 20:32:35 +00:00