mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
10 299 Commity
3 Gałęzie
64 Tagi
227 MiB
Wykres commitów

10299 Commity (1c19bcd32289b67f8571cc37ec4d9470f6382cbf)

Autor SHA1 Wiadomość Data
fabrixxm 1cd5a3184d Merge pull request #1672 from tobiasd/20150614-frank 
resolving merge issues with DE doc merging
 2015-06-15 14:00:18 +02:00
Tobias Diekershoff 78321c2a43 Merge pull request #1670 from annando/setup-rewrite-check 
The installation prozess has a problem with self signed certificates
 2015-06-15 13:25:54 +02:00
Tobias Diekershoff 7ef99269e7 Merge pull request #1671 from annando/issue-1642-b 
This is working fix for issue 1642
 2015-06-15 13:25:26 +02:00
Tobias Diekershoff 4312da6326 BOSH server for Jappixmini addon 2015-06-15 13:19:02 +02:00
Tobias Diekershoff c2ca9a3e17 hint in the docs to start from develop 2015-06-15 13:18:32 +02:00
Tobias Diekershoff e839e3e1ec Merge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style' into 20150614-frank 2015-06-15 13:07:36 +02:00
Michael Vogel 7feda0120f This is working fix for issue 1642 2015-06-15 01:20:04 +02:00
Michael Vogel 0e157b1288 Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check 2015-06-15 00:55:05 +02:00
fabrixxm 42f4f3fce9 Merge pull request #1668 from annando/issue-1642 
Better detection for the mobile client to avoid "{0}" in notifications
 2015-06-14 15:58:52 +02:00
fabrixxm c7566d4917 Merge pull request #1669 from annando/1506-ostatus-v3 
Yet another OStatus improvement
 2015-06-14 15:52:10 +02:00
fabrixxm 4ec7102c9c Merge pull request #1667 from annando/1506-remote-subscribe 
Remote subscribe from a GNU Social site is now possible
 2015-06-14 15:49:03 +02:00
Michael Vogel 9ca04e4e69 Just a to-do added 2015-06-14 11:39:15 +02:00
Michael Vogel fa288173c3 OStatus: Force parent when storing item. 2015-06-14 10:56:57 +02:00
Michael Vogel b7f270de28 probe_url: Better detection for non-standard installations of GNU Social 2015-06-14 01:52:26 +02:00
Michael Vogel b22296d454 Better support for non standard installations of GNU Social in "probe_url" 2015-06-14 01:49:14 +02:00
Michael Vogel abc84f96ab The installation prozess has a problem with self signed certificates. 2015-06-13 21:58:40 +02:00
Michael Vogel c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
Michael Vogel 66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
Michael Vogel e0147a24ad Send poco data in the atom entries. 2015-06-13 09:59:17 +02:00
Michael Vogel 9a6511dc38 Send a salmon notification when its a ostatus thread or you reply to an ostatus message 2015-06-13 09:12:28 +02:00
Michael Vogel 740bc41680 Update contact from poco fields when importing messages/repeated items now het the same uri. 2015-06-13 09:11:17 +02:00
Michael Vogel e36627c7b7 fetch the full name of a contact from the poco fields (if present) 2015-06-13 09:08:52 +02:00
Michael Vogel 4704933b6e Use the display name (full name) instead of the nick name when importing. 2015-06-13 09:07:13 +02:00
Frank Dieckmann a9b08a1281 Capitalization of german addressing and work on linguistic style 2015-06-12 21:10:47 +02:00
Michael Vogel 60ad7af6f3 Some bugfixing. 2015-06-12 01:08:06 +02:00
Michael Vogel ad45ff7eb1 OStatus: Notifier for Friendica, better thread completion 2015-06-12 00:39:56 +02:00
Tobias Diekershoff e02546880f Merge pull request #1662 from annando/issue-1628 
The values for "sitename" and "register_text" was nedlessly encoded
 2015-06-11 06:33:38 +02:00
Tobias Diekershoff eba4f7dcc1 Merge pull request #1663 from rabuzarus/vier-remote-link 
remote-link button in vier
 2015-06-11 06:33:07 +02:00
Tobias Diekershoff 738fd3d309 Merge pull request #1661 from annando/issue-1640 
Improved OEmbed detection
 2015-06-11 06:32:37 +02:00
Tobias Diekershoff d2f4426fb5 Merge pull request #1660 from annando/issue-1657 
This fixes issue 1657
 2015-06-11 06:30:50 +02:00
rabuzarus c01dbc274c fix remote-link button in vier 2015-06-11 02:49:09 +02:00
rabuzarus 5f088954be make full title without dots 2015-06-11 00:43:34 +02:00
Michael Vogel 5907c62851 The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities" 2015-06-11 00:12:16 +02:00
Michael Vogel cad591b1ec Improved OEmbed detection 2015-06-10 23:45:56 +02:00
Michael Vogel df3b38679f This fixes issue 1657 2015-06-10 22:54:41 +02:00
fabrixxm 8e800af306 Merge pull request #1659 from annando/1506-ostatus-enclosures 
Many OStatus improvements
 2015-06-10 09:23:42 +02:00
Michael Vogel f1fe38d5c7 Just two to-dos added 2015-06-10 08:36:51 +02:00
Michael Vogel 81b609562e Fetch the hub adress while parsing OStatus messages. 2015-06-09 23:53:53 +02:00
rabuzarus 66a51f37b2 use title in events reminder not description 2015-06-09 14:26:47 +02:00
fabrixxm a32147f722 Merge pull request #1648 from tobiasd/20150603 
uncomment replacement
 2015-06-09 08:55:49 +02:00
Michael Vogel cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel 419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel fb72871f66 Bugfix: The user id wasn't fetched correctly. 2015-06-08 00:50:02 +02:00
Michael Vogel b24a46f889 Adding link information 2015-06-08 00:18:44 +02:00
Michael Vogel af79cd316c Some code beautification. 2015-06-07 23:53:51 +02:00
Michael Vogel a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel f34135f34d OStatus: Attachment links are now added as enclosures 2015-06-06 13:15:37 +02:00
Tobias Diekershoff e6e7562986 Merge pull request #1654 from annando/1506-tag-users 
Bugfix: Feeds weren't imported correctly
 2015-06-04 16:49:06 +02:00
Michael Vogel 2364dfb151 Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-04 07:36:38 +02:00
Tobias Diekershoff 0eea5262fa Merge pull request #1649 from annando/1506-vanished-comments 
The duplication check caused the killing of too much items
 2015-06-04 06:20:45 +02:00