Commit Graph

7928 Commits

Author SHA1 Message Date
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
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
Tobias Diekershoff f153a4c9a1 PT-BR: update to the strings 2013-05-30 06:22:47 +02:00
Tobias Diekershoff 57b80923cf PT-BR: update to the strings 2013-05-29 21:49:36 +02:00
Tobias Diekershoff 5b1561334b DE: update to the strings 2013-05-29 21:48:59 +02:00
tobiasd 02c1aba3bb Merge pull request #687 from tobiasd/bug_540
fix 540 in vier
2013-05-29 08:25:23 -07:00
Tobias Diekershoff 5113885427 fix 540 in vier 2013-05-29 17:10:49 +02:00
fabrixxm c3807d6828 Merge pull request #686 from abinoam/master
Fix tiny typo on mod/uimport.php
2013-05-29 06:10:03 -07:00
Abinoam Jr a29f592ba7 Fix tiny typo on mod/uimport.php 2013-05-29 10:00:35 -03:00
tobiasd 8c22d8dad5 Merge pull request #685 from tobiasd/540_for_quattro
fix bug #540 for quattro themes
2013-05-29 01:47:40 -07:00
Tobias Diekershoff c82ab9e1b5 fix bug #540 for quattro themes 2013-05-29 10:44:09 +02:00
friendica 8fe82d35d4 Merge https://github.com/friendica/friendica into pull 2013-05-28 04:53:27 -07:00
friendica b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) 2013-05-28 04:52:22 -07:00
tobiasd f8d433685c Merge pull request #684 from tobiasd/rhash
Rhash
2013-05-26 23:37:20 -07:00
Tobias Diekershoff 2b09b8ae17 make red# available as a smilie 2013-05-27 08:34:12 +02:00
Tobias Diekershoff 53342dd7f9 red hash icon 16px imported from red 2013-05-27 08:32:55 +02:00
Tobias Diekershoff ca623641ca CS: update to the strings 2013-05-25 07:29:24 +02:00
friendica ec14d06647 Merge https://github.com/friendica/friendica into pull 2013-05-22 22:32:18 -07:00
friendica 0cc641fbbc messaging 2013-05-22 22:30:53 -07:00
Tobias Diekershoff 1732de5c64 PL: update to the strings 2013-05-23 06:30:34 +02:00
friendica 814ab32334 Update README 2013-05-23 10:10:49 +10:00
friendica ed6ca1d384 rev update 2013-05-21 22:37:51 -07:00
friendica 3381afab3d Merge https://github.com/friendica/friendica into pull 2013-05-20 17:37:23 -07:00
friendica a1c4d0ca93 fix include paths when started via cmdline 2013-05-20 17:36:29 -07:00
friendica c5ed831b6a Merge pull request #681 from annando/master
Remove hashtag links when exporting to other networks
2013-05-19 02:59:21 -07:00
Michael Vogel 0723933c1c removing of hashtag addresses is now hidden behind a configuration 2013-05-19 11:08:08 +02:00
friendica 024fe68d71 Merge https://github.com/friendica/friendica into pull 2013-05-18 16:03:35 -07:00
friendica 6ec1bd2fa8 double quotes in title mess up editpost 2013-05-18 16:02:31 -07:00
Michael Vogel 5ef6bdf88a Merge remote-tracking branch 'upstream/master' 2013-05-18 20:52:08 +02:00
friendica ba6faa91e2 Merge pull request #680 from fuzzgun/master
Missing smarty3 directory prevents installation
2013-05-18 05:33:06 -07:00
root 8e9852dcba Missing smarty3 directory prevents installation 2013-05-18 11:10:22 +01:00
Michael Vogel 03c489150c Merge remote-tracking branch 'upstream/master' 2013-05-17 08:08:34 +02:00
Tobias Diekershoff f840d72885 DE: update to the strings 2013-05-17 06:42:28 +02:00
Tobias Diekershoff 4d105f06e8 CA: update to the strings 2013-05-16 06:42:13 +02:00
Michael Vogel d4240a265b When converting to HTML, hashtag addresses are now removed (only when the message is exported) 2013-05-15 22:20:06 +02:00