 Tobias Diekershoff
|
27fe3e7160
|
Merge pull request #2292 from mexon/mat/pullrequest2
Report errors during cURL fetch
|
2016-01-25 07:16:58 +01:00 |
|
|
Tobias Diekershoff
|
d395959e41
|
DE update to the strings
|
2016-01-25 07:13:29 +01:00 |
|
Matthew Exon
|
4007876b84
|
Use more cookies to allow processing of the NYT feed
Conflicts:
include/Scrape.php
|
2016-01-25 03:34:53 +01:00 |
|
|
Matthew Exon
|
677903b316
|
Report errors during cURL fetch
|
2016-01-25 02:56:47 +01:00 |
|
|
Matthew Exon
|
2aa0c6d00d
|
Only proxy URLs using HTTP or HTTPS
|
2016-01-25 02:50:57 +01:00 |
|
Michael Vogel
|
ffd8f1234e
|
Some more documentation
|
2016-01-25 01:15:10 +01:00 |
|
|
Michael Vogel
|
acd7e816eb
|
Added documentation
|
2016-01-25 01:06:46 +01:00 |
|
|
Michael Vogel
|
a2d025232b
|
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
|
2016-01-24 18:21:09 +01:00 |
|
fabrixxm
|
09622ad593
|
Merge pull request #2288 from annando/1601-warning-forumlist
Avoid a warning if a user hadn't subscribed to any forum.
|
2016-01-24 18:15:31 +01:00 |
|
|
Michael Vogel
|
b409132f86
|
Avoid a warning if a user hadn't subscribed to any forum.
|
2016-01-24 17:56:34 +01:00 |
|
|
Michael Vogel
|
16b3758deb
|
Removed to do bullet point
|
2016-01-24 17:42:47 +01:00 |
|
|
Michael Vogel
|
ca64c7f7cd
|
Remove duplicated contacts with uid=0
|
2016-01-24 17:40:31 +01:00 |
|
|
Michael Vogel
|
937196d6ee
|
Poco fields now moved to the header, function to create formatted location string
|
2016-01-24 14:30:57 +01:00 |
|
|
Michael Vogel
|
c1f2b3a55e
|
Improved documentation
|
2016-01-24 10:34:39 +01:00 |
|
|
Michael Vogel
|
f38f1806c1
|
We don't need these templates anymore
|
2016-01-24 08:22:09 +01:00 |
|
|
Michael Vogel
|
1471385157
|
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
|
2016-01-24 08:18:38 +01:00 |
|
|
Tobias Diekershoff
|
a447839c50
|
Merge pull request #2281 from annando/1601-repair-database
Frequently repair of database entries
|
2016-01-24 08:08:50 +01:00 |
|
|
Michael Vogel
|
079b7bb602
|
Merge pull request #2284 from tobiasd/20160124-messages
Update to the strings
|
2016-01-24 08:00:02 +01:00 |
|
|
Michael Vogel
|
41dacf4b37
|
To-Do bullets can now be listed in doxygen
|
2016-01-24 07:57:36 +01:00 |
|
|
Tobias Diekershoff
|
47a936eaa3
|
groups vs forums and mentioning those
|
2016-01-24 07:42:25 +01:00 |
|
|
Tobias Diekershoff
|
3108406c9f
|
Update to the strings
|
2016-01-24 06:52:09 +01:00 |
|
|
Tobias Diekershoff
|
b77dfb5737
|
Merge pull request #2283 from annando/1601-worker-stuff
The worker now kills processes that run longer than 3 hours
|
2016-01-24 06:42:06 +01:00 |
|
|
Tobias Diekershoff
|
e511808faf
|
Merge pull request #2282 from annando/1601-gcontact-updates
New handling for filling the gcontact table / duplicate prevention
|
2016-01-24 06:41:21 +01:00 |
|
|
Michael Vogel
|
275f7b2660
|
The worker now kills processes that run longer than 3 hours
|
2016-01-24 02:53:21 +01:00 |
|
|
Michael Vogel
|
74ed37aa87
|
Some more removed code
|
2016-01-24 00:21:58 +01:00 |
|
|
Michael Vogel
|
44091aa631
|
Removed unused functions
|
2016-01-24 00:11:16 +01:00 |
|
|
Michael Vogel
|
60470cfafa
|
New handling for filling the gcontact table / duplicate prevention
|
2016-01-23 22:36:15 +01:00 |
|
|
Michael Vogel
|
b76dc8b129
|
Frequently repair of database entries
|
2016-01-23 22:05:27 +01:00 |
|
|
Michael Vogel
|
7371318376
|
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
|
2016-01-23 18:50:14 +01:00 |
|
|
Tobias Diekershoff
|
e18bb43918
|
Merge pull request #2280 from annando/1601-no-contact
Workaround for the case when items are stored without a contact id
|
2016-01-23 14:15:16 +01:00 |
|
|
Michael Vogel
|
2bb3c1aec8
|
DFRN: Mails had an empty body
|
2016-01-23 13:18:18 +01:00 |
|
|
Michael Vogel
|
61cebdb75e
|
Workaround for the case when items are stored without a contact id
|
2016-01-23 12:39:37 +01:00 |
|
|
fabrixxm
|
ea82bb19a2
|
Merge pull request #2278 from tobiasd/20160122-doc
docs
|
2016-01-23 10:12:58 +01:00 |
|
|
fabrixxm
|
ff60f6b941
|
Merge pull request #2279 from tobiasd/20160123-admin
FedStats: a total number count would be nice
|
2016-01-23 10:12:09 +01:00 |
|
|
Tobias Diekershoff
|
39099b56d1
|
a total number count would be nice
|
2016-01-23 08:01:54 +01:00 |
|
|
Michael Vogel
|
444b417de0
|
New routines are now enabled
|
2016-01-23 02:44:30 +01:00 |
|
|
Michael Vogel
|
1406d7cbec
|
Added documentation, completed the functions
|
2016-01-23 01:07:51 +01:00 |
|
|
Michael Vogel
|
c66b4387bf
|
dfrn functions could now work/Removed unused code
|
2016-01-22 20:26:11 +01:00 |
|
|
Tobias Diekershoff
|
924bf238df
|
typos
|
2016-01-22 09:02:21 +01:00 |
|
|
Tobias Diekershoff
|
76d588f929
|
typos
|
2016-01-22 09:00:12 +01:00 |
|
|
Tobias Diekershoff
|
b02008a6a7
|
README.translate updated as well
|
2016-01-22 08:56:53 +01:00 |
|
|
Tobias Diekershoff
|
420e3021f9
|
clarification to the forum docs
|
2016-01-22 07:42:03 +01:00 |
|
|
Tobias Diekershoff
|
15febca93d
|
Update to the translation docs (email templates and language selection problems in Safari)
|
2016-01-22 07:36:01 +01:00 |
|
|
Michael Vogel
|
ea9a42259d
|
First version of dfrn.php - unfinished
|
2016-01-22 01:58:36 +01:00 |
|
|
Michael Vogel
|
fe5705e547
|
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
|
2016-01-21 23:05:02 +01:00 |
|
|
Tobias Diekershoff
|
0ed7a2376a
|
Merge pull request #2276 from annando/1601-gs-discovery
Search for GNU Social users in the background
|
2016-01-21 19:32:33 +01:00 |
|
|
Michael Vogel
|
1d502116a8
|
Search for GNU Social users in the background
|
2016-01-21 19:00:08 +01:00 |
|
|
Tobias Diekershoff
|
6174017048
|
Merge pull request #2275 from rabuzarus/2101_event_reminder
fix events_reminder popup
|
2016-01-21 16:18:36 +01:00 |
|
|
Tobias Diekershoff
|
478053dafe
|
Merge pull request #2274 from annando/1601-hubzilla-comments
Hubzilla comments are now federated
|
2016-01-21 16:17:59 +01:00 |
|
|
Michael Vogel
|
e1bc0b4ff8
|
Likes are now federated again through Diaspora
|
2016-01-21 16:01:46 +01:00 |
|