]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoUpload/Browse popup for files and images
Fabrixxm [Tue, 28 Jul 2015 15:20:40 +0000 (17:20 +0200)]
Upload/Browse popup for files and images

Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one

9 years agoMerge pull request #1789 from silke/vagrant-fix-admin
Tobias Diekershoff [Thu, 23 Jul 2015 20:18:03 +0000 (22:18 +0200)]
Merge pull request #1789 from silke/vagrant-fix-admin

Vagrant: Fix for potentially missing admin account

9 years agoUpdated vagrant docs.
Silke Meyer [Thu, 23 Jul 2015 20:11:09 +0000 (22:11 +0200)]
Updated vagrant docs.

9 years agoVagrant user doesn't have to tun the actual installation anymore. Test database is...
Silke Meyer [Thu, 23 Jul 2015 20:06:18 +0000 (22:06 +0200)]
Vagrant user doesn't have to tun the actual installation anymore. Test database is imported, htconfig is set, not generated to prevent installation routine.

9 years agoMerge pull request #1787 from tobiasd/20150722-faq
Michael Vogel [Wed, 22 Jul 2015 21:05:37 +0000 (23:05 +0200)]
Merge pull request #1787 from tobiasd/20150722-faq

email settings for the FAQ

9 years agoemail settings for the FAQ
Tobias Diekershoff [Wed, 22 Jul 2015 10:03:14 +0000 (12:03 +0200)]
email settings for the FAQ

9 years agoMerge pull request #1776 from tobiasd/20150719-issue1771
fabrixxm [Mon, 20 Jul 2015 12:38:26 +0000 (14:38 +0200)]
Merge pull request #1776 from tobiasd/20150719-issue1771

add missing icons to quattros event view

9 years agoadd missing icons to quattros event view
Tobias Diekershoff [Sun, 19 Jul 2015 08:56:40 +0000 (10:56 +0200)]
add missing icons to quattros event view

9 years agoMerge pull request #1768 from tobiasd/20150718-issue1745
Michael Vogel [Sat, 18 Jul 2015 13:49:35 +0000 (15:49 +0200)]
Merge pull request #1768 from tobiasd/20150718-issue1745

show profile url in contact-edit overview listing

9 years agoshow profile url in contact-edit overview listing
Tobias Diekershoff [Sat, 18 Jul 2015 08:57:31 +0000 (10:57 +0200)]
show profile url in contact-edit overview listing

9 years agoMerge pull request #1767 from tobiasd/20150717-photonoshare
fabrixxm [Fri, 17 Jul 2015 15:28:25 +0000 (17:28 +0200)]
Merge pull request #1767 from tobiasd/20150717-photonoshare

make the 'noshare' checkbox checked by default for photo upload

9 years agomake the 'noshare' checkbox checked by default for photo upload
Tobias Diekershoff [Fri, 17 Jul 2015 15:05:55 +0000 (17:05 +0200)]
make the 'noshare' checkbox checked by default for photo upload

9 years agoMerge pull request #1765 from annando/1507-redmatrix-network-name
Tobias Diekershoff [Thu, 16 Jul 2015 12:34:54 +0000 (14:34 +0200)]
Merge pull request #1765 from annando/1507-redmatrix-network-name

Show "Redmatrix" as contact network

