Michael Vogel
|
2f46675a89
|
New routines for markdown to html and html to markdown.
|
8 years ago |
 Tobias Diekershoff
|
c8a1057300
|
Merge pull request #1411 from annando/1502-contact-management
Only show the options that fit to the current network
|
8 years ago |
|
Michael Vogel
|
8179f2f65e
|
Only show the relation on native networks.
|
8 years ago |
|
Michael Vogel
|
1dc961713d
|
Bugfix: If "all" is selected then no contacts were shown.
|
8 years ago |
|
Michael Vogel
|
a8a37a35db
|
Only show the options that fit to the current network.
|
8 years ago |
|
Tobias Diekershoff
|
d026df3240
|
Merge pull request #1410 from annando/1502-poller-issues
Solving poller issues
|
8 years ago |
|
Michael Vogel
|
7e42315d9c
|
Merge pull request #1408 from tobiasd/issue885
decreasing bubble display time in themes from 10s to 5s
|
8 years ago |
|
Michael Vogel
|
dfdb804323
|
Beautified the poller logging
|
8 years ago |
|
Michael Vogel
|
ab5bf06873
|
Restructured and simplified the poller check
|
8 years ago |
|
Michael Vogel
|
68c9707221
|
The poller now always respects the priority setting for feeds.
|
8 years ago |
|
Michael Vogel
|
4c901e60cc
|
More logging for the poller. Changed the query for the contacts to reduce the amount of contacts
|
8 years ago |
|
Tobias Diekershoff
|
985d771b13
|
decreasing bubble display time in themes from 10s to 5s
|
8 years ago |
|
Tobias Diekershoff
|
1a52a238a0
|
Merge pull request #1407 from annando/1502-poller
The poller can now be called even inside the "include" directory
|
8 years ago |
|
Michael Vogel
|
6d8c126179
|
Do the directory change only when it is needed.
|
8 years ago |
|
Michael Vogel
|
96c642661e
|
The poller can now be called even inside the "include" directory.
|
8 years ago |
|
Tobias Diekershoff
|
3ae4fcc71a
|
Merge pull request #1406 from annando/1502-scrape-last-item
scrape/noscrape now contains the date the profile was last updated
|
8 years ago |
|
Tobias Diekershoff
|
29bd6c9853
|
Merge pull request #1403 from annando/issue-1228
Issue 1228: Pictures aren't sent via API in comments.
|
8 years ago |
|
Michael Vogel
|
4a1105ede6
|
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
|
8 years ago |
Fabrixxm
|
b7a50a24c7
|
Merge branch 'release-3.3.3' into develop
|
8 years ago |
|
fabrixxm
|
7d7096f489
|
Merge pull request #1400 from annando/1502-contacts-in-scrape
"contacts" field in scrape/noscrape
|
8 years ago |
|
fabrixxm
|
66e075ff95
|
Merge pull request #1402 from annando/release-3.3.3
Bugfix: See issue 1338
|
8 years ago |
|
Michael Vogel
|
2f79e98cda
|
Issue 1228: Pictures aren't sent via API in comments.
|
8 years ago |
|
Michael Vogel
|
4b7ff42a89
|
Bugfix: See issue 1338
|
8 years ago |
|
Michael Vogel
|
219932f692
|
Removed Statusnet from the counting of contacts for scrape/noscrape
|
8 years ago |
|
Michael Vogel
|
a26d04574d
|
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
|
8 years ago |
|
Tobias Diekershoff
|
fff7a070f9
|
Merge pull request #1399 from annando/1502-profile-link-avatar-picture
link to the profile behind the avatar picture on the display page
|
8 years ago |
|
Michael Vogel
|
52de6c11b1
|
There is now a link to the profile behind the avatar picture on the display page
|
8 years ago |
|
Tobias Diekershoff
|
03d779971a
|
Merge pull request #1397 from annando/release-3.3.3
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
8 years ago |
|
Tobias Diekershoff
|
94bbc5605b
|
Merge pull request #1396 from annando/1502-poco-generation-counter
Improved probe_url, new generation counter for poco
|
8 years ago |
|
Michael Vogel
|
d9f222b330
|
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
8 years ago |
|
Michael Vogel
|
2e1acf7611
|
Just some more code beautification
|
8 years ago |
|
Michael Vogel
|
9d920033e8
|
Just removing unused codelines
|
8 years ago |
|
Michael Vogel
|
8b1b886797
|
Improved probe_url, fixed wrong network detection.
|
8 years ago |
|
Tobias Diekershoff
|
b86b6e8e77
|
Merge pull request #1395 from fabrixxm/escape_input_values
Escape values to input fields (and some 'title' and 'alt')
|
8 years ago |
|
Fabrixxm
|
9d3fb417c2
|
Escape values to input fields (and some 'title' and 'alt')
|
8 years ago |
|
Michael Vogel
|
2dafc9eac1
|
Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter
|
8 years ago |
|
Michael Vogel
|
d1d794f1ab
|
The global contacts now contain a "generation" value that defines how we know this contact
|
8 years ago |
|
Tobias Diekershoff
|
d39612ac25
|
Merge pull request #1393 from annando/1502-cleaned-item-storage-code
Additional check for notifications
|
8 years ago |
|
Michael Vogel
|
cb88269581
|
Merge pull request #1392 from ddorian1/scrolling
Improved infinite scrolling
|
8 years ago |
|
Michael Vogel
|
75797c61f2
|
Improved logging with receiving mails
|
8 years ago |
Johannes Schwab
|
9f4523dc9a
|
fix infinite scrolling with frost
|
8 years ago |
|
Johannes Schwab
|
12d7ca9b84
|
improved infinite scrollling
|
8 years ago |
|
Tobias Diekershoff
|
18a297805c
|
Merge pull request #1390 from tobiasd/20150212cszh
CS, ZH-CN: update to the strings
|
8 years ago |
|
Tobias Diekershoff
|
e3b6770ad4
|
CS, ZH-CN: update to the strings
|
8 years ago |
|
Michael Vogel
|
3c8fc863a8
|
The "share a post" notification is now sent based upon mentions as well.
|
8 years ago |
|
Michael Vogel
|
9287a0521a
|
Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code
|
8 years ago |
|
Michael Vogel
|
ce8f965e11
|
Merge pull request #1387 from mexon/mat/mergerequest
Close cURL object earlier in fetch_url
|
8 years ago |
Matthew Exon
|
2bb8b77123
|
Close cURL handle before recursing, so that cookie file is flushed
|
8 years ago |
|
Fabrixxm
|
135869fd1c
|
Merge branch 'release-3.3.3' into develop
|
8 years ago |
|
Fabrixxm
|
4d17b2e9e8
|
Merge branch 'mexon-mat/mergerequest' into develop
|
8 years ago |
