clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,292 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

9292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tobiasd 6360330248 Merge pull request #1201 from fabrixxm/messages 
update messages.po and run_xgettext.sh
 2014-10-24 14:06:31 +02:00
fabrixxm 53f3b8ab53 Merge pull request #1206 from annando/1410-refresh-to-ssl 
Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)
 2014-10-24 10:56:19 +02:00
fabrixxm 4c66a3486a Merge pull request #1207 from annando/1410-remote-self-with-keywords 
remote self: There is now an option if the keyswords should be used as tags or not
 2014-10-24 10:55:22 +02:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Michael Vogel 68e75b4623 Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled) 2014-10-24 00:52:29 +02:00
Michael Vogel 26c82f210e Merge pull request #1198 from fabrixxm/issues/1190 
Issues/1190
 2014-10-23 22:29:50 +02:00
Michael Vogel bd4410f11b Merge pull request #1200 from fabrixxm/issues/1193 
Fix #1193
 2014-10-23 18:18:31 +02:00
Michael Vogel c2989cc8db Merge pull request #1203 from fabrixxm/feature/1134 
Issue #1134
 2014-10-23 17:44:58 +02:00
Fabrixxm ba6f391635 replace embedded images before statustext is shortened 2014-10-23 17:04:07 +02:00
Fabrixxm b1e83f331e workaround for issue #1134 2014-10-23 16:27:30 +02:00
Fabrixxm 8bf19aabb0 api: allow filter of direct messages sender by user_id or screen_name 2014-10-23 08:59:48 +02:00
Fabrixxm 97d34f02da update messages.po 2014-10-22 10:12:58 +02:00
Fabrixxm d3edc513c2 run_xgettext.sh: fix xgettext warnings 2014-10-22 10:12:27 +02:00
Fabrixxm 634a03dd45 Fix #1193 2014-10-22 09:46:51 +02:00
Fabrixxm f7cf72e450 fix use of $->query_string 2014-10-22 09:32:24 +02:00
Fabrixxm 63168905ec Fix #1190 2014-10-22 09:04:32 +02:00
Michael Vogel f6522658f6 Using "remote self" to synchronize Frandiaca accounts 2014-10-22 08:30:16 +02:00
fabrixxm 9d6bcd2572 Merge pull request #1195 from annando/1410-new-hook-getsiteinfo 
New hook "getsiteinfo" and "page_info_data"
 2014-10-22 08:18:42 +02:00
fabrixxm bb9a335d00 Merge pull request #1196 from annando/1410-store-extid 
New feature: Storing the field "extid" is now possible
 2014-10-22 08:16:18 +02:00
Michael Vogel 97ec2787c6 New feature: Storing the field "extid" is now possible 2014-10-20 08:21:23 +02:00
Michael Vogel 0c1fdb7da1 New hook "page_info_data" 2014-10-20 08:10:21 +02:00
Michael Vogel 3600289262 New hook "getsiteinfo", separating fetching site info from generating bbcode 2014-10-20 08:03:47 +02:00
tobiasd bb0b1918a1 Merge pull request #1192 from fabrixxm/api/jsonp 
add jsonp support to api
 2014-10-17 14:54:26 +02:00
Fabrixxm 9053417179 fix small bug in direct messages api 2014-10-16 11:55:59 +02:00
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