Michael Vogel
|
abe31d7e60
|
Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import
|
2015-09-29 10:27:04 +02:00 |
|
Fabrixxm
|
880dda4257
|
Merge branch 'master' back into develop
|
2015-09-29 10:00:13 +02:00 |
|
|
Fabrixxm
|
4b6afbf681
|
Merge branch '3.4.2'
|
2015-09-29 09:58:16 +02:00 |
|
|
Michael Vogel
|
e8517c1e5c
|
Merge pull request #1909 from fabrixxm/changelog-3.4.2
3.4.2: update changelog and version
|
2015-09-29 09:56:59 +02:00 |
|
|
Fabrixxm
|
2376cf143c
|
Bump Friendica version
|
2015-09-29 09:25:59 +02:00 |
|
|
Fabrixxm
|
32ce091fe2
|
Update CHANGELOG
|
2015-09-29 09:25:36 +02:00 |
|
|
Michael Vogel
|
7f8284eb1b
|
New functionality to import feeds. Now with support of every used feed format (RSS, RDF, Atom)
|
2015-09-27 14:02:05 +02:00 |
|
|
fabrixxm
|
fbe44abd5a
|
Merge pull request #1901 from tobiasd/20150924-pl
PL update to the strings
|
2015-09-25 18:25:13 +02:00 |
|
|
fabrixxm
|
af5da5bece
|
Merge pull request #1903 from annando/1509-bbcode-notifications
The "about" field in the introductions should be send through bbcode
|
2015-09-25 18:24:48 +02:00 |
|
|
Michael Vogel
|
c7b80b532a
|
Bugfix: The "about" field in the introductions should be send through bbcode
|
2015-09-25 17:47:37 +02:00 |
|
 Tobias Diekershoff
