Commit Graph

1621 Commits

Author SHA1 Message Date
Johannes Schwab 9a1c783d74 make smileybutton respect the theme 2015-02-07 16:22:20 +01:00
Tobias Diekershoff 05010028cb Merge pull request #240 from silke/master
Made the help text more precise
2015-02-06 14:39:46 +01:00
Silke Meyer 6ed3e88f9d Made the help text more precise 2015-02-06 13:50:08 +01:00
fabrixxm 299c1ccd25 Merge pull request #239 from annando/master
app.net: Avoid warnings if site is not reachable
2015-02-05 19:55:00 +01:00
Michael Vogel adff04dca2 app.net: Avaoid warnings if site is not reachable. 2015-02-05 19:51:57 +01:00
fabrixxm 605d96a1c1 Merge pull request #238 from aymhce/master
automated creation of Friendica basic account
2015-02-05 11:24:48 +01:00
Développeur égaré 31456b2f43 update readme 2015-02-04 16:55:07 +01:00
Développeur égaré 4020bf861e automated creation of Friendica basic account 2015-02-04 00:35:24 +01:00
Tobias Diekershoff 8c96978e2c Merge pull request #236 from annando/1502-bugfix-statistics
Bugfix: The item counter doubled the value if the global community was active
2015-02-01 10:45:56 +01:00
Tobias Diekershoff e455b6e682 Merge pull request #237 from annando/1502-proxy-impressum
If there were pictures in the impressum then they would be proxied as well
2015-02-01 10:45:19 +01:00
Michael Vogel ff98d0218a Bugfix: The item counter doubled the value if the global community was active 2015-02-01 10:31:24 +01:00
Michael Vogel 1b3f533b40 If there were pictures in the impressum then they would be proxied as well. 2015-02-01 10:30:27 +01:00
Tobias Diekershoff 8101aa1380 Merge pull request #235 from annando/1501-fbpost-empty-post
fbpost: Additional check for empty posts.
2015-01-21 06:39:46 +01:00
Tobias Diekershoff 8bd0cf1d56 Merge pull request #234 from fabrixxm/securemail
securemail: null html body
2015-01-21 06:39:20 +01:00
Michael Vogel e5be515657 Merge remote-tracking branch 'upstream/master' into 1501-fbpost-empty-post 2015-01-21 01:29:12 +01:00
Michael Vogel d330d66d8b fbpost: Additional check for empty posts. 2015-01-21 01:26:20 +01:00
fabrixxm e5ced279be securemail: null html body
send encrpyted mail only as text
2015-01-20 19:27:00 +01:00
Eric Côté db91eb4ae6 merge bufferapp
Signed-off-by: Eric Côté <ericcotelnu@gmail.com>
2015-01-20 00:05:38 +00:00
fabrixxm 15b0328f53 Merge pull request #233 from Keith2/master
bufferapp.php Now begins with <?php instead of <?
2015-01-19 20:54:13 +01:00
Keith Fernie b3fef08d41 modified: bufferapp.php Now begins with <?php instead of <?, stops a php5.6 problem. 2015-01-19 19:46:37 +00:00
Tobias Diekershoff 1ef533e555 Merge pull request #232 from gerhard6380/master
windowsphonepush Version 2.0
2015-01-18 01:16:15 +01:00
gerhard6380 7ba157a68d windowsphonepush Version 2.0
add functionality to highlight new entries in Windows Phone app, bugfix
on sql for counter (likes/dislikes now excluded)
2015-01-17 21:58:18 +01:00
Tobias Diekershoff b93b298bbc Merge pull request #231 from annando/master
Support for the new database fields in contact and unique_contacts
2015-01-09 10:56:30 +01:00
Michael Vogel a8a37ee6fc app.net, acebook, pumpio, statusnet, twitter: Support for the new database fields in contact and unique_contacts. 2015-01-09 07:07:07 +01:00
Tobias Diekershoff 49e8ae3eec Merge pull request #230 from fabrixxm/securemail
New experimental plugin 'secure mail'
2014-12-29 20:05:51 +01:00
fabrixxm e17cb70379 New experimental plugin 'secure mail' 2014-12-29 18:10:32 +01:00
tobiasd 9aefbf3def copy and paste mishap m) 2014-12-24 12:25:03 +01:00
tobiasd 909674458d use new URL in description as well 2014-12-24 12:24:27 +01:00
tobiasd a4006b5600 Merge pull request #228 from annando/1412-facebook-improvements
Facebook: Better check for empty posts, performance improvement when syncing
2014-12-23 06:57:23 +01:00
tobiasd 917f7869f5 Merge pull request #229 from annando/1412-new-statistics-page
The hostname of the statistics page has changed.
2014-12-23 06:55:44 +01:00
Michael Vogel bc8345d596 Facebook: Better check for empty posts, performance improvement when syncing. 2014-12-22 23:22:33 +01:00
Michael Vogel 19cd337b3c The hostname of the statistics page has changed. 2014-12-22 23:12:23 +01:00
tobiasd 96df32ce35 Merge pull request #227 from gerhard6380/master
addon crashes on PHP version >= 5.4
2014-12-15 07:27:38 +01:00
gerhard6380 1436f647e3 addon crashes on PHP version >= 5.4
i used a deprecated syntax in one function, which has been removed in
PHP version 5.4
2014-12-14 22:46:07 +01:00
gerhard6380 5d33440e63 Merge pull request #1 from friendica/master
Aktualisieren
2014-12-14 22:42:38 +01:00
tobiasd 0e0807e91d Merge pull request #226 from annando/1412-loop-prevention
buffer/fromgplus: Some more loop prevention
2014-12-07 10:44:52 +01:00
Michael Vogel 5a7abb3ffd buffer/fromgplus: Some more loop prevention 2014-12-01 22:31:29 +01:00
tobiasd 3d8d0e2860 Merge pull request #225 from annando/1411-leistungsschutzrecht
Leistungsschutzrecht: A mechanism to avoid problems with a stupid german law
2014-11-15 11:18:01 +01:00
Michael Vogel f296b5b4d6 fromgplus: This addon is now enabled to cooperate with "leistungsschutzrecht" as well. 2014-11-14 15:06:24 +01:00
Michael Vogel 225aabf5bb fbpost/fbsync: make the neccessary calls, so that "Leistungsschutzrecht" can be invoked. 2014-11-13 22:02:31 +01:00
Michael Vogel f0ccc16165 Leistungsschutzrecht: A mechanism to avoid problems with a stupid german law. 2014-11-13 21:56:23 +01:00
tobiasd fcbedf5ad0 Merge pull request #224 from annando/1411-pumpio-fetchallthreads
pumpio: Threads should be now more complete than before.
2014-11-11 08:30:03 +01:00
Michael Vogel 029726c1df pumpio: Threads should be now more complete than before. (Due to some flaws in the pumpio-api htere were mostly missing some comments) 2014-11-10 23:00:39 +01:00
tobiasd 308a615700 Merge pull request #223 from annando/1410-application-name
Use the original application name when mirroring posts
2014-11-09 09:16:32 +01:00
Michael Vogel 9e9916a8d5 Use the original application name when mirroring posts. 2014-11-07 20:06:51 +01:00
fabrixxm f126d23f2b Merge pull request #221 from gerhard6380/windowsphonepush
Addon WindowsPhonePush
2014-10-31 14:41:36 +01:00
gerhard6380 10be52ed85 messages.po created
messages.po file created by run_xgettext.sh as instructed by fabrixxm.
2014-10-26 15:33:49 +01:00
tobiasd d0d23ec2b6 Merge pull request #222 from annando/1410-deleted-contact-data
Bugfix: deleted contact data
2014-10-19 10:09:18 +02:00
Michael Vogel 8c5ee7e062 Removed some stuff from another branch 2014-10-19 00:26:06 +02:00
Michael Vogel 39cc0fe4cb Bugfix: Sometimes it happened that the own contact data was deleted. This was caused by the statusnet connector. 2014-10-19 00:05:06 +02:00