]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoDE: update to the strings
Tobias Diekershoff [Fri, 14 Sep 2012 13:46:14 +0000 (15:46 +0200)]
DE: update to the strings

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Fri, 14 Sep 2012 13:36:15 +0000 (15:36 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoquattro: mail link to profile page
Tobias Diekershoff [Fri, 14 Sep 2012 13:35:40 +0000 (15:35 +0200)]
quattro: mail link to profile page

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 14 Sep 2012 13:05:22 +0000 (06:05 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoostatus disabled typo
friendica [Fri, 14 Sep 2012 13:04:25 +0000 (06:04 -0700)]
ostatus disabled typo

12 years agoMerge pull request #474 from pixelroot/master
Alex [Fri, 14 Sep 2012 10:43:48 +0000 (03:43 -0700)]
Merge pull request #474 from pixelroot/master

Bug fix

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Fri, 14 Sep 2012 10:46:32 +0000 (12:46 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Fri, 14 Sep 2012 09:57:13 +0000 (11:57 +0200)]
modified:   view/theme/smoothly/style.css

12 years agoMerge pull request #473 from pixelroot/master
Alex [Fri, 14 Sep 2012 09:54:30 +0000 (02:54 -0700)]
Merge pull request #473 from pixelroot/master

Editor redesign

12 years ago deleted: view/theme/smoothly/group_edit.tpl
pixelroot [Fri, 14 Sep 2012 08:16:35 +0000 (10:16 +0200)]
deleted:    view/theme/smoothly/group_edit.tpl

12 years agoMerge pull request #472 from pixelroot/master
Alex [Fri, 14 Sep 2012 08:14:48 +0000 (01:14 -0700)]
Merge pull request #472 from pixelroot/master

Group-Edit bug

12 years ago deleted: view/theme/smoothly/default.php
pixelroot [Fri, 14 Sep 2012 07:55:54 +0000 (09:55 +0200)]
deleted:    view/theme/smoothly/default.php
modified:   view/theme/smoothly/nav.tpl

12 years agoMerge pull request #471 from pixelroot/master
Alex [Fri, 14 Sep 2012 07:54:54 +0000 (00:54 -0700)]
Merge pull request #471 from pixelroot/master

Theme Smoothly

12 years ago new file: view/theme/smoothly/default.php
pixelroot [Fri, 14 Sep 2012 07:33:47 +0000 (09:33 +0200)]
new file:   view/theme/smoothly/default.php

12 years ago modified: view/theme/smoothly/nav.tpl
pixelroot [Fri, 14 Sep 2012 07:33:21 +0000 (09:33 +0200)]
modified:   view/theme/smoothly/nav.tpl
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Fri, 14 Sep 2012 06:50:10 +0000 (08:50 +0200)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agotypo on previous checkin - set max number of images for an inserted link, default 2.
friendica [Fri, 14 Sep 2012 06:01:10 +0000 (23:01 -0700)]
typo on previous checkin - set max number of images for an inserted link, default 2.

12 years agoreverse the default newuser privacy setting to public. Sites can over-ride.
friendica [Fri, 14 Sep 2012 02:11:07 +0000 (19:11 -0700)]
reverse the default newuser privacy setting to public. Sites can over-ride.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 14 Sep 2012 00:00:47 +0000 (17:00 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoprovide separate hashtag and mentions for themes in addition to composite tags
friendica [Thu, 13 Sep 2012 23:59:25 +0000 (16:59 -0700)]
provide separate hashtag and mentions for themes in addition to composite tags

12 years agorev update
friendica [Thu, 13 Sep 2012 23:58:06 +0000 (16:58 -0700)]
rev update

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Thomas Willingham [Thu, 13 Sep 2012 19:52:06 +0000 (20:52 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoFriendicaland
Thomas Willingham [Thu, 13 Sep 2012 19:51:34 +0000 (20:51 +0100)]
Friendicaland

12 years agoMerge pull request #469 from pixelroot/master
Thomas Willingham [Thu, 13 Sep 2012 14:59:16 +0000 (07:59 -0700)]
Merge pull request #469 from pixelroot/master

Theme Smoothly

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 13 Sep 2012 14:50:55 +0000 (16:50 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 13 Sep 2012 14:30:12 +0000 (16:30 +0200)]
modified:   view/theme/smoothly/style.css

12 years agoMerge pull request #468 from pixelroot/master
friendica [Thu, 13 Sep 2012 10:50:55 +0000 (03:50 -0700)]
Merge pull request #468 from pixelroot/master

Theme Smoothly

12 years ago modified: view/theme/smoothly/star.png
pixelroot [Thu, 13 Sep 2012 09:41:14 +0000 (11:41 +0200)]
modified:   view/theme/smoothly/star.png
modified:   view/theme/smoothly/theme.php

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 13 Sep 2012 07:54:27 +0000 (09:54 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 13 Sep 2012 07:48:02 +0000 (09:48 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago new file: view/theme/smoothly/message_side.tpl
pixelroot [Thu, 13 Sep 2012 07:35:12 +0000 (09:35 +0200)]
new file:   view/theme/smoothly/message_side.tpl

12 years ago modified: view/theme/smoothly/peoplefind.tpl
pixelroot [Thu, 13 Sep 2012 07:34:50 +0000 (09:34 +0200)]
modified:   view/theme/smoothly/peoplefind.tpl
modified:   view/theme/smoothly/style.css

12 years agoMerge pull request #467 from fermionic/frost-mobile-toggle-mobile
fermionic [Thu, 13 Sep 2012 03:38:10 +0000 (20:38 -0700)]
Merge pull request #467 from fermionic/frost-mobile-toggle-mobile

add mobile toggle to frost mobile

12 years agoadd mobile toggle to frost mobile
Zach Prezkuta [Thu, 13 Sep 2012 03:35:51 +0000 (21:35 -0600)]
add mobile toggle to frost mobile

12 years agoallow events to be ignored
friendica [Thu, 13 Sep 2012 02:35:28 +0000 (19:35 -0700)]
allow events to be ignored

12 years agodon't allow followers to get a post through unless it's a tag deliver
friendica [Thu, 13 Sep 2012 01:53:20 +0000 (18:53 -0700)]
don't allow followers to get a post through unless it's a tag deliver

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 13 Sep 2012 00:20:52 +0000 (17:20 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agouse local photo for tag notifications if available
friendica [Thu, 13 Sep 2012 00:19:26 +0000 (17:19 -0700)]
use local photo for tag notifications if available

12 years agorev update
friendica [Thu, 13 Sep 2012 00:18:10 +0000 (17:18 -0700)]
rev update

12 years agoCouple of spare smiley images removed.
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

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 12 Sep 2012 15:25:44 +0000 (17:25 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 12 Sep 2012 14:27:31 +0000 (16:27 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/profile_vcard.tpl
pixelroot [Wed, 12 Sep 2012 14:20:44 +0000 (16:20 +0200)]
modified:   view/theme/smoothly/profile_vcard.tpl
modified:   view/theme/smoothly/style.css

12 years agoMerge pull request #466 from pixelroot/master
tobiasd [Wed, 12 Sep 2012 14:02:40 +0000 (07:02 -0700)]
Merge pull request #466 from pixelroot/master

Theme Smoothly

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 12 Sep 2012 13:49:18 +0000 (15:49 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/theme.php
pixelroot [Wed, 12 Sep 2012 12:44:42 +0000 (14:44 +0200)]
modified:   view/theme/smoothly/theme.php

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 12 Sep 2012 12:42:10 +0000 (14:42 +0200)]
modified:   view/theme/smoothly/style.css

12 years agoMerge pull request #465 from CyberDomovoy/Imagick
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

12 years agoFallback 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

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 12 Sep 2012 01:57:40 +0000 (18:57 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update + multiple profile photos
friendica [Wed, 12 Sep 2012 01:51:17 +0000 (18:51 -0700)]
rev update + multiple profile photos

12 years agoMerge pull request #464 from pixelroot/master
fermionic [Tue, 11 Sep 2012 14:27:19 +0000 (07:27 -0700)]
Merge pull request #464 from pixelroot/master

theme smoothly

12 years ago new file: view/theme/smoothly/generic_links_widget.tpl
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

12 years ago new file: view/theme/smoothly/arrow.png
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

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 11 Sep 2012 09:25:01 +0000 (11:25 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/nav.tpl
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

12 years agoDE: update to the strings
Tobias Diekershoff [Tue, 11 Sep 2012 07:19:11 +0000 (09:19 +0200)]
DE: update to the strings

12 years agobring back comment edit buttons
friendica [Tue, 11 Sep 2012 01:06:18 +0000 (18:06 -0700)]
bring back comment edit buttons

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 10 Sep 2012 23:20:35 +0000 (16:20 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Mon, 10 Sep 2012 23:19:34 +0000 (16:19 -0700)]
rev update

12 years agoMerge pull request #462 from CyberDomovoy/threaded_items
friendica [Mon, 10 Sep 2012 23:19:13 +0000 (16:19 -0700)]
Merge pull request #462 from CyberDomovoy/threaded_items

Threaded items, objects

12 years agoMerge pull request #463 from pixelroot/master
fermionic [Mon, 10 Sep 2012 15:08:24 +0000 (08:08 -0700)]
Merge pull request #463 from pixelroot/master

Version 0.5

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 14:31:36 +0000 (16:31 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 14:21:54 +0000 (16:21 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: style.css
pixelroot [Mon, 10 Sep 2012 13:38:44 +0000 (15:38 +0200)]
modified:   style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 13:19:43 +0000 (15:19 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:58:57 +0000 (14:58 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:52:47 +0000 (14:52 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 12:36:51 +0000 (14:36 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago deleted: view/theme/smoothly/comment_item.tpl
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

12 years ago new file: view/theme/smoothly/follow.tpl
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

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Mon, 10 Sep 2012 09:01:43 +0000 (11:01 +0200)]
modified:   view/theme/smoothly/style.css

12 years agoTabs trouble? What happened? I sure aven't changed anything to my editor...
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...

12 years agoPort friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994
Domovoy [Mon, 10 Sep 2012 08:14:30 +0000 (10:14 +0200)]
Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994

12 years agoPort friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1
Domovoy [Mon, 10 Sep 2012 07:57:34 +0000 (09:57 +0200)]
Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1

12 years agoPort friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd
Domovoy [Mon, 10 Sep 2012 07:50:30 +0000 (09:50 +0200)]
Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
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

12 years agoremove mobile file
friendica [Mon, 10 Sep 2012 07:15:01 +0000 (00:15 -0700)]
remove mobile file

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 9 Sep 2012 22:36:49 +0000 (15:36 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update + bug 477 'Romania' misspelled
friendica [Sun, 9 Sep 2012 22:35:33 +0000 (15:35 -0700)]
rev update + bug 477 'Romania' misspelled

12 years agoDE: getting the strings back to 100%
Tobias Diekershoff [Sun, 9 Sep 2012 16:31:15 +0000 (18:31 +0200)]
DE: getting the strings back to 100%

12 years agoRomania typo.
Thomas Willingham [Sun, 9 Sep 2012 14:08:09 +0000 (15:08 +0100)]
Romania typo.

12 years agofrost-mobile: was missing infront of the nav-images
Tobias Diekershoff [Sun, 9 Sep 2012 11:26:15 +0000 (13:26 +0200)]
frost-mobile:  was missing infront of the nav-images

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 9 Sep 2012 01:34:32 +0000 (18:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoprovide option to view photo albums in posted order (rather than blog order)
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)

12 years agorev update
friendica [Sun, 9 Sep 2012 01:11:08 +0000 (18:11 -0700)]
rev update

12 years agoMerge pull request #461 from pixelroot/master
fermionic [Sat, 8 Sep 2012 14:33:26 +0000 (07:33 -0700)]
Merge pull request #461 from pixelroot/master

Version 0.4

12 years ago deleted: view/theme/smoothly/mobile
pixelroot [Sat, 8 Sep 2012 07:26:13 +0000 (09:26 +0200)]
deleted:    view/theme/smoothly/mobile

12 years ago deleted: view/theme/smoothly/icons/dot.png
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

12 years ago modified: view/theme/smoothly/comment_item.tpl
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

12 years ago new file: view/theme/smoothly/js/jquery.ae.image.resize.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

12 years agoMerge pull request #460 from fermionic/frost-mobile-settings-and-add-contact
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

12 years agoadd 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

12 years ago modified: view/theme/smoothly/jot.tpl
pixelroot [Fri, 7 Sep 2012 15:13:51 +0000 (17:13 +0200)]
modified:   view/theme/smoothly/jot.tpl
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Fri, 7 Sep 2012 14:32:20 +0000 (16:32 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago new file: view/theme/smoothly/mobile
pixelroot [Fri, 7 Sep 2012 08:10:25 +0000 (10:10 +0200)]
new file:   view/theme/smoothly/mobile

12 years ago modified: view/theme/smoothly/style.css
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

12 years agoprovide local_block - block_public as far as content but can connect with the grid.
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.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 7 Sep 2012 00:21:28 +0000 (17:21 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Fri, 7 Sep 2012 00:20:31 +0000 (17:20 -0700)]
rev update