clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 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
  • 3ce41a78b4 Merge pull request #676 from fermionic/20130511-loading-home-page-for-image fermionic 2013-05-11 09:04:45 -07:00
  • 5d30008ab3 don't set img src in notifications to blank Zach Prezkuta 2013-05-11 09:43:21 -06:00
  • 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support fermionic 2013-05-11 08:33:36 -07:00
  • 06ab3eb44f DE: update to the strings Tobias Diekershoff 2013-05-09 19:07:20 +02:00
  • 218be8a3c0 DE: Update to the strings Tobias Diekershoff 2013-05-09 18:40:11 +02:00
  • ba6b2718cf DE: update to the strings Tobias Diekershoff 2013-05-09 18:38:57 +02:00
  • ef4ebd8546 remove stub code friendica 2013-05-09 01:17:11 -07:00
  • 3339f55310 Merge https://github.com/friendica/friendica into pull friendica 2013-05-09 01:15:40 -07:00
  • 2c8d33a6e2 rev update friendica 2013-05-09 01:15:22 -07:00
  • b06dab97ba modified: view/theme/smoothly/default.php modified: view/theme/smoothly/style.css new file: view/theme/smoothly/templates/tools.tpl modified: view/theme/smoothly/theme.php pixelroot 2013-05-08 14:46:42 +02:00
  • a2102e1ca0 Merge remote branch 'upstream/master' pixelroot 2013-05-08 11:09:39 +02:00
  • e90c89f3fc new file: view/theme/smoothly/images/power.png new file: view/theme/smoothly/images/up.png pixelroot 2013-05-08 11:09:08 +02:00
  • 523548ff22 modified: view/theme/smoothly/default.php modified: view/theme/smoothly/images/down.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/images/power.png view/theme/smoothly/images/up.png pixelroot 2013-05-08 11:08:21 +02:00
  • 2da4f8268e fix smarty3 folder not writable message fabrixxm 2013-05-08 11:34:30 +03:00
  • 1e3455d71a Merge pull request #675 from fabrixxm/templateengine fabrixxm 2013-05-08 00:29:02 -07:00
  • 4bf41b8e5d check if view/smarty3 folder is writable by webserver Fabrixxm 2013-05-08 03:26:20 -04:00