keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8916 commits 4 branches 0 tags 179 MiB
Commit graph

8916 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabrixxm
a490140218 add jsonp support to api 2014-10-16 10:51:36 +02:00
Fabrixxm
295b4d7f61 Update develop from 'master' 2014-10-16 10:47:40 +02:00
fabrixxm
42306eab0b Merge pull request #1187 from tobiasd/20141013 
noscrape by default
 2014-10-13 19:52:29 +02:00
Tobias Diekershoff
56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm
244de7d750 Merge pull request #1183 from tobiasd/doctrans 
added translation instructions to the help pages
 2014-10-13 15:02:41 +02:00
fabrixxm
6f92dd00d3 Merge pull request #1182 from tobiasd/20141009 
RO: update to the strings
 2014-10-13 15:01:42 +02:00
fabrixxm
95d31e6633 Merge pull request #1181 from tobiasd/20141007 
PT-BR updating the strings
 2014-10-13 15:01:27 +02:00
Tobias Diekershoff
8d677f100a added translation instructions to the help pages 2014-10-09 19:10:36 +02:00
Tobias Diekershoff
5c316fa541 RO: update to the strings 2014-10-09 17:59:27 +02:00
Tobias Diekershoff
75f6f3d68b PT-BR: updating the strings 2014-10-07 18:34:43 +02:00
fabrixxm
bff688ef91 Merge pull request #1175 from fabrixxm/master 
Friendica 'Ginger' 3.3
 2014-10-06 10:18:36 +02:00
Fabrixxm
c9667bbd69 add codename to useragent string 2014-10-06 10:06:53 +02:00
fabrixxm
3092d34a7a Merge pull request #1177 from annando/1410-feed-with-tags 
Importing feed with hashtags from keywords
 2014-10-06 09:54:36 +02:00
fabrixxm
da5cbe35aa Merge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup 
1409 diaspora repeated twitter cleanup
 2014-10-06 09:53:16 +02:00
Fabrixxm
e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Michael Vogel
759f199b6f Created hashtags from keywords now are links. URL are cleaned from tracking data. 2014-10-03 13:02:15 +02:00
Michael Vogel
904f8ac422 Creating hashtags from keywords of a feed, when additional data should be fetched. 2014-10-03 12:18:33 +02:00
fabrixxm
9513640ae3 Merge pull request #1171 from fabrixxm/issue_1169 
comment out multidomain config support
 2014-10-02 14:34:55 +02:00
Fabrixxm
57e2b25d56 Update doc/FAQ. Also remove Friendica Red references from FAQ 2014-10-01 09:19:37 +02:00
Fabrixxm
70659b67d2 comment out multidomain config support 2014-10-01 09:04:06 +02:00
Michael Vogel
eb592030eb Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup 2014-09-29 09:42:47 +02:00
fabrixxm
3a0b18fa36 Merge pull request #1168 from annando/1409-application-source-name 
API: Detecting the source name of the application
 2014-09-29 09:24:41 +02:00
fabrixxm
d60122e7a6 Merge pull request #1166 from annando/1409-issue-1158 
issue #1158 - and other stuff that I didn't wanted to merge (I hate GIT)
 2014-09-29 09:23:09 +02:00
Michael Vogel
335855a40b API: Fetching the application name of the client. 2014-09-28 17:23:01 +02:00
tobiasd
a6e3a2361f Merge pull request #1167 from tobiasd/20140928 
updating the translations from transifex
 2014-09-28 15:08:58 +02:00
Tobias Diekershoff
74be3ac543 updating core translations from transifex 2014-09-28 15:04:54 +02:00
Michael Vogel
2b26181509 Issue 1158: muting of threads now works with the API as well. 2014-09-28 00:42:27 +02:00
Michael Vogel
778ed772d2 Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet. 2014-09-27 23:39:06 +02:00
Michael Vogel
21c09c0732 API: Set the application name to "api" (if not defined), "remote_self" has an application name as well. 2014-09-27 23:37:05 +02:00
fabrixxm
bd0b93e630 Merge pull request #1165 from annando/1409-issue-1157 
Issue 1157: Unused javascript function is removed.
 2014-09-27 19:03:20 +02:00
fabrixxm
c1e986e5c4 Merge pull request #1161 from annando/master 
Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.
 2014-09-27 18:20:39 +02:00
Michael Vogel
2bbd7ab67f Issue 1157: Unused javascript function is removed. 2014-09-27 14:17:50 +02:00
Michael Vogel
459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
fabrixxm
c965792c07 Merge pull request #1157 from tugelbend/master 
bug fix #1135, "show more" is usable again
 2014-09-22 17:12:34 +02:00
hauke
2743514791 bug fix #1135, show more is usable again 2014-09-22 13:53:16 +02:00
fabrixxm
4ec5974074 Merge pull request #1155 from fabrixxm/master 
fix #1151, fix #1150
 2014-09-20 12:18:48 +02:00
fabrixxm
f6cebf607f remove unneeded htconfig templates 2014-09-20 12:14:59 +02:00
fabrixxm
f6cfdf4af1 remove uneeded email templates 2014-09-20 12:10:24 +02:00
fabrixxm
b95e746259 allow mod/view in install mode to load pcss files. Fix unstiled install 2014-09-20 12:09:10 +02:00
fabrixxm
d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm
5d1c7b4e4f Cleanup mods folder and remove privacy_image_cache from docs. fix #1151 2014-09-20 11:41:44 +02:00
fabrixxm
0dd3aaf82b Merge pull request #1154 from fabrixxm/master 
fix residual curCSS, should fix #1153
 2014-09-20 11:26:44 +02:00
fabrixxm
6da5cf8037 fix residual curCSS, should fix #1153 2014-09-20 11:24:06 +02:00
fabrixxm
e85d7b9235 Merge pull request #1149 from fabrixxm/quattro_fixs 
Quattro fix and other
 2014-09-17 11:09:54 +02:00
Fabrixxm
133b5bca59 fix oembed video template 2014-09-17 11:02:58 +02:00
Fabrixxm
51e6c30188 add id to album name tag 
this should be in template
 2014-09-17 11:02:18 +02:00
Fabrixxm
f971f52482 remove messages link from notification tabs bar 2014-09-17 11:01:47 +02:00
Fabrixxm
fbe664cc44 fix settings page aside menu active item 
add aside menu to delegate page
 2014-09-17 11:00:34 +02:00
Fabrixxm
d1029e1fb2 tweak quattro theme 2014-09-17 10:59:19 +02:00
Fabrixxm
3031457c36 Merge branch 'Beanow-feature/collapse-menulink' into friendica/master 2014-09-17 08:59:01 +02:00