]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Mon, 10 Sep 2012 21:28:07 +0000 (23:28 +0200)]
Merge remote branch 'upstream/master'
fermionic [Mon, 10 Sep 2012 15:08:24 +0000 (08:08 -0700)]
Merge pull request #463 from pixelroot/master
pixelroot [Mon, 10 Sep 2012 14:31:36 +0000 (16:31 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 14:21:54 +0000 (16:21 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 13:38:44 +0000 (15:38 +0200)]
modified: style.css
pixelroot [Mon, 10 Sep 2012 13:19:43 +0000 (15:19 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:58:57 +0000 (14:58 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:52:47 +0000 (14:52 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:36:51 +0000 (14:36 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:18:24 +0000 (14:18 +0200)]
deleted: view/theme/smoothly/comment_item.tpl
pixelroot [Mon, 10 Sep 2012 10:30:34 +0000 (12:30 +0200)]
new file: view/theme/smoothly/follow.tpl
pixelroot [Mon, 10 Sep 2012 09:01:43 +0000 (11:01 +0200)]
modified: view/theme/smoothly/style.css
friendica [Mon, 10 Sep 2012 07:15:01 +0000 (00:15 -0700)]
remove mobile file
friendica [Sun, 9 Sep 2012 22:36:49 +0000 (15:36 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 9 Sep 2012 22:35:33 +0000 (15:35 -0700)]
rev update + bug 477 'Romania' misspelled
Tobias Diekershoff [Sun, 9 Sep 2012 16:31:15 +0000 (18:31 +0200)]
DE: getting the strings back to 100%
Thomas Willingham [Sun, 9 Sep 2012 14:08:09 +0000 (15:08 +0100)]
Romania typo.
Tobias Diekershoff [Sun, 9 Sep 2012 11:26:15 +0000 (13:26 +0200)]
frost-mobile: was missing infront of the nav-images
friendica [Sun, 9 Sep 2012 01:34:32 +0000 (18:34 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 9 Sep 2012 01:33:28 +0000 (18:33 -0700)]
provide option to view photo albums in posted order (rather than blog order)
friendica [Sun, 9 Sep 2012 01:11:08 +0000 (18:11 -0700)]
rev update
fermionic [Sat, 8 Sep 2012 14:33:26 +0000 (07:33 -0700)]
Merge pull request #461 from pixelroot/master
pixelroot [Sat, 8 Sep 2012 07:26:13 +0000 (09:26 +0200)]
deleted: view/theme/smoothly/mobile
pixelroot [Sat, 8 Sep 2012 07:25:06 +0000 (09:25 +0200)]
deleted: view/theme/smoothly/icons/dot.png
pixelroot [Sat, 8 Sep 2012 07:24:37 +0000 (09:24 +0200)]
modified: view/theme/smoothly/comment_item.tpl
pixelroot [Sat, 8 Sep 2012 06:54:18 +0000 (08:54 +0200)]
new file: view/theme/smoothly/js/jquery.ae.image.resize.js
fermionic [Fri, 7 Sep 2012 18:20:37 +0000 (11:20 -0700)]
Merge pull request #460 from fermionic/frost-mobile-settings-and-add-contact
Zach Prezkuta [Fri, 7 Sep 2012 18:17:03 +0000 (12:17 -0600)]
add settings sections and add contacts; other tweaks and fixes
pixelroot [Fri, 7 Sep 2012 15:13:51 +0000 (17:13 +0200)]
modified: view/theme/smoothly/jot.tpl
pixelroot [Fri, 7 Sep 2012 14:32:20 +0000 (16:32 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Fri, 7 Sep 2012 08:10:25 +0000 (10:10 +0200)]
new file: view/theme/smoothly/mobile
pixelroot [Fri, 7 Sep 2012 08:09:24 +0000 (10:09 +0200)]
modified: view/theme/smoothly/style.css
friendica [Fri, 7 Sep 2012 03:17:50 +0000 (20:17 -0700)]
provide local_block - block_public as far as content but can connect with the grid.
friendica [Fri, 7 Sep 2012 00:21:28 +0000 (17:21 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 7 Sep 2012 00:20:31 +0000 (17:20 -0700)]
rev update
Thomas Willingham [Thu, 6 Sep 2012 23:44:01 +0000 (00:44 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica
Thomas Willingham [Thu, 6 Sep 2012 23:43:05 +0000 (00:43 +0100)]
Typo in notifier.
fermionic [Thu, 6 Sep 2012 23:35:04 +0000 (16:35 -0700)]
Merge pull request #459 from fermionic/individual-choice-of-mobile-theme
fermionic [Thu, 6 Sep 2012 23:34:40 +0000 (16:34 -0700)]
Merge pull request #458 from fermionic/twitter-profile-picture-too-small
Zach Prezkuta [Thu, 6 Sep 2012 23:31:05 +0000 (17:31 -0600)]
small twitter improvements
Zach Prezkuta [Thu, 6 Sep 2012 23:30:24 +0000 (17:30 -0600)]
mark all mobile themes
Zach Prezkuta [Thu, 6 Sep 2012 23:24:34 +0000 (17:24 -0600)]
allow individual choice of mobile themes
fermionic [Thu, 6 Sep 2012 18:08:48 +0000 (11:08 -0700)]
Merge pull request #456 from pixelroot/master
pixelroot [Thu, 6 Sep 2012 14:25:16 +0000 (16:25 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Thu, 6 Sep 2012 13:50:02 +0000 (15:50 +0200)]
modified: view/theme/smoothly/jot.tpl
pixelroot [Thu, 6 Sep 2012 12:15:38 +0000 (14:15 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Thu, 6 Sep 2012 11:25:13 +0000 (13:25 +0200)]
modified: view/theme/smoothly/login.tpl
pixelroot [Thu, 6 Sep 2012 10:04:56 +0000 (12:04 +0200)]
new file: view/theme/smoothly/icons/dot.png
pixelroot [Thu, 6 Sep 2012 09:17:17 +0000 (11:17 +0200)]
modified: view/theme/smoothly/comment_item.tpl
pixelroot [Thu, 6 Sep 2012 07:44:15 +0000 (09:44 +0200)]
view/theme/smoothly/icons/
friendica [Thu, 6 Sep 2012 01:24:06 +0000 (18:24 -0700)]
allow comments on other folks wall-to-wall postings
friendica [Wed, 5 Sep 2012 23:27:30 +0000 (16:27 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 5 Sep 2012 23:26:11 +0000 (16:26 -0700)]
update writable for dfrn contacts when using local delivery
friendica [Wed, 5 Sep 2012 22:43:19 +0000 (15:43 -0700)]
rev update
fermionic [Wed, 5 Sep 2012 17:13:46 +0000 (10:13 -0700)]
Merge pull request #457 from fermionic/testbubble-broken-with-threading
Zach Prezkuta [Wed, 5 Sep 2012 17:12:08 +0000 (11:12 -0600)]
conversation.tpl doesnt appear to be necessary
Zach Prezkuta [Wed, 5 Sep 2012 17:11:03 +0000 (11:11 -0600)]
add threading files to make testbubble not broken with threading
pixelroot [Wed, 5 Sep 2012 14:04:29 +0000 (16:04 +0200)]
view/theme/smoothly/lang_selector.tpl
pixelroot [Wed, 5 Sep 2012 11:29:45 +0000 (13:29 +0200)]
modified: view/theme/smoothly/style.css
friendica [Wed, 5 Sep 2012 11:02:30 +0000 (04:02 -0700)]
ignore exif orientation if we can't parse the particular flavour of exif
pixelroot [Wed, 5 Sep 2012 08:28:15 +0000 (10:28 +0200)]
deleted: view/theme/smoothly/back-gradient.jpg
pixelroot [Wed, 5 Sep 2012 07:46:26 +0000 (09:46 +0200)]
new file: view/theme/smoothly/login.tpl
pixelroot [Wed, 5 Sep 2012 07:42:52 +0000 (09:42 +0200)]
view/theme/smoothly/login.tpl
friendica [Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 5 Sep 2012 05:50:28 +0000 (22:50 -0700)]
remote_user can now support multiple contacts being logged in at once
friendica [Wed, 5 Sep 2012 03:41:44 +0000 (20:41 -0700)]
rev update
fermionic [Wed, 5 Sep 2012 00:50:33 +0000 (17:50 -0700)]
Merge pull request #455 from fermionic/previews-dont-work
Zach Prezkuta [Wed, 5 Sep 2012 00:47:49 +0000 (18:47 -0600)]
conversation needs preview parameter
Michael Vogel [Tue, 4 Sep 2012 05:22:59 +0000 (07:22 +0200)]
Merge remote branch 'upstream/master'
friendica [Tue, 4 Sep 2012 04:32:47 +0000 (21:32 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 4 Sep 2012 04:31:35 +0000 (21:31 -0700)]
attachments from non-friendica contacts shouldn't go through redir - it won't work
friendica [Tue, 4 Sep 2012 04:31:00 +0000 (21:31 -0700)]
rev update
fermionic [Sun, 2 Sep 2012 21:18:00 +0000 (14:18 -0700)]
Merge pull request #454 from CyberDomovoy/mass_vhost
Domovoy [Sun, 2 Sep 2012 21:00:58 +0000 (23:00 +0200)]
Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot
Michael Vogel [Sun, 2 Sep 2012 15:50:25 +0000 (17:50 +0200)]
Merge remote branch 'upstream/master'
Michael Vogel [Sun, 2 Sep 2012 15:49:06 +0000 (17:49 +0200)]
items: added some logging infos
pixelroot [Sun, 2 Sep 2012 11:11:17 +0000 (13:11 +0200)]
new file: view/theme/smoothly/back-gradient.jpg
pixelroot [Sun, 2 Sep 2012 11:09:16 +0000 (13:09 +0200)]
deleted: view/theme/softy/back-gradient.jpg
Tobias Diekershoff [Sun, 2 Sep 2012 09:59:44 +0000 (11:59 +0200)]
DE strings (pokes THX @zottel)
friendica [Sun, 2 Sep 2012 08:48:24 +0000 (01:48 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 2 Sep 2012 08:47:04 +0000 (01:47 -0700)]
rev update
fabrixxm [Sat, 1 Sep 2012 09:05:53 +0000 (02:05 -0700)]
Merge pull request #452 from fabrixxm/master
Fabrixxm [Sat, 1 Sep 2012 08:52:01 +0000 (04:52 -0400)]
quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas
friendica [Fri, 31 Aug 2012 08:29:55 +0000 (01:29 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 31 Aug 2012 08:29:37 +0000 (01:29 -0700)]
rev update
friendica [Fri, 31 Aug 2012 08:26:03 +0000 (01:26 -0700)]
Merge pull request #451 from fabrixxm/master
Fabrixxm [Fri, 31 Aug 2012 07:32:10 +0000 (03:32 -0400)]
quattro: remove 'experimental'
Fabrixxm [Fri, 31 Aug 2012 07:31:33 +0000 (03:31 -0400)]
quattro: fix live update
pixelroot [Thu, 30 Aug 2012 14:50:22 +0000 (16:50 +0200)]
deleted: view/theme/softy/style.alex
pixelroot [Thu, 30 Aug 2012 14:42:50 +0000 (16:42 +0200)]
new file: view/theme/softy/back-gradient.jpg
Fabrixxm [Wed, 29 Aug 2012 08:19:15 +0000 (04:19 -0400)]
config: fix get_config and get_pconfig search for serialized array
friendica [Wed, 29 Aug 2012 03:35:25 +0000 (20:35 -0700)]
Merge https://github.com/friendica/friendica into pull
fermionic [Wed, 29 Aug 2012 02:20:36 +0000 (19:20 -0700)]
Merge pull request #450 from fermionic/frost-showmore-border
Zach Prezkuta [Wed, 29 Aug 2012 02:19:47 +0000 (20:19 -0600)]
make the show more line look nicer
fermionic [Wed, 29 Aug 2012 02:13:48 +0000 (19:13 -0700)]
Merge pull request #449 from fermionic/markdownify-breaks-links-with-underscores
Zach Prezkuta [Mon, 27 Aug 2012 00:18:43 +0000 (18:18 -0600)]
manually fix escaped underscores in links
friendica [Wed, 29 Aug 2012 02:11:52 +0000 (19:11 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 29 Aug 2012 02:08:17 +0000 (19:08 -0700)]
rev update
fermionic [Wed, 29 Aug 2012 02:03:15 +0000 (19:03 -0700)]
Merge pull request #448 from fermionic/limit-items-on-all-pages
fermionic [Wed, 29 Aug 2012 02:03:04 +0000 (19:03 -0700)]
Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags
projects / friendica.git / log