]>
git.mxchange.org Git - friendica.git/log
Thomas Willingham [Thu, 13 Sep 2012 19:51:34 +0000 (20:51 +0100)]
Friendicaland
Thomas Willingham [Wed, 12 Sep 2012 21:12:08 +0000 (22:12 +0100)]
Couple of spare smiley images removed.
Should have been deleted when these got moved to smiley_pack
tobiasd [Wed, 12 Sep 2012 14:02:40 +0000 (07:02 -0700)]
Merge pull request #466 from pixelroot/master
Theme Smoothly
pixelroot [Wed, 12 Sep 2012 13:49:18 +0000 (15:49 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Wed, 12 Sep 2012 12:44:42 +0000 (14:44 +0200)]
modified: view/theme/smoothly/theme.php
pixelroot [Wed, 12 Sep 2012 12:42:10 +0000 (14:42 +0200)]
modified: view/theme/smoothly/style.css
Domovoy [Wed, 12 Sep 2012 10:00:29 +0000 (03:00 -0700)]
Merge pull request #465 from CyberDomovoy/Imagick
Fallback to gd if Imagick can't load the data
Domovoy [Wed, 12 Sep 2012 09:55:09 +0000 (11:55 +0200)]
Fallback to gd if Imagick can't load the data
friendica [Wed, 12 Sep 2012 01:57:40 +0000 (18:57 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 12 Sep 2012 01:51:17 +0000 (18:51 -0700)]
rev update + multiple profile photos
fermionic [Tue, 11 Sep 2012 14:27:19 +0000 (07:27 -0700)]
Merge pull request #464 from pixelroot/master
theme smoothly
pixelroot [Tue, 11 Sep 2012 13:23:49 +0000 (15:23 +0200)]
new file: view/theme/smoothly/generic_links_widget.tpl
modified: view/theme/smoothly/style.css
pixelroot [Tue, 11 Sep 2012 12:02:36 +0000 (14:02 +0200)]
new file: view/theme/smoothly/arrow.png
new file: view/theme/smoothly/categories_widget.tpl
modified: view/theme/smoothly/style.css
pixelroot [Tue, 11 Sep 2012 09:25:01 +0000 (11:25 +0200)]
modified: view/theme/smoothly/style.css
pixelroot [Tue, 11 Sep 2012 09:06:55 +0000 (11:06 +0200)]
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/totop.png
Tobias Diekershoff [Tue, 11 Sep 2012 07:19:11 +0000 (09:19 +0200)]
DE: update to the strings
friendica [Tue, 11 Sep 2012 01:06:18 +0000 (18:06 -0700)]
bring back comment edit buttons
friendica [Mon, 10 Sep 2012 23:20:35 +0000 (16:20 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Mon, 10 Sep 2012 23:19:34 +0000 (16:19 -0700)]
rev update
friendica [Mon, 10 Sep 2012 23:19:13 +0000 (16:19 -0700)]
Merge pull request #462 from CyberDomovoy/threaded_items
Threaded items, objects
fermionic [Mon, 10 Sep 2012 15:08:24 +0000 (08:08 -0700)]
Merge pull request #463 from pixelroot/master
Version 0.5
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
deleted: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 10:30:34 +0000 (12:30 +0200)]
new file: view/theme/smoothly/follow.tpl
new file: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 09:01:43 +0000 (11:01 +0200)]
modified: view/theme/smoothly/style.css
Domovoy [Mon, 10 Sep 2012 08:36:30 +0000 (10:36 +0200)]
Tabs trouble? What happened? I sure aven't changed anything to my editor...
Domovoy [Mon, 10 Sep 2012 08:14:30 +0000 (10:14 +0200)]
Domovoy [Mon, 10 Sep 2012 07:57:34 +0000 (09:57 +0200)]
Domovoy [Mon, 10 Sep 2012 07:50:30 +0000 (09:50 +0200)]
Domovoy [Mon, 10 Sep 2012 07:19:08 +0000 (09:19 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
include/conversation.php
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
Version 0.4
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
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
pixelroot [Sat, 8 Sep 2012 07:24:37 +0000 (09:24 +0200)]
modified: view/theme/smoothly/comment_item.tpl
new file: view/theme/smoothly/dot.png
new file: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
deleted: view/theme/smoothly/icons/dot.png
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
pixelroot [Sat, 8 Sep 2012 06:54:18 +0000 (08:54 +0200)]
new file: view/theme/smoothly/js/jquery.ae.image.resize.js
new file: view/theme/smoothly/js/jquery.ae.image.resize.min.js
modified: view/theme/smoothly/theme.php
fermionic [Fri, 7 Sep 2012 18:20:37 +0000 (11:20 -0700)]
Merge pull request #460 from fermionic/frost-mobile-settings-and-add-contact
add settings sections and "add contacts"; other tweaks and fixes
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
modified: view/theme/smoothly/style.css
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
modified: view/theme/smoothly/theme.php
view/theme/smoothly/mobile
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
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
small twitter improvements
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
New Theme "Smoothly"
pixelroot [Thu, 6 Sep 2012 14:25:16 +0000 (16:25 +0200)]
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/wallwall_thread.tpl
pixelroot [Thu, 6 Sep 2012 13:50:02 +0000 (15:50 +0200)]
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/style.css
pixelroot [Thu, 6 Sep 2012 12:15:38 +0000 (14:15 +0200)]
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/wallwall_thread.tpl
pixelroot [Thu, 6 Sep 2012 11:25:13 +0000 (13:25 +0200)]
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/style.css
pixelroot [Thu, 6 Sep 2012 10:04:56 +0000 (12:04 +0200)]
new file: view/theme/smoothly/icons/dot.png
new file: view/theme/smoothly/lang_selector.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/style.css
new file: view/theme/smoothly/wall_thread.tpl
new file: view/theme/smoothly/wallwall_thread.tpl
pixelroot [Thu, 6 Sep 2012 09:17:17 +0000 (11:17 +0200)]
modified: view/theme/smoothly/comment_item.tpl
modified: view/theme/smoothly/contact_template.tpl
modified: view/theme/smoothly/jot-header.tpl
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/photo_top.tpl
modified: view/theme/smoothly/profile_entry.tpl
modified: view/theme/smoothly/profile_vcard.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
pixelroot [Thu, 6 Sep 2012 07:44:15 +0000 (09:44 +0200)]
view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
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
Add wall_thread and wallwall_thread
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
modified: view/theme/smoothly/style.css
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
conversation needs preview parameter
Zach Prezkuta [Wed, 5 Sep 2012 00:47:49 +0000 (18:47 -0600)]
conversation needs preview parameter
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
VirtualDocumentRoot and mod_rewrite
Domovoy [Sun, 2 Sep 2012 21:00:58 +0000 (23:00 +0200)]
Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot
pixelroot [Sun, 2 Sep 2012 11:11:17 +0000 (13:11 +0200)]
new file: view/theme/smoothly/back-gradient.jpg
new file: view/theme/smoothly/calendar.png
new file: view/theme/smoothly/comment_item.tpl
new file: view/theme/smoothly/connect.png
new file: view/theme/smoothly/contact_template.tpl
new file: view/theme/smoothly/conversation.tpl
new file: view/theme/smoothly/group_drop.tpl
new file: view/theme/smoothly/group_edit.tpl
new file: view/theme/smoothly/group_side.tpl
new file: view/theme/smoothly/groups.png
new file: view/theme/smoothly/icons.png
new file: view/theme/smoothly/icons.svg
new file: view/theme/smoothly/jot-header.tpl
new file: view/theme/smoothly/jot.tpl
new file: view/theme/smoothly/lock.cur
new file: view/theme/smoothly/login-bg.gif
new file: view/theme/smoothly/lrarrow.gif
new file: view/theme/smoothly/mail_head.tpl
new file: view/theme/smoothly/match.tpl
new file: view/theme/smoothly/menu-user-pin.jpg
new file: view/theme/smoothly/menu-user-pin.png
new file: view/theme/smoothly/nav-bg.png
new file: view/theme/smoothly/nav.tpl
new file: view/theme/smoothly/nets.tpl
new file: view/theme/smoothly/next.png
new file: view/theme/smoothly/notifications.png
new file: view/theme/smoothly/photo-menu.jpg
new file: view/theme/smoothly/photo_album.tpl
new file: view/theme/smoothly/photo_top.tpl
new file: view/theme/smoothly/photo_view.tpl
new file: view/theme/smoothly/photography.png
new file: view/theme/smoothly/premium.png
new file: view/theme/smoothly/prev.png
new file: view/theme/smoothly/profile_entry.tpl
new file: view/theme/smoothly/profile_vcard.tpl
new file: view/theme/smoothly/saved_searches_aside.tpl
new file: view/theme/smoothly/screenshot.jpg
new file: view/theme/smoothly/screenshot.png
new file: view/theme/smoothly/search.png
new file: view/theme/smoothly/search_item.tpl
new file: view/theme/smoothly/star.png
new file: view/theme/smoothly/style.css
new file: view/theme/smoothly/theme.php
new file: view/theme/smoothly/user.png
new file: view/theme/smoothly/wall_item.tpl
new file: view/theme/smoothly/wallwall_item.tpl
pixelroot [Sun, 2 Sep 2012 11:09:16 +0000 (13:09 +0200)]
deleted: view/theme/softy/back-gradient.jpg
deleted: view/theme/softy/calendar.png
deleted: view/theme/softy/comment_item.tpl
deleted: view/theme/softy/connect.png
deleted: view/theme/softy/contact_template.tpl
deleted: view/theme/softy/conversation.tpl
deleted: view/theme/softy/group_drop.tpl
deleted: view/theme/softy/group_edit.tpl
deleted: view/theme/softy/group_side.tpl
deleted: view/theme/softy/groups.png
deleted: view/theme/softy/icons.png
deleted: view/theme/softy/icons.svg
deleted: view/theme/softy/jot-header.tpl
deleted: view/theme/softy/jot.tpl
deleted: view/theme/softy/lock.cur
deleted: view/theme/softy/login-bg.gif
deleted: view/theme/softy/lrarrow.gif
deleted: view/theme/softy/mail_head.tpl
deleted: view/theme/softy/match.tpl
deleted: view/theme/softy/menu-user-pin.jpg
deleted: view/theme/softy/menu-user-pin.png
deleted: view/theme/softy/nav-bg.png
deleted: view/theme/softy/nav.tpl
deleted: view/theme/softy/nets.tpl
deleted: view/theme/softy/next.png
deleted: view/theme/softy/notifications.png
deleted: view/theme/softy/photo-menu.jpg
deleted: view/theme/softy/photo_album.tpl
deleted: view/theme/softy/photo_top.tpl
deleted: view/theme/softy/photo_view.tpl
deleted: view/theme/softy/photography.png
deleted: view/theme/softy/premium.png
deleted: view/theme/softy/prev.png
deleted: view/theme/softy/profile_entry.tpl
deleted: view/theme/softy/profile_vcard.tpl
deleted: view/theme/softy/saved_searches_aside.tpl
deleted: view/theme/softy/screenshot.jpg
deleted: view/theme/softy/screenshot.png
deleted: view/theme/softy/search.png
deleted: view/theme/softy/search_item.tpl
deleted: view/theme/softy/star.png
deleted: view/theme/softy/style.css
deleted: view/theme/softy/theme.php
deleted: view/theme/softy/user.png
deleted: view/theme/softy/wall_item.tpl
deleted: view/theme/softy/wallwall_item.tpl
view/theme/smoothly/
Tobias Diekershoff [Sun, 2 Sep 2012 09:59:44 +0000 (11:59 +0200)]
DE strings (pokes THX @zottel)