Michael Vogel
|
17236b1801
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
include/acl_selectors.php
|
2014-01-13 19:59:34 +01:00 |
|
Michael Vogel
|
43e916e81a
|
New network constant for the Diaspora posting connector.
|
2014-01-13 19:57:15 +01:00 |
|
|
|
2cc72a1bc7
|
removed copy and paste leftover
|
2014-01-13 14:49:49 +01:00 |
|
|
|
1e87780f5d
|
removed copy and paste leftover
|
2014-01-13 14:45:37 +01:00 |
|
|
|
b84502c4e6
|
move <div> to the register.tpl
|
2014-01-13 14:40:26 +01:00 |
|
|
|
fda7bdca2e
|
better logic
|
2014-01-13 14:25:50 +01:00 |
|
|
|
7c8e2e46d8
|
Merge pull request #894 from tobiasd/diabook_rememberme
added remember me checkbox to diabook login template
|
2014-01-12 23:49:43 -08:00 |
|
|
|
d4d3fa90e7
|
added remember me checkbox to diabook login template
|
2014-01-13 08:48:19 +01:00 |
|
Michael Vogel
|
52b260982c
|
Avoiding a warning in the error.log
|
2014-01-13 07:49:10 +01:00 |
|
Michael Vogel
|
de9a02b9ae
|
Some small bugfixes (mostly warnings) and little improvements to the log
|
2014-01-13 01:34:54 +01:00 |
|
Oliver
|
e433dfad71
|
Quick fix: star and lock position on starred posts
|
2014-01-12 12:42:56 +01:00 |
|
|
|
0d7c91fc10
|
added a check for http in homepage url, this should fix issue #768
|
2014-01-12 09:16:46 +01:00 |
|
|
|
c52ae17df4
|
add bbcode support for the page register textfield (Bug #871)
|
2014-01-12 08:40:52 +01:00 |
|
|
|
964f2bc4b1
|
FR: update to the strings
|
2014-01-09 08:37:10 +01:00 |
|
fabrixxm
|
63b8b5761d
|
Merge pull request #888 from annando/master
Some more API improvements
|
2014-01-08 05:57:43 -08: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 |
|
|
|
6e59cc809e
|
ZH_CN: update to the strings
|
2014-01-07 08:36:41 +01:00 |
|
|
|
fb0c522b50
|
CS: update to the strings
|
2014-01-07 08:32:26 +01:00 |
|
fabrixxm
|
2578211e47
|
Merge pull request #886 from fabrixxm/illegaloffset
acl_automention: fix warning in include/config.php
|
2014-01-06 02:01:01 -08:00 |
|
fabrixxm
|
910f56b698
|
acl_automention: fix warning in include/config.php
|
2014-01-06 10:58:39 +01:00 |
|
|
|
b23ce65035
|
rev update
|
2014-01-06 07:36:57 +01:00 |
|
|
|
91ff025333
|
Merge pull request #884 from annando/master
Notifications for new posts, API changes, several other things ...
|
2014-01-05 22:34:51 -08: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 |
|
|
|
0d159a77a7
|
rev update
|
2014-01-03 10:02:17 +01:00 |
|
|
|
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 |
|
|
|
a5aa4bfbde
|
DE: update to the strings
|
2014-01-01 11:31:05 +01:00 |
|
|
|
0c0419bc95
|
Merge pull request #873 from annando/master
API: Bugfix: Wrong contact ids with direct messages
|
2014-01-01 01:30:11 -08:00 |
|
|
|
a13abb08df
|
Merge pull request #874 from tobiasd/20131231
regenerated the util/message.po
|
2013-12-31 09:22:53 -08:00 |
|
|
|
eaaa7b563b
|
regenerated the util/message.po file so translations can get the new strings
|
2013-12-31 18:18:47 +01:00 |
|
|
|
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 |
|
|
|
25d83f780d
|
only show the remote_self option if admin allows it
|
2013-12-22 19:30:09 +01:00 |
|
