Commit graph

Select branches

Hide pull requests

master

#1

#12

#12

#18

#19

#2

#20

#21

#22

#23

#26

#27

#28

#30

#31

#32

#33

#34

#35

#36

#37

#38

#41

#42

#46

#51

#52

#53

#54

#56

#57

#59

#61

2.2

2.21

2.3

2.32

2.33

2.34

2.35

2.36

2.37

2.38

2.39

2.3beta1

2.3beta2

3.0

3.01

3.1

3.2

3.3

3.3-RC

3.3.1

3.3.2

psr4-example

Mono Color

• 8b9ae53242 Merge pull request #713 from annando/master fabrixxm 2013-07-05 12:40:30 -07:00
• 49785130c2 NL: update of the strings Tobias Diekershoff 2013-07-05 12:14:34 +02:00
• b9093c300f FR: update of the strings Tobias Diekershoff 2013-07-05 12:14:20 +02:00
• 3185e49042 PT_BR: update of the strings Tobias Diekershoff 2013-07-05 12:13:43 +02:00
• a4a3ad5327 Merge pull request #720 from fabrixxm/feed_push fabrixxm 2013-07-01 10:16:53 -07:00
• 93dfdf85e8 NL: translation added from transifex Tobias Diekershoff 2013-06-29 10:45:25 +02:00
• 790257c6c2 CS: update to the strings Tobias Diekershoff 2013-06-28 14:36:21 +02:00
• 2f6d0dee7b DE: update to the strings Tobias Diekershoff 2013-06-28 14:35:53 +02:00
• f87631b3f7 ZH_CN: update to the strings Tobias Diekershoff 2013-06-28 14:33:33 +02:00
• 95ee7a3bdc PL: update to the strings Tobias Diekershoff 2013-06-28 14:31:57 +02:00
• 2ed427b8ca Merge pull request #721 from fabrixxm/master fabrixxm 2013-06-28 00:19:56 -07:00
• 759afb4237 uexport: fix full export - add new line after each valid json line - export table row as single json object Fabrixxm 2013-06-28 03:16:25 -04:00
• edf8bde581 Complete oStatus conversations: Changed from file_get_contents to fetch_url Michael Vogel 2013-06-27 22:27:59 +02:00
• 4748b6c4c3 remove unneeded logger function Fabrixxm 2013-06-27 09:58:39 -04:00
• 0a1697d13a add pubsubhubbub support to feed contacts Fabrixxm 2013-06-27 09:51:13 -04:00
• bb59c9c32a CA: update to the strings Tobias Diekershoff 2013-06-27 07:29:18 +02:00
• 9ae4c1fb32 ignore hex escapes as numeric tags friendica 2013-06-26 04:58:54 -07:00
• 1d0fccac6e Merge https://github.com/friendica/friendica into pull friendica 2013-06-26 04:07:44 -07:00
• bfc9cfb82f put tags in items friendica 2013-06-26 04:02:04 -07:00
• 42644f6011 DE: update to the strings Tobias Diekershoff 2013-06-26 10:42:08 +02:00
• dbc44f2b56 BG: added translation of the strings from transifex Tobias Diekershoff 2013-06-24 19:04:46 +02:00
• 10b8ab5e89 BG: added translation of the strings from transifex Tobias Diekershoff 2013-06-24 19:04:25 +02:00
• 9bbf60ac9b Vier: A little rearrangement of the menu order. Michael Vogel 2013-06-23 00:26:04 +02:00
• bd7abe210c Vier: Introductions are now shown. The popup menu when editing a profile is visible again. Michael Vogel 2013-06-23 00:07:21 +02:00
• 16737298b4 Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-06-22 18:31:28 +02:00
• e4ce383f2f It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install. Michael Vogel 2013-06-22 17:34:52 +02:00
• 7e23221f95 FR: update to the strings Tobias Diekershoff 2013-06-22 07:13:44 +02:00
• 407473f2ce Merge https://github.com/friendica/friendica into pull friendica 2013-06-21 05:02:43 -07:00
• 1c10cf1ad7 -- #039; is not a tag friendica 2013-06-21 05:00:30 -07:00
• 756a1c9c52 IT: update to the strings Tobias Diekershoff 2013-06-21 09:00:16 +02:00
• 6d58a5888a NB_NO: update to the strings Tobias Diekershoff 2013-06-21 08:56:16 +02:00
• 443d170016 NB_NO: update to the strings Tobias Diekershoff 2013-06-20 07:50:19 +02:00
• 5cdeef22ea pager: fix stupid typo fabrixxm 2013-06-19 14:28:39 +02:00
• ecf3c2c9ce NB_NO: update to the strings Tobias Diekershoff 2013-06-19 10:57:59 +02:00
• e3bb058e9f Merge pull request #697 from annando/master fabrixxm 2013-06-17 05:09:54 -07:00
• 5ac4d06036 Merge pull request #703 from fabrixxm/master fabrixxm 2013-06-17 01:30:00 -07:00
• c82e5fde0a pagination: fix template Fabrixxm 2013-06-17 04:28:34 -04:00
• 7f2d396e6f Merge pull request #695 from fabrixxm/master fabrixxm 2013-06-17 00:52:30 -07:00
• f80567ce53 ZH-CN: update to the strings Tobias Diekershoff 2013-06-16 14:51:59 +02:00
• 176cb241c2 IT: update to the strings Tobias Diekershoff 2013-06-16 14:51:17 +02:00
• 49f33c8841 NB_NO: update to the strings Tobias Diekershoff 2013-06-16 14:50:22 +02:00
• 4b02e11eeb CS: update to the strings Tobias Diekershoff 2013-06-16 14:49:04 +02:00
• e246c53b45 API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming. Michael Vogel 2013-06-16 13:42:43 +02:00
• 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. Michael Vogel 2013-06-16 13:28:04 +02:00
• faa510befc move html from paginate functions to template Fabrixxm 2013-06-13 08:12:15 -04:00
• efce5ae1b9 Merge https://github.com/friendica/friendica into pull friendica 2013-06-12 21:42:20 -07:00
• 2464915817 don't try to parse empty xml with simplepie, throws conversion warning friendica 2013-06-12 21:41:07 -07:00
• 65faccbae6 Merge pull request #693 from fabrixxm/moveme tobiasd 2013-06-12 21:30:32 -07:00
• bea89c17fe uimport: set contacts 'avatar-date' to zero. should fix issue #692 Fabrixxm 2013-06-12 03:51:53 -04:00
• ae97ee9040 Merge pull request #691 from annando/master tobiasd 2013-06-10 22:31:51 -07:00
• 323186864e Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-06-08 12:30:36 +02:00
• a2cef94d8b ostatus completion of threads now works with longer threads well. Michael Vogel 2013-06-08 12:28:19 +02:00
• 2cd7d7fb0a Merge pull request #690 from fermionic/agpl-20130604-frost-js-crash fermionic 2013-06-04 19:32:43 -07:00
• b4aa018d7b forgot to update Frost autocomplete JS location Zach Prezkuta 2013-06-04 20:25:52 -06:00
• 331747d6d9 Merge pull request #689 from fermionic/20130601-cropper-frost-fix friendica 2013-06-02 16:44:27 -07:00
• cc4d091db0 remove some now-unnecessary templates Zach Prezkuta 2013-06-01 10:44:20 -06:00
• 127b7a589e eliminate Cropper conflicts with jQuery Zach Prezkuta 2013-06-01 10:42:51 -06:00
• 032cb5f6a3 Merge pull request #688 from fabrixxm/quattro fabrixxm 2013-05-31 03:22:24 -07:00
• 2111f750fb quattro: show notification number in favicon Fabrixxm 2013-05-31 06:18:59 -04:00
• f153a4c9a1 PT-BR: update to the strings Tobias Diekershoff 2013-05-30 06:22:47 +02:00
• 57b80923cf PT-BR: update to the strings Tobias Diekershoff 2013-05-29 21:49:36 +02:00
• 5b1561334b DE: update to the strings Tobias Diekershoff 2013-05-29 21:48:59 +02:00
• 02c1aba3bb Merge pull request #687 from tobiasd/bug_540 tobiasd 2013-05-29 08:25:23 -07:00
• 5113885427 fix 540 in vier Tobias Diekershoff 2013-05-29 17:10:49 +02:00
• c3807d6828 Merge pull request #686 from abinoam/master fabrixxm 2013-05-29 06:10:03 -07:00
• a29f592ba7 Fix tiny typo on mod/uimport.php Abinoam Jr 2013-05-29 10:00:35 -03:00
• 8c22d8dad5 Merge pull request #685 from tobiasd/540_for_quattro tobiasd 2013-05-29 01:47:40 -07:00
• c82ab9e1b5 fix bug #540 for quattro themes Tobias Diekershoff 2013-05-29 10:44:09 +02:00
• 8fe82d35d4 Merge https://github.com/friendica/friendica into pull friendica 2013-05-28 04:53:27 -07:00
• b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) friendica 2013-05-28 04:52:22 -07:00
• f8d433685c Merge pull request #684 from tobiasd/rhash tobiasd 2013-05-26 23:37:20 -07:00
• 2b09b8ae17 make red# available as a smilie Tobias Diekershoff 2013-05-27 08:34:12 +02:00
• 53342dd7f9 red hash icon 16px imported from red Tobias Diekershoff 2013-05-27 08:32:55 +02:00
• ca623641ca CS: update to the strings Tobias Diekershoff 2013-05-25 07:29:24 +02:00
• ec14d06647 Merge https://github.com/friendica/friendica into pull friendica 2013-05-22 22:32:18 -07:00
• 0cc641fbbc messaging friendica 2013-05-22 22:30:53 -07:00
• 1732de5c64 PL: update to the strings Tobias Diekershoff 2013-05-23 06:30:34 +02:00
• 814ab32334 Update README friendica 2013-05-23 10:10:49 +10:00
• ed6ca1d384 rev update friendica 2013-05-21 22:37:51 -07:00
• 3381afab3d Merge https://github.com/friendica/friendica into pull friendica 2013-05-20 17:37:23 -07:00
• a1c4d0ca93 fix include paths when started via cmdline friendica 2013-05-20 17:36:29 -07:00
• c5ed831b6a Merge pull request #681 from annando/master friendica 2013-05-19 02:59:21 -07:00
• 0723933c1c removing of hashtag addresses is now hidden behind a configuration Michael Vogel 2013-05-19 11:08:08 +02:00
• 024fe68d71 Merge https://github.com/friendica/friendica into pull friendica 2013-05-18 16:03:35 -07:00
• 6ec1bd2fa8 double quotes in title mess up editpost friendica 2013-05-18 16:02:31 -07:00
• 5ef6bdf88a Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-05-18 20:52:08 +02:00
• ba6faa91e2 Merge pull request #680 from fuzzgun/master friendica 2013-05-18 05:33:06 -07:00
• 8e9852dcba Missing smarty3 directory prevents installation root 2013-05-18 11:10:22 +01:00
• 03c489150c Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-05-17 08:08:34 +02:00
• f840d72885 DE: update to the strings Tobias Diekershoff 2013-05-17 06:42:28 +02:00
• 4d105f06e8 CA: update to the strings Tobias Diekershoff 2013-05-16 06:42:13 +02:00
• d4240a265b When converting to HTML, hashtag addresses are now removed (only when the message is exported) Michael Vogel 2013-05-15 22:20:06 +02:00
• 636fef1ffa DE: update to the strings Tobias Diekershoff 2013-05-14 19:17:44 +02:00
• 0ce68665c6 check_config is gone - use check_db friendica 2013-05-13 17:22:07 -07:00
• aee7429967 Merge https://github.com/friendica/friendica into pull friendica 2013-05-11 17:04:51 -07:00
• e8fc26e74e rev update friendica 2013-05-11 17:04:23 -07:00
• b4bedbd082 Merge pull request #679 from fermionic/20130511-update-videojs fermionic 2013-05-11 11:41:57 -07:00
• db0a891a97 fix preloading Zach Prezkuta 2013-05-11 12:40:09 -06:00
• d34445a0ea Merge pull request #678 from fermionic/20130511-update-videojs fermionic 2013-05-11 09:57:41 -07:00
• 35358baac9 update to v4.0.0; point to local host of SWF Zach Prezkuta 2013-05-11 10:49:54 -06:00