Commit Graph

8223 Commits

Author SHA1 Message Date
Michael Vogel de9a02b9ae Some small bugfixes (mostly warnings) and little improvements to the log 2014-01-13 01:34:54 +01:00
Michael Vogel 1bf9d99be2 API: Repeat and destroy now are returning the correct values. The user object now returns the contact id. Repeating of shared items now work. 2014-01-08 01:14:58 +01:00
Michael Vogel 3b32505d14 API: Bugfix that wrong contact data was sent 2014-01-05 16:57:05 +01:00
Michael Vogel 8eedebfee3 Cleaning up some changes from the merge 2014-01-05 16:28:42 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel b4c3f02538 API: Several improvements to make the api more compatible 2014-01-05 16:12:03 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm e97a579856 Merge pull request #879 from fabrixxm/acl_automention
acl automention: fix stupid typo...
2014-01-03 07:00:39 -08:00
fabrixxm 67f844f561 acl automention: fix stupid typo... 2014-01-03 15:17:46 +01:00
fabrixxm b0e8dbc4da Merge pull request #864 from fabrixxm/acl_automention
Acl automention
2014-01-03 06:09:12 -08:00
fabrixxm ad5a47aecf add fetaure switch for acl-automention 2014-01-03 14:40:43 +01:00
Tobias Diekershoff 0d159a77a7 rev update 2014-01-03 10:02:17 +01:00
Tobias Diekershoff 18ce32633b Merge pull request #876 from annando/master
API: Show shared messages as repeated messages, improvements with nick names
2014-01-03 01:00:21 -08:00
Michael Vogel fa431e84c2 API: Show shared messages as repeated messages, improvements with nick names 2014-01-02 22:29:44 +01:00
fabrixxm 0b0bac73b6 Merge pull request #875 from fabrixxm/fix_api
api: fix call-time pass-by-reference error
2014-01-02 10:16:05 -08:00
fabrixxm 68030a79cd api: fix call-time pass-by-reference error 2014-01-02 19:12:26 +01:00
Tobias Diekershoff a5aa4bfbde DE: update to the strings 2014-01-01 11:31:05 +01:00
Tobias Diekershoff 0c0419bc95 Merge pull request #873 from annando/master
API: Bugfix: Wrong contact ids with direct messages
2014-01-01 01:30:11 -08:00
Tobias Diekershoff a13abb08df Merge pull request #874 from tobiasd/20131231
regenerated the util/message.po
2013-12-31 09:22:53 -08:00
Tobias Diekershoff eaaa7b563b regenerated the util/message.po file so translations can get the new strings 2013-12-31 18:18:47 +01:00
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