clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,538 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

9538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fabrixxm c1d683b5b7 Merge pull request #1467 from annando/issue-1306 
Events from the past aren't shown anymore (hopefully)
 2015-04-02 22:17:12 +02:00
fabrixxm f93e9751b8 Update codename and CHANGELOG 2015-04-02 22:05:52 +02:00
Tobias Diekershoff 415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
Tobias Diekershoff 33952e5f1d DE update to the strings 2015-04-02 18:23:27 +02:00
Michael Vogel 97244fa487 Now past events aren't shown at any circumstance. 2015-04-01 23:11:18 +02:00
Michael Vogel 25299f0604 Events from the past aren't shown anymore (hopefully) 2015-04-01 22:25:53 +02:00
Silke Meyer c05f95b54e Improved help text, issue 1349. 2015-04-01 10:10:00 +02:00
Michael Vogel 1ccbf39799 Merge pull request #1461 from fabrixxm/issue-1459 
Block settings page for unauthorized users
 2015-04-01 07:52:20 +02:00
fabrixxm 0226258e7b Block settings page for unauthorized users 
fixes issue #1459
 2015-03-31 10:24:23 +02:00
fabrixxm 6b47e1b7e3 Merge pull request #1456 from tobiasd/20150330lng 
updating the core translation
 2015-03-31 10:16:59 +02:00
Tobias Diekershoff 94cad338af Merge pull request #1458 from annando/issue-1038 
Issue 1038:  Send update to directory when account is removed
 2015-03-31 07:35:12 +02:00
FlxAlbroscheit f054dbfc8d Feature for desktop-notifications 2015-03-31 02:11:46 +02:00
FlxAlbroscheit d2261397d9 Feature for desktop-notifications 2015-03-31 02:10:36 +02:00
FlxAlbroscheit 001e940c6c Feature for desktop-notifications 
see issue #1163
 2015-03-31 02:06:07 +02:00
Michael Vogel c3f3a239f4 Issue 1038: Send update to directory when account is removed. 2015-03-30 22:22:11 +02:00
Tobias Diekershoff 0309c481a3 updating the core translation 2015-03-30 09:21:01 +02:00
Tobias Diekershoff 58ac6bde09 Merge pull request #1455 from pztrn/master 
Do not attempt to create itemcache directory if it already exist.
 2015-03-29 16:05:57 +02:00
Stanislav N. bcf7ade40d Typo 2015-03-29 17:01:51 +05:00
Stanislav N. 6e27510173 Do not try to create itemcache directory if it already exist. 
On FreeBSD, with more-or-less default PHP configuration, when mkdir() is called on already existing directory - it will produce a warning, that could flood all over cron mail. To prevent that flooding a directory existing should be checked.
 2015-03-29 16:56:26 +05:00
Tobias Diekershoff 1a62a6ca92 Merge pull request #1453 from annando/ddos-with-gprobe 
Prevention for DDoS attach through gprobe
 2015-03-28 09:12:24 +01:00
Michael Vogel 51cd55c8ad Some more logging added for the DDoS prevention 2015-03-28 08:49:24 +01:00
Michael Vogel 0206f447e1 Preventing a DDoS with the zrl parameter. 2015-03-28 08:29:01 +01:00
Tobias Diekershoff 47accd71f7 Merge pull request #1450 from StefOfficiel/patch-2 
Update jquery.js
 2015-03-27 07:21:15 +01:00
StefOfficiel f56a025aff Update jquery.js 
Update jQuery 1.11.1 to 1.11.2 in good branch
 2015-03-26 23:55:32 +01:00
Michael Vogel dbb164ca4a Merge pull request #1449 from fabrixxm/issue-1370 
Create `database.sql` from `include\dbstructure.php`
 2015-03-25 22:02:50 +01:00
fabrixxm c42d6b133e Merge pull request #1448 from annando/issue1432 
Removed the special detection for facebook and app.net
 2015-03-25 11:13:50 +01:00
fabrixxm 7c33c9cca1 fix SQL generation, update database.sql 2015-03-25 10:03:17 +01:00
fabrixxm b2b1de5a01 Create database.sql from include\dbstructure.php 
add two commands to `dbstructure.php` when called from cli:
'update' updates the database schema
'dumpsql' dump database sql to stdout
 2015-03-25 09:47:59 +01:00
Michael Vogel 25dbf26345 Removed the special detection for facebook and app.net since both provide RSS feeds. 2015-03-24 23:08:46 +01:00
Michael Vogel f1c6d6f1ba Merge pull request #1442 from fabrixxm/issue-1362 
Add scheme if missing to url inserted by user in 'insert link' jot button
 2015-03-24 12:34:31 +01:00
Michael Vogel 3d297c065e Merge pull request #1444 from fabrixxm/issue-1341 
fix paginate url
 2015-03-23 15:19:35 +01:00
fabrixxm 8b5d9c32a7 Merge pull request #1446 from annando/issue-905 
Diaspora: The signature of likes are checked now correctly
 2015-03-23 12:06:46 +01:00
Michael Vogel 63f0177a64 Merge pull request #1443 from fabrixxm/issue-1437 
Use correct class name to send post to email recipients. Fix #1437
 2015-03-23 06:21:25 +01:00
Michael Vogel 045c78e4a0 Merge pull request #1445 from fabrixxm/issue-1041 
ignore tags inside code block
 2015-03-22 22:22:49 +01:00
Michael Vogel b40f19262a Diaspora: The signature of likes are checked now correctly. 
enter the commit message for your changes. Lines starting
 2015-03-22 21:53:13 +01:00
fabrixxm a98d2ee387 ignore tags inside code block 
should fix issue #1041
 2015-03-22 17:12:51 +01:00
fabrixxm add3411542 fix paginate url 
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
 2015-03-22 16:38:05 +01:00
Beanow e016db8bc6 Version bump, 3.4.0 2015-03-22 15:25:31 +01:00
Beanow b5b597221f Merge branch 'develop' of github.com:friendica/friendica into develop 2015-03-22 15:13:30 +01:00
fabrixxm 250b466ed3 Fix blank reponse if no siteinfo are fetched 2015-03-22 11:03:46 +01:00
fabrixxm 1cc9e7db0f Add scheme if missing to url inserted by user in 'insert link' jot 
button
 2015-03-22 10:59:00 +01:00
fabrixxm 86c442f15b Merge branch 'develop' of github.com:friendica/friendica into develop 2015-03-22 10:21:57 +01:00
Beanow b141a60d5f Merge branch 'release-3.4' into develop 2015-03-22 10:19:35 +01:00
fabrixxm 05d1aaf0ed Use correct class name to send post to email recipients. Fix #1437 2015-03-22 10:12:16 +01:00
hauke b2a86ceeaa bugfix #1307 2015-03-22 10:02:00 +01:00
fabrixxm 1b2a90a10f Merge pull request #1433 from tugelbend/develop 
bugfix #1307
 2015-03-22 09:55:45 +01:00
fabrixxm c18ace5517 Merge pull request #1436 from annando/1503-global-copy-comments 
The global copy now copies comments as well
 2015-03-22 09:49:49 +01:00
Michael Vogel 81b199cfdc The global copy now copies comments as well. This is important for the search. 2015-03-21 20:23:47 +01:00
fabrixxm 9bdd41b774 Merge pull request #1435 from FlxAlbroscheit/develop 
Access a contact directly from the contact-manager-page [UPDATED]
 2015-03-20 15:13:17 +01:00
FlxAlbroscheit 1e15cba631 Access a contact directly from the contact-manager-page 
Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)
 2015-03-20 15:10:55 +01:00