]>
git.mxchange.org Git - friendica.git/log
Tobias Diekershoff [Sat, 29 Jun 2013 08:45:25 +0000 (10:45 +0200)]
NL: translation added from transifex
Tobias Diekershoff [Fri, 28 Jun 2013 12:36:21 +0000 (14:36 +0200)]
CS: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:35:53 +0000 (14:35 +0200)]
DE: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:33:33 +0000 (14:33 +0200)]
ZH_CN: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:31:57 +0000 (14:31 +0200)]
PL: update to the strings
fabrixxm [Fri, 28 Jun 2013 07:19:56 +0000 (00:19 -0700)]
Merge pull request #721 from fabrixxm/master
uexport: fix full export
Fabrixxm [Fri, 28 Jun 2013 07:16:25 +0000 (03:16 -0400)]
uexport: fix full export
- add new line after each valid json line
- export table row as single json object
Tobias Diekershoff [Thu, 27 Jun 2013 05:29:18 +0000 (07:29 +0200)]
CA: update to the strings
friendica [Wed, 26 Jun 2013 11:58:54 +0000 (04:58 -0700)]
ignore hex escapes as numeric tags
friendica [Wed, 26 Jun 2013 11:07:44 +0000 (04:07 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 26 Jun 2013 11:02:04 +0000 (04:02 -0700)]
put tags in items
Tobias Diekershoff [Wed, 26 Jun 2013 08:42:08 +0000 (10:42 +0200)]
DE: update to the strings
Tobias Diekershoff [Mon, 24 Jun 2013 17:04:46 +0000 (19:04 +0200)]
BG: added translation of the strings from transifex
Tobias Diekershoff [Mon, 24 Jun 2013 17:04:25 +0000 (19:04 +0200)]
BG: added translation of the strings from transifex
Tobias Diekershoff [Sat, 22 Jun 2013 05:13:44 +0000 (07:13 +0200)]
FR: update to the strings
friendica [Fri, 21 Jun 2013 12:02:43 +0000 (05:02 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 21 Jun 2013 12:00:30 +0000 (05:00 -0700)]
-- #039; is not a tag
Tobias Diekershoff [Fri, 21 Jun 2013 07:00:16 +0000 (09:00 +0200)]
IT: update to the strings
Tobias Diekershoff [Fri, 21 Jun 2013 06:56:16 +0000 (08:56 +0200)]
NB_NO: update to the strings
Tobias Diekershoff [Thu, 20 Jun 2013 05:50:19 +0000 (07:50 +0200)]
NB_NO: update to the strings
fabrixxm [Wed, 19 Jun 2013 12:28:39 +0000 (14:28 +0200)]
pager: fix stupid typo
Tobias Diekershoff [Wed, 19 Jun 2013 08:57:59 +0000 (10:57 +0200)]
NB_NO: update to the strings
fabrixxm [Mon, 17 Jun 2013 12:09:54 +0000 (05:09 -0700)]
Merge pull request #697 from annando/master
API can now fetch posts from a single thread
fabrixxm [Mon, 17 Jun 2013 08:30:00 +0000 (01:30 -0700)]
Merge pull request #703 from fabrixxm/master
fix pagination template
Fabrixxm [Mon, 17 Jun 2013 08:28:34 +0000 (04:28 -0400)]
pagination: fix template
fabrixxm [Mon, 17 Jun 2013 07:52:30 +0000 (00:52 -0700)]
Merge pull request #695 from fabrixxm/master
move html from paginate functions to template
Tobias Diekershoff [Sun, 16 Jun 2013 12:51:59 +0000 (14:51 +0200)]
ZH-CN: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:51:17 +0000 (14:51 +0200)]
IT: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:50:22 +0000 (14:50 +0200)]
NB_NO: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:49:04 +0000 (14:49 +0200)]
CS: update to the strings
Michael Vogel [Sun, 16 Jun 2013 11:42:43 +0000 (13:42 +0200)]
API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.
Michael Vogel [Sun, 16 Jun 2013 11:28:04 +0000 (13:28 +0200)]
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.
Fabrixxm [Thu, 13 Jun 2013 12:12:15 +0000 (08:12 -0400)]
move html from paginate functions to template
friendica [Thu, 13 Jun 2013 04:42:20 +0000 (21:42 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 13 Jun 2013 04:41:07 +0000 (21:41 -0700)]
don't try to parse empty xml with simplepie, throws conversion warning
tobiasd [Thu, 13 Jun 2013 04:30:32 +0000 (21:30 -0700)]
Merge pull request #693 from fabrixxm/moveme
uimport: set contacts 'avatar-date' to zero
Fabrixxm [Wed, 12 Jun 2013 07:51:53 +0000 (03:51 -0400)]
uimport: set contacts 'avatar-date' to zero. should fix issue #692
tobiasd [Tue, 11 Jun 2013 05:31:51 +0000 (22:31 -0700)]
Merge pull request #691 from annando/master
OStatus autocompletion improved
Michael Vogel [Sat, 8 Jun 2013 10:30:36 +0000 (12:30 +0200)]
Merge remote-tracking branch 'upstream/master'
Michael Vogel [Sat, 8 Jun 2013 10:28:19 +0000 (12:28 +0200)]
ostatus completion of threads now works with longer threads well.
fermionic [Wed, 5 Jun 2013 02:32:43 +0000 (19:32 -0700)]
Merge pull request #690 from fermionic/agpl-
20130604 -frost-js-crash
forgot to update Frost autocomplete JS location
Zach Prezkuta [Wed, 5 Jun 2013 02:25:52 +0000 (20:25 -0600)]
forgot to update Frost autocomplete JS location
friendica [Sun, 2 Jun 2013 23:44:27 +0000 (16:44 -0700)]
Merge pull request #689 from fermionic/
20130601 -cropper-frost-fix
Modify Cropper to avoid conflicts with jQuery
Zach Prezkuta [Sat, 1 Jun 2013 16:44:20 +0000 (10:44 -0600)]
remove some now-unnecessary templates
Zach Prezkuta [Sat, 1 Jun 2013 16:42:51 +0000 (10:42 -0600)]
eliminate Cropper conflicts with jQuery
fabrixxm [Fri, 31 May 2013 10:22:24 +0000 (03:22 -0700)]
Merge pull request #688 from fabrixxm/quattro
quattro: show notification number in favicon
Fabrixxm [Fri, 31 May 2013 10:18:59 +0000 (06:18 -0400)]
quattro: show notification number in favicon
Tobias Diekershoff [Thu, 30 May 2013 04:22:47 +0000 (06:22 +0200)]
PT-BR: update to the strings
Tobias Diekershoff [Wed, 29 May 2013 19:49:36 +0000 (21:49 +0200)]
PT-BR: update to the strings
Tobias Diekershoff [Wed, 29 May 2013 19:48:59 +0000 (21:48 +0200)]
DE: update to the strings
tobiasd [Wed, 29 May 2013 15:25:23 +0000 (08:25 -0700)]
Merge pull request #687 from tobiasd/bug_540
fix 540 in vier
Tobias Diekershoff [Wed, 29 May 2013 15:10:49 +0000 (17:10 +0200)]
fix 540 in vier
fabrixxm [Wed, 29 May 2013 13:10:03 +0000 (06:10 -0700)]
Merge pull request #686 from abinoam/master
Fix tiny typo on mod/uimport.php
Abinoam Jr [Wed, 29 May 2013 13:00:35 +0000 (10:00 -0300)]
Fix tiny typo on mod/uimport.php
tobiasd [Wed, 29 May 2013 08:47:40 +0000 (01:47 -0700)]
Merge pull request #685 from tobiasd/540_for_quattro
fix bug #540 for quattro themes
Tobias Diekershoff [Wed, 29 May 2013 08:44:09 +0000 (10:44 +0200)]
fix bug #540 for quattro themes
friendica [Tue, 28 May 2013 11:53:27 +0000 (04:53 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 28 May 2013 11:52:22 +0000 (04:52 -0700)]
provide bbcode translation for imported red zmg tag (img tag with zot-id)
tobiasd [Mon, 27 May 2013 06:37:20 +0000 (23:37 -0700)]
Merge pull request #684 from tobiasd/rhash
Rhash
Tobias Diekershoff [Mon, 27 May 2013 06:34:12 +0000 (08:34 +0200)]
make red# available as a smilie
Tobias Diekershoff [Mon, 27 May 2013 06:32:55 +0000 (08:32 +0200)]
red hash icon 16px imported from red
Tobias Diekershoff [Sat, 25 May 2013 05:29:24 +0000 (07:29 +0200)]
CS: update to the strings
friendica [Thu, 23 May 2013 05:32:18 +0000 (22:32 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 23 May 2013 05:30:53 +0000 (22:30 -0700)]
messaging
Tobias Diekershoff [Thu, 23 May 2013 04:30:34 +0000 (06:30 +0200)]
PL: update to the strings
friendica [Thu, 23 May 2013 00:10:49 +0000 (10:10 +1000)]
Update README
friendica [Wed, 22 May 2013 05:37:51 +0000 (22:37 -0700)]
rev update
friendica [Tue, 21 May 2013 00:37:23 +0000 (17:37 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 21 May 2013 00:36:29 +0000 (17:36 -0700)]
fix include paths when started via cmdline
friendica [Sun, 19 May 2013 09:59:21 +0000 (02:59 -0700)]
Merge pull request #681 from annando/master
Remove hashtag links when exporting to other networks
Michael Vogel [Sun, 19 May 2013 09:08:08 +0000 (11:08 +0200)]
removing of hashtag addresses is now hidden behind a configuration
friendica [Sat, 18 May 2013 23:03:35 +0000 (16:03 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sat, 18 May 2013 23:02:31 +0000 (16:02 -0700)]
double quotes in title mess up editpost
Michael Vogel [Sat, 18 May 2013 18:52:08 +0000 (20:52 +0200)]
Merge remote-tracking branch 'upstream/master'
friendica [Sat, 18 May 2013 12:33:06 +0000 (05:33 -0700)]
Merge pull request #680 from fuzzgun/master
Missing smarty3 directory prevents installation
root [Sat, 18 May 2013 10:10:22 +0000 (11:10 +0100)]
Missing smarty3 directory prevents installation
Michael Vogel [Fri, 17 May 2013 06:08:34 +0000 (08:08 +0200)]
Merge remote-tracking branch 'upstream/master'
Tobias Diekershoff [Fri, 17 May 2013 04:42:28 +0000 (06:42 +0200)]
DE: update to the strings
Tobias Diekershoff [Thu, 16 May 2013 04:42:13 +0000 (06:42 +0200)]
CA: update to the strings
Michael Vogel [Wed, 15 May 2013 20:20:06 +0000 (22:20 +0200)]
When converting to HTML, hashtag addresses are now removed (only when the message is exported)
Tobias Diekershoff [Tue, 14 May 2013 17:17:44 +0000 (19:17 +0200)]
DE: update to the strings
friendica [Tue, 14 May 2013 00:22:07 +0000 (17:22 -0700)]
check_config is gone - use check_db
friendica [Sun, 12 May 2013 00:04:51 +0000 (17:04 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 12 May 2013 00:04:23 +0000 (17:04 -0700)]
rev update
fermionic [Sat, 11 May 2013 18:41:57 +0000 (11:41 -0700)]
Merge pull request #679 from fermionic/
20130511 -update-videojs
fix preloading
Zach Prezkuta [Sat, 11 May 2013 18:40:09 +0000 (12:40 -0600)]
fix preloading
fermionic [Sat, 11 May 2013 16:57:41 +0000 (09:57 -0700)]
Merge pull request #678 from fermionic/
20130511 -update-videojs
update to v4.0.0; point to local host of SWF
Zach Prezkuta [Sat, 11 May 2013 16:49:54 +0000 (10:49 -0600)]
update to v4.0.0; point to local host of SWF
fermionic [Sat, 11 May 2013 16:04:45 +0000 (09:04 -0700)]
Merge pull request #676 from fermionic/
20130511 -loading-home-page-for-image
don't set img src in notifications to blank
Zach Prezkuta [Sat, 11 May 2013 15:43:21 +0000 (09:43 -0600)]
don't set img src in notifications to blank
fermionic [Sat, 11 May 2013 15:33:36 +0000 (08:33 -0700)]
Merge pull request #674 from fermionic/
20130503 -basic-video-support
basic video playback support using VideoJS
Tobias Diekershoff [Thu, 9 May 2013 17:07:20 +0000 (19:07 +0200)]
DE: update to the strings
Tobias Diekershoff [Thu, 9 May 2013 16:40:11 +0000 (18:40 +0200)]
DE: Update to the strings
Tobias Diekershoff [Thu, 9 May 2013 16:38:57 +0000 (18:38 +0200)]
DE: update to the strings
friendica [Thu, 9 May 2013 08:17:11 +0000 (01:17 -0700)]
remove stub code
friendica [Thu, 9 May 2013 08:15:40 +0000 (01:15 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 9 May 2013 08:15:22 +0000 (01:15 -0700)]
rev update
pixelroot [Wed, 8 May 2013 12:46:42 +0000 (14:46 +0200)]
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 [Wed, 8 May 2013 09:09:39 +0000 (11:09 +0200)]
Merge remote branch 'upstream/master'
pixelroot [Wed, 8 May 2013 09:09:08 +0000 (11:09 +0200)]
new file: view/theme/smoothly/images/power.png
new file: view/theme/smoothly/images/up.png