9 years agoMerge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name
Michael Vogel [Thu, 16 Jul 2015 08:18:07 +0000 (10:18 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name

9 years agoShow "Redmatrix" as network name.
Michael Vogel [Thu, 16 Jul 2015 08:09:59 +0000 (10:09 +0200)]
Show "Redmatrix" as network name.

9 years agoMerge pull request #1764 from annando/1507-ostatus-verb
Tobias Diekershoff [Wed, 15 Jul 2015 17:06:19 +0000 (19:06 +0200)]
Merge pull request #1764 from annando/1507-ostatus-verb

OStatus: Incoming favorites

9 years agoOStatus: Handling of unsupported verbs
Michael Vogel [Wed, 15 Jul 2015 16:27:44 +0000 (18:27 +0200)]
OStatus: Handling of unsupported verbs

9 years agoOStatus: Support for "Favorite" (like)
Michael Vogel [Wed, 15 Jul 2015 06:16:41 +0000 (08:16 +0200)]
OStatus: Support for "Favorite" (like)

9 years agoMerge pull request #1761 from annando/1507-update-name
Tobias Diekershoff [Wed, 15 Jul 2015 05:53:36 +0000 (07:53 +0200)]
Merge pull request #1761 from annando/1507-update-name

Update the name in the "self" contact when it is changed.

9 years agoUpdate the name in the "self" contact when it is changed.
Michael Vogel [Tue, 14 Jul 2015 20:24:43 +0000 (22:24 +0200)]
Update the name in the "self" contact when it is changed.

9 years agoMerge pull request #1760 from tobiasd/20150714-nl
Tobias Diekershoff [Tue, 14 Jul 2015 14:33:05 +0000 (16:33 +0200)]
Merge pull request #1760 from tobiasd/20150714-nl

NL update to the strings

9 years agoNL update to the strings
Tobias Diekershoff [Tue, 14 Jul 2015 14:31:45 +0000 (16:31 +0200)]
NL update to the strings

9 years agoMerge pull request #1758 from annando/1507-salmon
Tobias Diekershoff [Tue, 14 Jul 2015 14:24:54 +0000 (16:24 +0200)]
Merge pull request #1758 from annando/1507-salmon

OStatus Salmon improvements (Follow, Unfollow works)

9 years agoremoved logger entry
Michael Vogel [Tue, 14 Jul 2015 06:52:54 +0000 (08:52 +0200)]
removed logger entry

9 years agoMerge pull request #1757 from tobiasd/20150713-de
Michael Vogel [Mon, 13 Jul 2015 22:01:23 +0000 (00:01 +0200)]
Merge pull request #1757 from tobiasd/20150713-de

DE: update to the strings

9 years agoRemoved unused template
Michael Vogel [Mon, 13 Jul 2015 21:56:45 +0000 (23:56 +0200)]
Removed unused template

9 years agoFollow/Unfollow now works from OStatus.
Michael Vogel [Mon, 13 Jul 2015 21:50:33 +0000 (23:50 +0200)]
Follow/Unfollow now works from OStatus.

9 years agoSalmon: Don't store contact data before the message was authenticated.
Michael Vogel [Mon, 13 Jul 2015 12:34:28 +0000 (14:34 +0200)]
Salmon: Don't store contact data before the message was authenticated.

9 years agoDE: update to the strings
Tobias Diekershoff [Mon, 13 Jul 2015 06:14:00 +0000 (08:14 +0200)]
DE: update to the strings

9 years agoReworked salmon import
Michael Vogel [Mon, 13 Jul 2015 06:06:51 +0000 (08:06 +0200)]
Reworked salmon import

9 years agoMerge pull request #1756 from annando/1507-autofollow
Tobias Diekershoff [Sun, 12 Jul 2015 20:02:24 +0000 (22:02 +0200)]
Merge pull request #1756 from annando/1507-autofollow

The autofollow option is moved from the addons to the core

9 years agoThe autofollow option is moved from the addons to the core.
Michael Vogel [Sun, 12 Jul 2015 19:37:49 +0000 (21:37 +0200)]
The autofollow option is moved from the addons to the core.

9 years agoMerge pull request #1755 from annando/1507-template-update
Tobias Diekershoff [Sun, 12 Jul 2015 19:08:11 +0000 (21:08 +0200)]
Merge pull request #1755 from annando/1507-template-update

Vier: Some template updates

9 years agoremoved the picture width, since it is already in the style sheet.
Michael Vogel [Sun, 12 Jul 2015 18:31:49 +0000 (20:31 +0200)]
removed the picture width, since it is already in the style sheet.

9 years agoUpdated templates for "vier" (See issue 1733)
Michael Vogel [Sun, 12 Jul 2015 18:27:54 +0000 (20:27 +0200)]
Updated templates for "vier" (See issue 1733)

9 years agoMerge pull request #1752 from tobiasd/20150712-issue1747
Michael Vogel [Sun, 12 Jul 2015 16:12:19 +0000 (18:12 +0200)]
Merge pull request #1752 from tobiasd/20150712-issue1747

issue 1747

9 years agoMerge pull request #1754 from rabuzarus/share-jotnets
Tobias Diekershoff [Sun, 12 Jul 2015 16:06:11 +0000 (18:06 +0200)]
Merge pull request #1754 from rabuzarus/share-jotnets

add jotnets for sharing posts

9 years agoMerge pull request #1753 from rabuzarus/savedsearch-fix
Tobias Diekershoff [Sun, 12 Jul 2015 16:05:41 +0000 (18:05 +0200)]
Merge pull request #1753 from rabuzarus/savedsearch-fix

fix for saving searches

9 years agoadd jotnets for sharing posts
rabuzarus [Sun, 12 Jul 2015 15:52:25 +0000 (17:52 +0200)]
add jotnets for sharing posts

9 years agofix for saving searches
rabuzarus [Sun, 12 Jul 2015 15:43:50 +0000 (17:43 +0200)]
fix for saving searches

9 years agodont use an empty li, but make a new list for visual separation
Tobias Diekershoff [Sun, 12 Jul 2015 14:16:54 +0000 (16:16 +0200)]
dont use an empty li, but make a new list for visual separation

9 years agoMerge pull request #1750 from annando/1507-contact-update
Tobias Diekershoff [Sun, 12 Jul 2015 13:32:29 +0000 (15:32 +0200)]
Merge pull request #1750 from annando/1507-contact-update

Automatic contact update

9 years agoLikes do federate ...
Michael Vogel [Sun, 12 Jul 2015 12:57:09 +0000 (14:57 +0200)]
Likes do federate ...

9 years agoMerge pull request #1751 from annando/1507-diaspora-contact-links
Tobias Diekershoff [Sun, 12 Jul 2015 11:54:41 +0000 (13:54 +0200)]
Merge pull request #1751 from annando/1507-diaspora-contact-links

Diaspora: Shared posts looking better, mentions are now links

9 years agoRemove a useless comment
Michael Vogel [Sun, 12 Jul 2015 10:17:12 +0000 (12:17 +0200)]
Remove a useless comment

9 years agoMoved the needed include to a better place.
Michael Vogel [Sun, 12 Jul 2015 10:03:39 +0000 (12:03 +0200)]
Moved the needed include to a better place.

9 years agoOnly update communication relevant data. And only update if needed.
Michael Vogel [Sun, 12 Jul 2015 09:46:08 +0000 (11:46 +0200)]
Only update communication relevant data. And only update if needed.

9 years agoSome more test code removed
Michael Vogel [Sun, 12 Jul 2015 09:24:01 +0000 (11:24 +0200)]
Some more test code removed

9 years agoTesting code removed
Michael Vogel [Sun, 12 Jul 2015 09:22:36 +0000 (11:22 +0200)]
Testing code removed

9 years agoSome precaution to avoid overwriting of existing data with blanks
Michael Vogel [Sun, 12 Jul 2015 09:19:40 +0000 (11:19 +0200)]
Some precaution to avoid overwriting of existing data with blanks

9 years agoGUID should be urlencoded in template since it is urlencoded in uri as well.
Michael Vogel [Sat, 11 Jul 2015 12:37:02 +0000 (14:37 +0200)]
GUID should be urlencoded in template since it is urlencoded in uri as well.

9 years agoAutomatically update contact data.
Michael Vogel [Sat, 11 Jul 2015 12:36:04 +0000 (14:36 +0200)]
Automatically update contact data.

9 years agoMerge pull request #1742 from tobiasd/20150708-typo
Tobias Diekershoff [Wed, 8 Jul 2015 16:39:55 +0000 (18:39 +0200)]
Merge pull request #1742 from tobiasd/20150708-typo

typo

9 years agoupdate to the master strings
Tobias Diekershoff [Wed, 8 Jul 2015 11:20:43 +0000 (13:20 +0200)]
update to the master strings

9 years agotypo
Tobias Diekershoff [Wed, 8 Jul 2015 11:15:14 +0000 (13:15 +0200)]
typo

9 years agoMerge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
Michael Vogel [Mon, 6 Jul 2015 15:35:48 +0000 (17:35 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links

9 years agoMerge branch 'master' into develop
Fabrixxm [Mon, 6 Jul 2015 14:56:49 +0000 (16:56 +0200)]
Merge branch 'master' into develop

9 years agoMerge branch '3.4.1'
fabrixxm [Mon, 6 Jul 2015 12:52:23 +0000 (14:52 +0200)]
Merge branch '3.4.1'

9 years agoMerge pull request #1737 from fabrixxm/changelog
Tobias Diekershoff [Mon, 6 Jul 2015 12:36:08 +0000 (14:36 +0200)]
Merge pull request #1737 from fabrixxm/changelog

small updates to CHANGELOG

9 years agosmall updates to CHANGELOG
fabrixxm [Mon, 6 Jul 2015 12:30:52 +0000 (14:30 +0200)]
small updates to CHANGELOG

9 years agoMerge pull request #1736 from fabrixxm/changelog
Michael Vogel [Mon, 6 Jul 2015 12:28:20 +0000 (14:28 +0200)]
Merge pull request #1736 from fabrixxm/changelog

Update Changelog and version

9 years agofix typos in changelog
fabrixxm [Mon, 6 Jul 2015 12:19:21 +0000 (14:19 +0200)]
fix typos in changelog

9 years agoUpdate version
Fabrixxm [Mon, 6 Jul 2015 10:49:43 +0000 (12:49 +0200)]
Update version

9 years agoUpdate CHANGELOG
Fabrixxm [Mon, 6 Jul 2015 10:48:57 +0000 (12:48 +0200)]
Update CHANGELOG

9 years agoDon't deliver answers to OStatus messages to Diaspora
Michael Vogel [Sun, 5 Jul 2015 14:27:03 +0000 (16:27 +0200)]
Don't deliver answers to OStatus messages to Diaspora

9 years agoDiaspora: Improved parsing of linefeeds
Michael Vogel [Sun, 5 Jul 2015 00:33:28 +0000 (02:33 +0200)]
Diaspora: Improved parsing of linefeeds

9 years agoWhen posting to Diaspora, now the contact names are containing the link to the user...
Michael Vogel [Sat, 4 Jul 2015 21:49:52 +0000 (23:49 +0200)]
When posting to Diaspora, now the contact names are containing the link to the user profile.

9 years agoMerge pull request #1724 from rabuzarus/theme_uid
Tobias Diekershoff [Sat, 4 Jul 2015 05:14:24 +0000 (07:14 +0200)]
Merge pull request #1724 from rabuzarus/theme_uid

fix mobile-view

9 years agoMerge pull request #1726 from rabuzarus/acl-var
fabrixxm [Thu, 2 Jul 2015 10:13:14 +0000 (12:13 +0200)]
Merge pull request #1726 from rabuzarus/acl-var

fix for #1725

9 years agoinlude jotnets for bookmark acl
rabuzarus [Thu, 2 Jul 2015 10:09:40 +0000 (12:09 +0200)]
inlude jotnets for bookmark acl

9 years agofix toggle mobile/desktop view
rabuzarus [Thu, 2 Jul 2015 00:55:03 +0000 (02:55 +0200)]
fix toggle mobile/desktop view

9 years agofix for mobile-view on system pages
rabuzarus [Thu, 2 Jul 2015 00:15:36 +0000 (02:15 +0200)]
fix for mobile-view on system pages

9 years agofix mobile-view
rabuzarus [Wed, 1 Jul 2015 14:22:08 +0000 (16:22 +0200)]
fix mobile-view

9 years agoMerge pull request #1722 from annando/1506-password-on-install
Tobias Diekershoff [Wed, 1 Jul 2015 05:53:25 +0000 (07:53 +0200)]
Merge pull request #1722 from annando/1506-password-on-install

Ability to enter a password when the first user is created

9 years agoAdded help text
Michael Vogel [Tue, 30 Jun 2015 22:41:04 +0000 (00:41 +0200)]
Added help text

9 years agoAbility to enter a password when the first user is created
Michael Vogel [Tue, 30 Jun 2015 21:37:31 +0000 (23:37 +0200)]
Ability to enter a password when the first user is created

9 years agoMerge pull request #1721 from rabuzarus/settings_translate
Tobias Diekershoff [Tue, 30 Jun 2015 18:19:43 +0000 (20:19 +0200)]
Merge pull request #1721 from rabuzarus/settings_translate

system settings is now a variable in settings_display.tpl

9 years agosystem settings is now a variable in settings_display.tpl
rabuzarus [Tue, 30 Jun 2015 12:51:14 +0000 (14:51 +0200)]
system settings is now a variable in settings_display.tpl

9 years agoMerge pull request #1719 from tobiasd/20150630-de
fabrixxm [Tue, 30 Jun 2015 08:01:26 +0000 (10:01 +0200)]
Merge pull request #1719 from tobiasd/20150630-de

update translations for DE and IT

9 years agoDE update to the strings
Tobias Diekershoff [Tue, 30 Jun 2015 07:45:05 +0000 (09:45 +0200)]
DE update to the strings

9 years agoIT update to the strings
Tobias Diekershoff [Tue, 30 Jun 2015 07:44:53 +0000 (09:44 +0200)]
IT update to the strings

9 years agoMerge pull request #1711 from fabrixxm/lang
fabrixxm [Tue, 30 Jun 2015 06:44:49 +0000 (08:44 +0200)]
Merge pull request #1711 from fabrixxm/lang

Update messages.po

9 years agoupdate util/messages.po
Fabrixxm [Tue, 30 Jun 2015 06:44:16 +0000 (08:44 +0200)]
update util/messages.po

9 years agoMerge branch 'develop' into lang
Fabrixxm [Tue, 30 Jun 2015 06:43:02 +0000 (08:43 +0200)]
Merge branch 'develop' into lang

9 years agoMerge pull request #1715 from rabuzarus/theme_uid
fabrixxm [Tue, 30 Jun 2015 06:41:07 +0000 (08:41 +0200)]
Merge pull request #1715 from rabuzarus/theme_uid

use local theme settings for visitors

9 years agoMerge pull request #1714 from annando/1506-mail-link-profile
fabrixxm [Tue, 30 Jun 2015 06:37:40 +0000 (08:37 +0200)]
Merge pull request #1714 from annando/1506-mail-link-profile

Show preselected mail receivers

9 years agoMerge pull request #1713 from annando/1506-ostatus-completion-timeframe
fabrixxm [Tue, 30 Jun 2015 06:36:33 +0000 (08:36 +0200)]
Merge pull request #1713 from annando/1506-ostatus-completion-timeframe

There is now two different checks for the completion of conversations

9 years agoMerge pull request #1712 from annando/1506-ostatus-guid
fabrixxm [Tue, 30 Jun 2015 06:35:33 +0000 (08:35 +0200)]
Merge pull request #1712 from annando/1506-ostatus-guid

OStatus: Use the GUID format for the link to the item

9 years agoMerge pull request #1716 from annando/1506-no-googlemap
fabrixxm [Tue, 30 Jun 2015 06:27:59 +0000 (08:27 +0200)]
Merge pull request #1716 from annando/1506-no-googlemap

Removed Google Maps

9 years agoMerge pull request #1717 from annando/1506-ostatus-ignore-delete
fabrixxm [Tue, 30 Jun 2015 06:27:03 +0000 (08:27 +0200)]
Merge pull request #1717 from annando/1506-ostatus-ignore-delete

OStatus: By using Qvitter, users can delete items.

9 years agoOStatus: By using Qvitter, users can delete items. We can't handle that by now, so...
Michael Vogel [Tue, 30 Jun 2015 06:08:02 +0000 (08:08 +0200)]
OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.

9 years agoRemoved Google Maps
Michael Vogel [Tue, 30 Jun 2015 05:42:59 +0000 (07:42 +0200)]
Removed Google Maps

9 years agomake supported themes compatible with get_theme_uid
rabuzarus [Mon, 29 Jun 2015 21:03:44 +0000 (23:03 +0200)]
make supported themes compatible with get_theme_uid

9 years agoMail link in profile page
Michael Vogel [Mon, 29 Jun 2015 20:54:26 +0000 (22:54 +0200)]
Mail link in profile page

9 years agoThere is now two different checks for the completion of conversations
Michael Vogel [Mon, 29 Jun 2015 19:53:59 +0000 (21:53 +0200)]
There is now two different checks for the completion of conversations

9 years agoOStatus: Use the GUID format for the link to the item
Michael Vogel [Mon, 29 Jun 2015 19:49:42 +0000 (21:49 +0200)]
OStatus: Use the GUID format for the link to the item

9 years agoupdate util/messages.po
Fabrixxm [Mon, 29 Jun 2015 13:59:28 +0000 (15:59 +0200)]
update util/messages.po

9 years agoAdd new option "-s" to run_xgettext. Fix paths.
Fabrixxm [Mon, 29 Jun 2015 13:55:27 +0000 (15:55 +0200)]
Add new option "-s" to run_xgettext. Fix paths.

with this option, current directory is scanned for strings, and message.po is saved in lang/C subdir.
This is usefull when developing new addons outside from friendica tree.

9 years agoMerge pull request #1696 from rabuzarus/acl-var
fabrixxm [Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)]
Merge pull request #1696 from rabuzarus/acl-var

move jotnets to populate_acl

9 years agoMerge pull request #1698 from rabuzarus/identity
fabrixxm [Mon, 29 Jun 2015 11:52:07 +0000 (13:52 +0200)]
Merge pull request #1698 from rabuzarus/identity

move some identity related functions to identity.php