 Tobias Diekershoff
|
f1b0258fdd
|
Merge pull request #1415 from annando/1502-like-no-update-commented
New Global setting: like shouldn't set "commented"
|
2015-02-28 08:15:12 +01:00 |
|
Fabrixxm
|
caa21e6021
|
Merge branch 'master' into develop
|
2015-02-24 09:09:02 +01:00 |
|
|
Fabrixxm
|
86b41eec77
|
Merge branch 'release-3.3.3'
|
2015-02-24 09:03:21 +01:00 |
|
|
Fabrixxm
|
6a5bb80c82
|
Friendica 3.3.3
See CHANGELOG
|
2015-02-24 09:00:37 +01:00 |
|
Michael Vogel
|
9812a41bbf
|
Merge pull request #1414 from ddorian1/release-3.3.3
fix validate_email()
|
2015-02-23 21:09:44 +01:00 |
|
|
Michael Vogel
|
440e2d82b1
|
Global setting for the behaviour of likes.
|
2015-02-23 12:44:50 +01:00 |
|
|
Michael Vogel
|
6504568f2e
|
Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented
|
2015-02-23 12:35:22 +01:00 |
|
Johannes Schwab
|
1cd1f7587c
|
fix validate_email
|
2015-02-23 12:20:05 +01:00 |
|
|
fabrixxm
|
eb1f21d1e5
|
Merge pull request #1412 from annando/1502-vier-plus-default
"plus" is now the default style at "vier" for new installations
|
2015-02-23 08:51:31 +01:00 |
|
|
fabrixxm
|
d4b092cec6
|
Merge pull request #1356 from silke/develop
Added help text as requested in #1349.
|
2015-02-23 08:51:02 +01:00 |
|
|
fabrixxm
|
d610445563
|
Merge pull request #1413 from annando/1502-more-contact-options
Show the profile visibility only for Friendica contacts
|
2015-02-23 08:49:34 +01:00 |
|
|
Michael Vogel
|
9eeff0d891
|
Received "likes" and "dislikes" don't update the "commented" value anymore.
|
2015-02-22 17:34:04 +01:00 |
|
|
Michael Vogel
|
f3cc065e66
|
Show the profile visibility only for Friendica contacts.
|
2015-02-21 20:03:02 +01:00 |
|
|
Michael Vogel
|
19af382ffb
|
"plus" is now the default style at "vier" for new installations
|
2015-02-21 09:44:13 +01:00 |
|
|
Tobias Diekershoff
|
c8a1057300
|
Merge pull request #1411 from annando/1502-contact-management
Only show the options that fit to the current network
|
2015-02-21 08:21:40 +01:00 |
|
|
Michael Vogel
|
8179f2f65e
|
Only show the relation on native networks.
|
2015-02-20 23:56:41 +01:00 |
|
|
Michael Vogel
|
1dc961713d
|
Bugfix: If "all" is selected then no contacts were shown.
|
2015-02-20 23:33:21 +01:00 |
|
|
Michael Vogel
|
a8a37a35db
|
Only show the options that fit to the current network.
|
2015-02-20 23:12:04 +01:00 |
|
|
Tobias Diekershoff
|
d026df3240
|
Merge pull request #1410 from annando/1502-poller-issues
Solving poller issues
|
2015-02-20 07:49:58 +01:00 |
|
|
Michael Vogel
|
7e42315d9c
|
Merge pull request #1408 from tobiasd/issue885
decreasing bubble display time in themes from 10s to 5s
|
2015-02-19 23:02:55 +01:00 |
|
|
Michael Vogel
|
dfdb804323
|
Beautified the poller logging
|
2015-02-19 22:38:02 +01:00 |
|
|
Michael Vogel
|
ab5bf06873
|
Restructured and simplified the poller check
|
2015-02-19 22:30:16 +01:00 |
|
|
Michael Vogel
|
68c9707221
|
The poller now always respects the priority setting for feeds.
|
2015-02-19 22:04:05 +01:00 |
|
|
Michael Vogel
|
4c901e60cc
|
More logging for the poller. Changed the query for the contacts to reduce the amount of contacts
|
2015-02-19 21:36:29 +01:00 |
|
|
Tobias Diekershoff
|
985d771b13
|
decreasing bubble display time in themes from 10s to 5s
|
2015-02-19 21:24:09 +01:00 |
|
|
Tobias Diekershoff
|
1a52a238a0
|
Merge pull request #1407 from annando/1502-poller
The poller can now be called even inside the "include" directory
|
2015-02-19 10:54:33 +01:00 |
|
|
Michael Vogel
|
6d8c126179
|
Do the directory change only when it is needed.
|
2015-02-19 10:45:46 +01:00 |
|
|
Michael Vogel
|
96c642661e
|
The poller can now be called even inside the "include" directory.
|
2015-02-19 10:26:49 +01:00 |
|
|
Tobias Diekershoff
|
3ae4fcc71a
|
Merge pull request #1406 from annando/1502-scrape-last-item
scrape/noscrape now contains the date the profile was last updated
|
2015-02-19 09:27:12 +01:00 |
|
|
Tobias Diekershoff
|
29bd6c9853
|
Merge pull request #1403 from annando/issue-1228
Issue 1228: Pictures aren't sent via API in comments.
|
2015-02-19 09:25:41 +01:00 |
|
|
Michael Vogel
|
4a1105ede6
|
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
|
2015-02-18 23:40:46 +01:00 |
|
|
Fabrixxm
|
b7a50a24c7
|
Merge branch 'release-3.3.3' into develop
|
2015-02-18 08:38:06 +01:00 |
|
|
fabrixxm
|
7d7096f489
|
Merge pull request #1400 from annando/1502-contacts-in-scrape
"contacts" field in scrape/noscrape
|
2015-02-17 21:21:38 +01:00 |
|
|
fabrixxm
|
66e075ff95
|
Merge pull request #1402 from annando/release-3.3.3
Bugfix: See issue 1338
|
2015-02-17 21:19:39 +01:00 |
|
|
Michael Vogel
|
2f79e98cda
|
Issue 1228: Pictures aren't sent via API in comments.
|
2015-02-17 20:43:11 +01:00 |
|
|
Michael Vogel
|
4b7ff42a89
|
Bugfix: See issue 1338
|
2015-02-17 19:48:02 +01:00 |
|
|
Michael Vogel
|
219932f692
|
Removed Statusnet from the counting of contacts for scrape/noscrape
|
2015-02-17 19:27:13 +01:00 |
|
|
Michael Vogel
|
a26d04574d
|
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
|
2015-02-17 19:18:17 +01:00 |
|
|
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
|
2015-02-17 17:42:53 +01:00 |
|
|
Michael Vogel
|
52de6c11b1
|
There is now a link to the profile behind the avatar picture on the display page
|
2015-02-17 17:33:28 +01:00 |
|
|
Tobias Diekershoff
|
03d779971a
|
Merge pull request #1397 from annando/release-3.3.3
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
2015-02-17 07:43:42 +01:00 |
|
|
Tobias Diekershoff
|
94bbc5605b
|
Merge pull request #1396 from annando/1502-poco-generation-counter
Improved probe_url, new generation counter for poco
|
2015-02-17 07:43:09 +01:00 |
|
|
Michael Vogel
|
d9f222b330
|
Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco)
|
2015-02-17 07:34:04 +01:00 |
|
|
Michael Vogel
|
2e1acf7611
|
Just some more code beautification
|
2015-02-16 22:30:46 +01:00 |
|
|
Michael Vogel
|
9d920033e8
|
Just removing unused codelines
|
2015-02-16 22:28:24 +01:00 |
|
|
Michael Vogel
|
8b1b886797
|
Improved probe_url, fixed wrong network detection.
|
2015-02-16 22:11:51 +01:00 |
|
|
Tobias Diekershoff
|
b86b6e8e77
|
Merge pull request #1395 from fabrixxm/escape_input_values
Escape values to input fields (and some 'title' and 'alt')
|
2015-02-16 09:56:00 +01:00 |
|
|
Fabrixxm
|
9d3fb417c2
|
Escape values to input fields (and some 'title' and 'alt')
|
2015-02-16 09:30:12 +01:00 |
|
|
Michael Vogel
|
2dafc9eac1
|
Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter
|
2015-02-15 10:54:41 +01:00 |
|
|
Michael Vogel
|
d1d794f1ab
|
The global contacts now contain a "generation" value that defines how we know this contact
|
2015-02-15 10:52:45 +01:00 |
|