friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
8,403 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

8403 Commits

Author SHA1 Message Date
Tobias Diekershoff 573e0128d6 rev update 2013-12-31 18:01:20 +01:00
Michael Vogel c463fab8b8 API: Sending direct messages now works again. Some more things to make Friendica work better with AndStatus 2013-12-29 17:54:37 +01:00
Michael Vogel b0a1f4e1b9 API: Bugfix: Wrong contact ids with direct messages 2013-12-27 14:11:13 +01:00
fabrixxm 7b5018fb76 Merge pull request #872 from annando/master 
API: Supporting twidere, better supporting of the network field in the item table
 2013-12-27 00:15:44 -08:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Michael Vogel a96d6f835c API: Supporting twidere 2013-12-27 01:48:43 +01:00
fabrixxm 230ce659bd Merge pull request #866 from annando/master 
API: reworked
 2013-12-26 02:12:27 -08:00
fabrixxm c0212c09ec Merge pull request #867 from tobiasd/remote_me_option 
remote_self as option
 2013-12-26 02:02:21 -08:00
Michael Vogel a0360ec976 API: Add the network name to the application name 2013-12-23 14:06:53 +01:00
Tobias Diekershoff 25d83f780d only show the remote_self option if admin allows it 2013-12-22 19:30:09 +01:00
Tobias Diekershoff f515def280 added remote_self as option to the contact repair dislog 2013-12-22 17:05:49 +01:00
Tobias Diekershoff 22a6c72b31 added option to the admin panel to allow users to set the remote_self flag 2013-12-22 16:14:34 +01:00
Tobias Diekershoff f93a4e13b8 PL: update to the strings 2013-12-21 16:32:06 +01:00
Michael Vogel 165a201ca7 API: Added better error handling, make some more api calls similar to statusnet 2013-12-20 23:07:11 +01:00
Michael Vogel 9cfa60fe15 API: reply-to-Values should be all correct now. "since_id" now works with mails. 2013-12-19 06:58:11 +01:00
Fabrixxm 53dc1ce31f fix textarea/tinymce, add contact id to mention 2013-12-18 10:48:09 -05:00
Fabrixxm 9a94c35120 acl selector add and remove mentions when a forum is selected. 2013-12-18 10:18:26 -05:00
fabrixxm 76604f62da Merge pull request #862 from fabrixxm/manage_contacts 
change action container div class to id. fix bug in quattro theme
 2013-12-18 03:40:41 -08:00
Fabrixxm 06e8f31695 change action container div class to id. fix bug in quattro theme 2013-12-18 06:38:57 -05:00
fabrixxm 7bd9831c2d Merge pull request #859 from fabrixxm/manage_contacts 
Improvements in contact management
 2013-12-18 02:14:13 -08:00
Fabrixxm 9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
Michael Vogel 5130b19f5e API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus) 2013-12-15 23:00:47 +01:00
Tobias Diekershoff 68e0324c1b Merge pull request #853 from annando/master 
Bugfix of the previous bugfix :)
 2013-12-11 23:23:30 -08:00
fabrixxm 628bfbc220 Merge pull request #854 from fabrixxm/issue-823 
Add better support to small screen to duepuntozero theme.
 2013-12-11 02:29:37 -08:00
Fabrixxm 9474a0deed Add better support to small screen to duepuntozero theme. 
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.
 2013-12-11 05:25:41 -05:00
Michael Vogel 5d3ebcc2cf Bugfix of the bugfix :) 2013-12-10 21:16:13 +01:00
Michael Vogel d487cb2078 vier: Screenshot updated 2013-12-10 20:56:50 +01:00
Tobias Diekershoff b5785c3f16 Merge pull request #852 from annando/master 
Bugfix: Problem with page switching with the old pager solved
 2013-12-10 07:30:26 -08:00
Michael Vogel eca9431909 Bugfix: Problem with page switching with the old pager solved 2013-12-10 15:45:26 +01:00
Tobias Diekershoff 55e8e03e38 Merge pull request #851 from annando/master 
Keeping an offset for page switching
 2013-12-10 02:22:18 -08:00
Michael Vogel 7e5c8ab91c Keeping an offset for page switching: This helps so that you don't see old messages 2013-12-10 00:13:19 +01:00
Tobias Diekershoff c56e0ab0cc Merge pull request #850 from annando/master 
New style for shared links. Preparation for changes in some addons
 2013-12-08 23:15:07 -08:00
Michael Vogel d20d2f74ae Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms 2013-12-08 20:10:28 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Tobias Diekershoff 19984f786b Merge pull request #849 from annando/master 
SQL improvements. New parameter for a maximum amount of comments per thread
 2013-12-08 06:53:57 -08:00
Michael Vogel 3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread 2013-12-08 14:49:24 +01:00
Tobias Diekershoff aa7b05e8dc Merge pull request #848 from annando/master 
New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.
 2013-12-06 03:31:19 -08:00
Michael Vogel 285584e8d6 Minimal: Disable loading of content at the end of the page, since it makes problems at the moment. 2013-12-05 20:41:30 +01:00
Michael Vogel b750379a47 Merge remote-tracking branch 'upstream/master' 2013-12-05 00:13:31 +01:00
Michael Vogel 3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00
Tobias Diekershoff 916b2e7438 Merge pull request #845 from annando/master 
Many small bugfixes and features ...
 2013-12-03 10:39:23 -08:00
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements) 2013-12-02 20:30:24 +01:00
Michael Vogel 1d19e056e7 Sorting plugins after priority and name (better for the configuration page) 2013-12-02 20:28:30 +01:00
Michael Vogel e875a104ce dangerous values in usernames for shared messages from diaspora are now encoded. 2013-12-02 20:26:57 +01:00
Michael Vogel 3331e71e8e disable the output of the "posted" value in shares when item cache is enabled. 2013-12-02 20:25:43 +01:00
Michael Vogel 4f38969148 Optional parameter for parseurl to only fetch data from meta information 2013-12-02 20:24:41 +01:00
fabrixxm 5f0cb264af Merge pull request #843 from annando/master 
multiple admin mails
 2013-12-02 00:35:13 -08:00
Michael Vogel 70e017745a Just some code beautification. 2013-12-02 00:41:59 +01:00
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
	mod/settings.php
 2013-12-02 00:33:46 +01:00
Michael Vogel 6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00