Michael Vogel
|
8d0030c9d5
|
Revert some stuff from another pull request. I like git ...
|
2015-02-02 22:24:21 +01:00 |
|
|
Michael Vogel
|
62b32e7c93
|
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
|
2015-02-02 22:08:40 +01:00 |
|
 Tobias Diekershoff
|
b41d14afe3
|
Merge pull request #1343 from annando/1502-diaspora-guid-links
Diaspora internal GUID links are now converted correctly
|
2015-02-02 22:03:09 +01:00 |
|
|
Tobias Diekershoff
|
677f46c076
|
Merge pull request #1338 from annando/1501-global-contacts
Added "about" to noscrape
|
2015-02-02 21:52:09 +01:00 |
|
|
Tobias Diekershoff
|
2efc789aee
|
Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora
Improvement for the "new friend" notification with Diaspora and "remote self"
|
2015-02-02 21:51:35 +01:00 |
|
|
Tobias Diekershoff
|
09b90244c3
|
Merge pull request #1344 from annando/1502-new-vier-version
New version for "Vier"
|
2015-02-02 21:50:54 +01:00 |
|
|
Michael Vogel
|
9c0dc86eea
|
Merge pull request #1342 from tobiasd/20150202_admin
added diagnostics tools to the admin side panel
|
2015-02-02 21:14:41 +01:00 |
|
|
Michael Vogel
|
dbe52c74b5
|
Added Beanow as author, since he did most of the last changes.
|
2015-02-02 21:03:14 +01:00 |
|
|
Michael Vogel
|
9f0e19762e
|
New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!
|
2015-02-02 21:00:32 +01:00 |
|
|
Tobias Diekershoff
|
e5766a4793
|
make strings translate able
|
2015-02-02 20:37:05 +01:00 |
|
|
Michael Vogel
|
46dd453e5b
|
Diaspora internal GUID links are now converted correctly.
|
2015-02-02 20:26:05 +01:00 |
|
|
Tobias Diekershoff
|
8a17c3d348
|
added diagnostics tools to the admin side panel
|
2015-02-02 18:26:38 +01:00 |
|
|
Michael Vogel
|
1fb79a1a59
|
Merge pull request #1333 from tobiasd/20150131_ptbr
PT-BR: update to the strings
|
2015-02-01 16:40:24 +01:00 |
|
|
Michael Vogel
|
f1e42b73a8
|
Merge pull request #1335 from silke/issue1329
Issue1329
|
2015-02-01 16:40:00 +01:00 |
|
Silke Meyer
|
57a80c3867
|
Let the browser check if it's a valid email address
|
2015-02-01 16:25:49 +01:00 |
|
|
Michael Vogel
|
d1dd50e9b0
|
Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore.
|
2015-02-01 16:04:16 +01:00 |
|
|
Michael Vogel
|
9ccc6746be
|
Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
|
2015-02-01 13:33:26 +01:00 |
|
|
Michael Vogel
|
6eb4254d06
|
The query after an API post was improved to make it faster.
|
2015-01-31 23:13:21 +01:00 |
|
|
Michael Vogel
|
a7e190b0cb
|
Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode.
|
2015-01-31 22:57:05 +01:00 |
|
|
Silke Meyer
|
61a227dbaa
|
Changed the "From" field for system emails from product to sitename.
|
2015-01-31 18:44:30 +01:00 |
|
|
Silke Meyer
|
bb2413ddaf
|
deleted my comment of the original line
|
2015-01-31 18:41:05 +01:00 |
|
|
Silke Meyer
|
8991319d9d
|
Added a description to the help field
|
2015-01-31 16:09:59 +01:00 |
|
|
Silke Meyer
|
c90e47556a
|
added setting for server's sender email address
|
2015-01-31 15:54:12 +01:00 |
|
|
Silke Meyer
|
89946b8660
|
fixed a typo
|
2015-01-31 15:23:36 +01:00 |
|
|
Silke Meyer
|
a485653d6b
|
Added setting to customize system notifications' sender email address
|
2015-01-31 08:46:05 +01:00 |
|
|
Tobias Diekershoff
|
ac86aa5822
|
PT-BR: update to the strings
|
2015-01-31 08:42:36 +01:00 |
|
|
Tobias Diekershoff
|
86afc21841
|
Merge pull request #1332 from silke/develop
Added local mail delivery for vagrant (postfix).
|
2015-01-30 22:56:39 +01:00 |
|
|
Silke Meyer
|
1f5d8167c7
|
Added local mail delivery for vagrant (postfix).
|
2015-01-30 17:03:42 +01:00 |
|
fabrixxm
|
2d02153df1
|
Merge pull request #1328 from friendica/release-3.3.3
Update version to 3.3.3-RC
|
2015-01-29 10:18:46 +01:00 |
|
|
fabrixxm
|
4cf36ec2cf
|
Update FRIENDICA_VERSION
|
2015-01-29 09:44:48 +01:00 |
|
|
Tobias Diekershoff
|
cfb6d4c5c1
|
Merge pull request #1327 from annando/1501-more-stuff-to-proxy
And yet another two places where pictures have to be sent through the proxy
|
2015-01-29 08:19:20 +01:00 |
|
|
Michael Vogel
|
036ccf84de
|
And yet another two places where pictures have to be sent through the proxy.
|
2015-01-28 23:34:46 +01:00 |
|
|
Tobias Diekershoff
|
b91d8a1039
|
Merge pull request #1325 from annando/1501-more-stuff-to-proxy
Just two more places where pictures have to be send through the proxy
|
2015-01-28 11:16:50 +01:00 |
|
|
Michael Vogel
|
b309187e3d
|
Just two more places where pictures have to be send through the proxy function.
|
2015-01-28 10:09:16 +01:00 |
|
|
fabrixxm
|
147413507b
|
Merge pull request #1320 from tobiasd/20150127adminpanel
add links to the plugin config pages for active plugins
|
2015-01-28 08:24:29 +01:00 |
|
|
Tobias Diekershoff
|
5ad8b6abf6
|
Merge pull request #1322 from tugelbend/develop
bug fix: syntax error #1321
|
2015-01-28 08:04:04 +01:00 |
|
|
Tobias Diekershoff
|
a8206f6fe1
|
Merge pull request #1324 from annando/issue-1323
Issue 1323: Contact pictures from the acl selector weren't proxied.
|
2015-01-28 08:03:38 +01:00 |
|
|
Michael Vogel
|
c058be9908
|
Issue 1323: Contact pictures from the acl selector weren't proxied.
|
2015-01-28 01:22:42 +01:00 |
|
|
Michael Vogel
|
04ab875a62
|
Added "about" to noscrape.
|
2015-01-27 19:52:54 +01:00 |
|
hauke
|
3dcc1da88b
|
bug fix: syntax error #1321
|
2015-01-27 18:21:32 +01:00 |
|
|
Tobias Diekershoff
|
d6d7ba87a0
|
Merge pull request #1319 from annando/1501-better-contact-list
In private mails the contact list now contains the user address as well
|
2015-01-27 14:36:56 +01:00 |
|
|
Tobias Diekershoff
|
3df7370fa8
|
add links to the plugin config pages for active plugins
|
2015-01-27 14:34:11 +01:00 |
|
|
Michael Vogel
|
6a34210353
|
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
|
2015-01-27 10:20:00 +01:00 |
|
|
Tobias Diekershoff
|
cd7d29d13e
|
Merge pull request #1318 from annando/1501-global-contacts
Many enhacenments to the global contacts
|
2015-01-27 08:25:30 +01:00 |
|
|
Michael Vogel
|
848c09935a
|
The contact list in mails now contains not only the name but also the address.
|
2015-01-27 08:04:24 +01:00 |
|
|
Michael Vogel
|
583c2ce13e
|
poco can now be used to query the global contacts.
|
2015-01-27 08:01:37 +01:00 |
|
|
Michael Vogel
|
e8bfa32b37
|
Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile
|
2015-01-26 01:07:15 +01:00 |
|
|
Michael Vogel
|
bc2c046446
|
poco: Only update the global contacts when there is a network value/Export your own contact as well
|
2015-01-25 16:40:20 +01:00 |
|
|
Michael Vogel
|
105d6a22a4
|
gender will be updated in the profiles as well.
|
2015-01-25 13:22:25 +01:00 |
|
|
Michael Vogel
|
2f400627c7
|
Support for keywords and gender in (global) contacts.
|
2015-01-25 13:19:37 +01:00 |
|