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

9556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop 
Issue 1163: Feature allowing desktop-notifications
 2015-04-05 11:37:05 +02:00
fabrixxm a91a352089 Merge branch 'release/3.4' into develop 2015-04-05 11:07:22 +02:00
fabrixxm bf28cc0f75 Merge branch 'release/3.4' 2015-04-05 11:05:30 +02:00
Michael Vogel 9fda2d4d3b Merge pull request #1476 from fabrixxm/changelog 
update CHANGELOG
 2015-04-05 10:38:49 +02:00
fabrixxm b00fe54b05 update CHANGELOG 2015-04-05 10:30:57 +02:00
fabrixxm ab5540e1f0 Merge pull request #1474 from fabrixxm/silke-helptext 
Connection approval help text, issue #1349, based on pull request #1463
 2015-04-05 10:23:19 +02:00
fabrixxm 2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
fabrixxm bb7406643b Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext 2015-04-04 17:42:23 +02:00
Michael Vogel 4771fc16a9 Merge pull request #1473 from tobiasd/20150403doc 
small updates to the developer intro doc
 2015-04-03 22:10:33 +02:00
Tobias Diekershoff e8df044080 small changes to the developer intro doc 2015-04-03 19:47:14 +02:00
fabrixxm 1523aecebd Merge pull request #1472 from annando/issue-1063 
The unseen marker is now set according to the api output
 2015-04-03 15:07:56 +02:00
Michael Vogel e9a2cf7a91 The unseen marker is now set according to the query that is used for the home timeline. 2015-04-03 14:58:42 +02:00
fabrixxm d0b925f95f Merge pull request #1471 from annando/markdown-shared-posts 
Diaspora/Libertree: problems with repeated posts
 2015-04-03 13:56:27 +02:00
Michael Vogel 796b13673d Reshared posts weren't always recognized as such. 2015-04-03 13:06:19 +02:00
Michael Vogel 7c0c56d20b The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote. 2015-04-03 12:37:29 +02:00
Michael Vogel 1cacf64724 Merge pull request #1469 from fabrixxm/changelog 
Update codename and CHANGELOG
 2015-04-02 23:14:40 +02:00
fabrixxm 84ed4ef82f Update CHANGELOG 2015-04-02 22:18:59 +02:00
fabrixxm 341622b484 Merge pull request #1468 from tobiasd/20150402lng 
DE update to the strings
 2015-04-02 22:17:35 +02:00
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