Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 18:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
8261 commits 3 branches 64 tags 248 MiB
Commit graph

8261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
95ee7a3bdc PL: update to the strings 2013-06-28 14:31:57 +02:00
fabrixxm
2ed427b8ca Merge pull request #721 from fabrixxm/master 
uexport: fix full export
 2013-06-28 00:19:56 -07:00
Fabrixxm
759afb4237 uexport: fix full export 
- add new line after each valid json line
- export table row as single json object
 2013-06-28 03:16:25 -04:00
Michael Vogel
edf8bde581 Complete oStatus conversations: Changed from file_get_contents to fetch_url 2013-06-27 22:27:59 +02:00
Fabrixxm
4748b6c4c3 remove unneeded logger function 2013-06-27 09:58:39 -04:00
Fabrixxm
0a1697d13a add pubsubhubbub support to feed contacts 2013-06-27 09:51:13 -04:00
Tobias Diekershoff
bb59c9c32a CA: update to the strings 2013-06-27 07:29:18 +02:00
friendica
9ae4c1fb32 ignore hex escapes as numeric tags 2013-06-26 04:58:54 -07:00
friendica
1d0fccac6e Merge https://github.com/friendica/friendica into pull 2013-06-26 04:07:44 -07:00
friendica
bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
Tobias Diekershoff
42644f6011 DE: update to the strings 2013-06-26 10:42:08 +02:00
Tobias Diekershoff
dbc44f2b56 BG: added translation of the strings from transifex 2013-06-24 19:04:46 +02:00
Tobias Diekershoff
10b8ab5e89 BG: added translation of the strings from transifex 2013-06-24 19:04:25 +02:00
Michael Vogel
9bbf60ac9b Vier: A little rearrangement of the menu order. 2013-06-23 00:26:04 +02:00
Michael Vogel
bd7abe210c Vier: Introductions are now shown. The popup menu when editing a profile is visible again. 2013-06-23 00:07:21 +02:00
Michael Vogel
16737298b4 Merge remote-tracking branch 'upstream/master' 2013-06-22 18:31:28 +02:00
Michael Vogel
e4ce383f2f It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install. 2013-06-22 17:34:52 +02:00
Tobias Diekershoff
7e23221f95 FR: update to the strings 2013-06-22 07:13:44 +02:00
friendica
407473f2ce Merge https://github.com/friendica/friendica into pull 2013-06-21 05:02:43 -07:00
friendica
1c10cf1ad7 -- #039; is not a tag 2013-06-21 05:00:30 -07:00
Tobias Diekershoff
756a1c9c52 IT: update to the strings 2013-06-21 09:00:16 +02:00
Tobias Diekershoff
6d58a5888a NB_NO: update to the strings 2013-06-21 08:56:16 +02:00
Tobias Diekershoff
443d170016 NB_NO: update to the strings 2013-06-20 07:50:19 +02:00
fabrixxm
5cdeef22ea pager: fix stupid typo 2013-06-19 14:28:39 +02:00
Tobias Diekershoff
ecf3c2c9ce NB_NO: update to the strings 2013-06-19 10:57:59 +02:00
fabrixxm
e3bb058e9f Merge pull request #697 from annando/master 
API can now fetch posts from a single thread
 2013-06-17 05:09:54 -07:00
fabrixxm
5ac4d06036 Merge pull request #703 from fabrixxm/master 
fix pagination template
 2013-06-17 01:30:00 -07:00
Fabrixxm
c82e5fde0a pagination: fix template 2013-06-17 04:28:34 -04:00
fabrixxm
7f2d396e6f Merge pull request #695 from fabrixxm/master 
move html from paginate functions to template
 2013-06-17 00:52:30 -07:00
Tobias Diekershoff
f80567ce53 ZH-CN: update to the strings 2013-06-16 14:51:59 +02:00
Tobias Diekershoff
176cb241c2 IT: update to the strings 2013-06-16 14:51:17 +02:00
Tobias Diekershoff
49f33c8841 NB_NO: update to the strings 2013-06-16 14:50:22 +02:00
Tobias Diekershoff
4b02e11eeb CS: update to the strings 2013-06-16 14:49:04 +02:00
Michael Vogel
e246c53b45 API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming. 2013-06-16 13:42:43 +02:00
Michael Vogel
e7aa2b99a1 OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it 
API: It is now possible to fetch only posts from one thread.
 2013-06-16 13:28:04 +02:00
Fabrixxm
faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
friendica
efce5ae1b9 Merge https://github.com/friendica/friendica into pull 2013-06-12 21:42:20 -07:00
friendica
2464915817 don't try to parse empty xml with simplepie, throws conversion warning 2013-06-12 21:41:07 -07:00
tobiasd
65faccbae6 Merge pull request #693 from fabrixxm/moveme 
uimport: set contacts 'avatar-date' to zero
 2013-06-12 21:30:32 -07:00
Fabrixxm
bea89c17fe uimport: set contacts 'avatar-date' to zero. should fix issue #692 2013-06-12 03:51:53 -04:00
tobiasd
ae97ee9040 Merge pull request #691 from annando/master 
OStatus autocompletion improved
 2013-06-10 22:31:51 -07:00
Michael Vogel
323186864e Merge remote-tracking branch 'upstream/master' 2013-06-08 12:30:36 +02:00
Michael Vogel
a2cef94d8b ostatus completion of threads now works with longer threads well. 2013-06-08 12:28:19 +02:00
fermionic
2cd7d7fb0a Merge pull request #690 from fermionic/agpl-20130604-frost-js-crash 
forgot to update Frost autocomplete JS location
 2013-06-04 19:32:43 -07:00
Zach Prezkuta
b4aa018d7b forgot to update Frost autocomplete JS location 2013-06-04 20:29:33 -06:00
friendica
331747d6d9 Merge pull request #689 from fermionic/20130601-cropper-frost-fix 
Modify Cropper to avoid conflicts with jQuery
 2013-06-02 16:44:27 -07:00
Zach Prezkuta
cc4d091db0 remove some now-unnecessary templates 2013-06-01 10:45:32 -06:00
Zach Prezkuta
127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
fabrixxm
032cb5f6a3 Merge pull request #688 from fabrixxm/quattro 
quattro: show notification number in favicon
 2013-05-31 03:22:24 -07:00
Fabrixxm
2111f750fb quattro: show notification number in favicon 2013-05-31 06:18:59 -04:00