MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8258 commits 3 branches 0 tags 96 MiB
Commit graph

8258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff b8aa366496 RU: Update to the strings 2014-02-22 12:40:45 +01:00
Tobias Diekershoff dd356c3d81 NB NO: update to the strings 2014-01-23 07:51:07 +01:00
fabrixxm e312b734ca Merge pull request #899 from fabrixxm/issue_898 
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
 2014-01-21 23:42:04 -08:00
Fabrixxm 682793ccd3 use 'ENT_QUOTES' in xmlify/unxmlify 2014-01-20 02:59:20 -05:00
Tobias Diekershoff aa22598b80 Merge pull request #900 from annando/master 
Beautifiying export of shared posts to other networks
 2014-01-18 22:23:59 -08:00
Michael Vogel de4d0765cb Beautifiying export of shared posts to other networks 2014-01-18 21:32:14 +01:00
fabrixxm d1befd9069 Merge pull request #890 from tobiasd/bbcode_in_registertext 
add bbcode support for the page register textfield (close #871)
 2014-01-18 01:02:02 -08:00
fabrixxm f412934e7d Merge pull request #891 from tobiasd/check_http_in_homepage 
added a check for http in homepage url, this should fix issue #768
 2014-01-18 00:59:17 -08:00
fabrixxm 310cc0cedb Merge pull request #896 from annando/master 
API and Diaspora posting connector
 2014-01-18 00:57:46 -08:00
Tobias Diekershoff c52973f956 red# links to redmatrix.me 2014-01-17 09:25:52 +01:00
Fabrixxm 1e87f4eb8c use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify 2014-01-16 09:08:51 -05:00
Tobias Diekershoff efbd20310a IS: update to the update_fail_eml template 2014-01-16 10:55:31 +01:00
Michael Vogel 62d79a1a5c API: New function "conversation/show" - this is an unoffical Twitter command 2014-01-15 20:35:34 +01:00
fabrixxm 40f414f11e Update messages.po 2014-01-14 10:11:06 +01:00
Michael Vogel c8fcc4cbf8 API: Some more stuff to make the API more complete (compared to the original Twitter API) 2014-01-13 20:03:05 +01:00
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
Tobias Diekershoff 2cc72a1bc7 removed copy and paste leftover 2014-01-13 14:49:49 +01:00
Tobias Diekershoff 1e87780f5d removed copy and paste leftover 2014-01-13 14:45:37 +01:00
Tobias Diekershoff b84502c4e6 move <div> to the register.tpl 2014-01-13 14:40:26 +01:00
Tobias Diekershoff fda7bdca2e better logic 2014-01-13 14:25:50 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 0d7c91fc10 added a check for http in homepage url, this should fix issue #768 2014-01-12 09:16:46 +01:00
Tobias Diekershoff c52ae17df4 add bbcode support for the page register textfield (Bug #871) 2014-01-12 08:40:52 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 6e59cc809e ZH_CN: update to the strings 2014-01-07 08:36:41 +01:00
Tobias Diekershoff 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
Tobias Diekershoff b23ce65035 rev update 2014-01-06 07:36:57 +01:00
Tobias Diekershoff 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
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