|
28df4b2cd0
|
PL update to the strings
|
2015-09-24 22:09:39 +02:00 |
|
|
fabrixxm
|
eccc06914c
|
Merge pull request #1899 from strk/postopt-lang
Remove duplicated calls to language detection
|
2015-09-23 11:41:15 +02:00 |
|
Sandro Santilli
|
e9f001aa5d
|
Use ampersend to separate postopts, and explicit test for empty string
|
2015-09-23 11:39:36 +02:00 |
|
|
Sandro Santilli
|
741b82ccab
|
Use x() function to check for array containement (I think)
this is response to @fabrixxxm comment
|
2015-09-23 11:11:12 +02:00 |
|
|
Sandro Santilli
|
2a2dd6a1b9
|
Remove duplicated calls to language detection
Also avoids overriding existing "lang" specification in an item
|
2015-09-23 10:47:34 +02:00 |
|
|
Tobias Diekershoff
|
53719d4ecc
|
Merge pull request #1897 from annando/3.4.2
Bugfix: Following mail accounts is now possible again
|
2015-09-23 06:20:49 +02:00 |
|
|
Michael Vogel
|
7c8c8b821a
|
Bugfix: Following mail accounts is now possible again
|
2015-09-22 22:31:22 +02:00 |
|
|
Tobias Diekershoff
|
05d981be14
|
Merge pull request #1895 from fabrixxm/rino2-mcrypt
Adds checks for mcrypt module for RINO2
|
2015-09-22 13:15:01 +02:00 |
|
|
Fabrixxm
|
69dd6869f2
|
update messages.po
|
2015-09-22 09:59:12 +02:00 |
|
|
Fabrixxm
|
554948c22a
|
Adds checks for mcrypt module for RINO2
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
|
2015-09-22 09:50:24 +02:00 |
|
|
Tobias Diekershoff
|
303a59f1d0
|
Merge pull request #1894 from annando/1509-diaspora-federation
Some changes to stay compatible to Diaspora
|
2015-09-19 15:51:25 +02:00 |
|
|
Michael Vogel
|
25fc2c9799
|
Some changes to stay compatible to Diaspora
|
2015-09-19 14:00:33 +02:00 |
|
|
Tobias Diekershoff
|
0a41a8127b
|
Merge pull request #1893 from annando/1509-lockpath
Avoiding errors when checking for the lockpath
|
2015-09-19 13:53:13 +02:00 |
|
|
Michael Vogel
|
a9fdba638f
|
Avoiding errors when checking for the lockpath
|
2015-09-19 11:30:19 +02:00 |
|
|
Tobias Diekershoff
|
976a2be1f7
|
Merge pull request #1892 from annando/1509-vier-attachements
Now attachments of the type "application" are displayed as well.
|
2015-09-18 21:11:57 +02:00 |
|
|
Michael Vogel
|
6be65f4eae
|
Now attachments of the type "application" are displayed as well.
|
2015-09-18 21:09:31 +02:00 |
|
|
Michael Vogel
|
2be91d0226
|
Merge pull request #1888 from fabrixxm/changelog-3.4.2
Update changelog
|
2015-09-17 21:53:23 +02:00 |
|
|
Tobias Diekershoff
|
26a2d49d98
|
Merge pull request #1891 from tobiasd/20150917-de
DE update to the strings
|
2015-09-17 14:25:34 +02:00 |
|
|
Tobias Diekershoff
|
dbc9d87156
|
DE update to the strings
|
2015-09-17 14:24:07 +02:00 |
|
|
fabrixxm
|
8086a21b37
|
Fix CHANGELOG
|
2015-09-16 16:59:14 +02:00 |
|
|
Tobias Diekershoff
|
bca4d31410
|
Merge pull request #1890 from annando/1509-directory
There is now only one central parameter for the global directory.
|
2015-09-15 22:48:34 +02:00 |
|
|
Michael Vogel
|
5ac38b7f99
|
There is now only one central parameter for the global directory.
|
2015-09-15 22:29:02 +02:00 |
|
|
Tobias Diekershoff
|
7a432a6739
|
Merge pull request #1889 from annando/1509-diaspora-images
Bugfix: Picture import from Diaspora often failed
|
2015-09-15 06:21:19 +02:00 |
|
|
Michael Vogel
|
345b0d81dd
|
Picture import from Diaspora often failed
|
2015-09-14 23:14:21 +02:00 |
|
|
fabrixxm
|
7affbba055
|
Fix CHANGELOG
|
2015-09-14 17:31:13 +02:00 |
|
|
Fabrixxm
|
a98d10e800
|
Update CHANGELOG
|
2015-09-14 15:22:41 +02:00 |
|
|
Tobias Diekershoff
|
89c38cccd1
|
Merge pull request #1887 from annando/issue-1886
Issue 1886: Some speedup for poco
|
2015-09-11 20:58:41 +02:00 |
|
|
Michael Vogel
|
91d5c31656
|
Issue 1886: Some speedup for poco
|
2015-09-11 20:46:55 +02:00 |
|
|
Tobias Diekershoff
|
6b744aa71c
|
Merge pull request #1883 from annando/1509-addon-remote-self
Bugfix: "remote self" items weren't posted by connectors
|
2015-09-08 06:47:27 +02:00 |
|
|
Michael Vogel
|
f2cb9b889e
|
Only set a prefix for the guid if it is a locally stored item
|
2015-09-07 23:33:02 +02:00 |
|
|
Michael Vogel
|
6088f59c33
|
Bugfix: "remote self" items weren't posted by connectors
|
2015-09-07 23:14:18 +02:00 |
|
|
Tobias Diekershoff
|
1c19bcd322
|
Merge pull request #1882 from annando/1509-poco-federation
Include the server list from the-federation.info
|
2015-09-06 13:48:59 +02:00 |
|
|
Michael Vogel
|
92a15d9178
|
Include the server list from the-federation.info
|
2015-09-06 12:20:31 +02:00 |
|
|
Tobias Diekershoff
|
c9faec49c1
|
Merge pull request #1881 from annando/1509-diaspora-import
Diaspora: Improved duplicate check, check if post should be imported
|
2015-09-06 10:21:28 +02:00 |
|
|
Michael Vogel
|
d20dbedddd
|
Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
|
2015-09-06 09:15:23 +02:00 |
|
|
Tobias Diekershoff
|
c67fbc89c4
|
Merge pull request #1879 from annando/1509-fixing-ostatus
Improvements to OStatus subscriptions
|
2015-09-06 09:03:28 +02:00 |
|
|
Tobias Diekershoff
|
8504cf4f05
|
Merge pull request #1880 from annando/1509-performance
Some settings to control the system load
|
2015-09-06 09:02:27 +02:00 |
|
|
Michael Vogel
|
f918109351
|
We forgot to include the title ...
|
2015-09-06 08:18:55 +02:00 |
|
|
Michael Vogel
|
c555b1b5cb
|
Only look for the GUID when checking for duplicates.
|
2015-09-06 07:34:51 +02:00 |
|
|
Michael Vogel
|
988f32dfc8
|
Rearranged the dispatcher
|
2015-09-05 13:26:14 +02:00 |
|