]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoMerge pull request #1128 from Beanow/hotfix/settings-styling
tobiasd [Sun, 7 Sep 2014 15:15:30 +0000 (17:15 +0200)]
Merge pull request #1128 from Beanow/hotfix/settings-styling

Added styling to show settings headers can be clicked.

9 years agoMerge pull request #1130 from tugelbend/master
tobiasd [Sun, 7 Sep 2014 15:13:47 +0000 (17:13 +0200)]
Merge pull request #1130 from tugelbend/master

new default avatar by Andi Stadler

9 years agoMerge branch 'master' of https://github.com/friendica/friendica
hauke [Sun, 7 Sep 2014 15:07:14 +0000 (17:07 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

9 years agonew default icon by Andi Stadler
hauke [Sun, 7 Sep 2014 15:06:21 +0000 (17:06 +0200)]
new default icon by Andi Stadler

9 years agoMerge pull request #1129 from tobiasd/20140907a
tobiasd [Sun, 7 Sep 2014 15:01:13 +0000 (17:01 +0200)]
Merge pull request #1129 from tobiasd/20140907a

typo in dbstructure.php

9 years agofixing a typo
Tobias Diekershoff [Sun, 7 Sep 2014 14:59:01 +0000 (16:59 +0200)]
fixing a typo

9 years agoAdded styling to show settings headers can be clicked.
Beanow [Sun, 7 Sep 2014 14:24:40 +0000 (16:24 +0200)]
Added styling to show settings headers can be clicked.

9 years agoMerge pull request #1127 from Beanow/hotfix/whitespace-issue
tobiasd [Sun, 7 Sep 2014 14:22:37 +0000 (16:22 +0200)]
Merge pull request #1127 from Beanow/hotfix/whitespace-issue

Fixed whitespace issue causing trueish results in templates.

9 years agoFixed whitespace issue causing trueish results in templates.
Beanow [Sun, 7 Sep 2014 13:48:44 +0000 (15:48 +0200)]
Fixed whitespace issue causing trueish results in templates.

For example: profiles would show labels with no content.

9 years agoMerge pull request #1126 from tobiasd/1754
tobiasd [Sun, 7 Sep 2014 13:38:43 +0000 (15:38 +0200)]
Merge pull request #1126 from tobiasd/1754

revup after the Hackathon in Berlin

9 years agorevup after the Hackathon in Berlin
Tobias Diekershoff [Sun, 7 Sep 2014 13:36:23 +0000 (15:36 +0200)]
revup after the Hackathon in Berlin

9 years agoMerge pull request #1123 from fabrixxm/mail_notification_cleanup
fabrixxm [Sun, 7 Sep 2014 13:05:06 +0000 (15:05 +0200)]
Merge pull request #1123 from fabrixxm/mail_notification_cleanup

Mail notification cleanup

9 years agoMerge pull request #1124 from tobiasd/duepuntoderivs
fabrixxm [Sun, 7 Sep 2014 13:04:26 +0000 (15:04 +0200)]
Merge pull request #1124 from tobiasd/duepuntoderivs

added variations of duepuntozero to the theme as options to be selected

9 years agoMerge pull request #1122 from tugelbend/master
fabrixxm [Sun, 7 Sep 2014 12:56:55 +0000 (14:56 +0200)]
Merge pull request #1122 from tugelbend/master

Updated smarty template to 3.1.19

9 years agoremoved fancybox as it is not used anywhere
hauke [Sun, 7 Sep 2014 12:54:10 +0000 (14:54 +0200)]
removed fancybox as it is not used anywhere

9 years agoupdate messages.po
fabrixxm [Sun, 7 Sep 2014 12:32:41 +0000 (14:32 +0200)]
update messages.po

9 years agoremove screenshot for greenzero
Tobias Diekershoff [Sun, 7 Sep 2014 12:31:46 +0000 (14:31 +0200)]
remove screenshot for greenzero

9 years agoupdate of fullcalender to v1.6.4
hauke [Sun, 7 Sep 2014 12:31:01 +0000 (14:31 +0200)]
update of fullcalender to v1.6.4

9 years agoMerge remote-tracking branch 'friendica/master' into mail_notification_cleanup
fabrixxm [Sun, 7 Sep 2014 12:28:03 +0000 (14:28 +0200)]
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup

9 years agodeleted some editicon.png copies
Tobias Diekershoff [Sun, 7 Sep 2014 12:23:24 +0000 (14:23 +0200)]
deleted some editicon.png copies

9 years agodb update mail via notification()
fabrixxm [Sun, 7 Sep 2014 12:23:03 +0000 (14:23 +0200)]
db update mail via notification()
remove last template

9 years agoupdating config files for duepuntozero
Tobias Diekershoff [Sun, 7 Sep 2014 12:00:09 +0000 (14:00 +0200)]
updating config files for duepuntozero

9 years agoadded slackr to duepuntoderivates
Tobias Diekershoff [Sun, 7 Sep 2014 11:57:51 +0000 (13:57 +0200)]
added slackr to duepuntoderivates

9 years agoregistration request as system notification
fabrixxm [Sun, 7 Sep 2014 11:55:02 +0000 (13:55 +0200)]
registration request as system notification
kill the template
send email to all admins

9 years agoadded purplezero to duepunto as variation
Tobias Diekershoff [Sun, 7 Sep 2014 11:41:02 +0000 (13:41 +0200)]
added purplezero to duepunto as variation

9 years agoreverting tinymce changes, updating smarty to 3.1.19
hauke [Sun, 7 Sep 2014 11:38:28 +0000 (13:38 +0200)]
reverting tinymce changes, updating smarty to 3.1.19

9 years agorevive easterbunny from the dead
Tobias Diekershoff [Sun, 7 Sep 2014 11:29:56 +0000 (13:29 +0200)]
revive easterbunny from the dead

9 years agoadded Comix as a colorset of duepuntozero
Tobias Diekershoff [Sun, 7 Sep 2014 11:09:02 +0000 (13:09 +0200)]
added Comix as a colorset of duepuntozero

9 years agoadded darkzero as colorset of duepuntozero
Tobias Diekershoff [Sun, 7 Sep 2014 11:01:23 +0000 (13:01 +0200)]
added darkzero as colorset of duepuntozero

9 years agoMerge branch 'master' of https://github.com/friendica/friendica
hauke [Sun, 7 Sep 2014 10:51:39 +0000 (12:51 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

9 years agoupdated tinymce to 3.5.11
hauke [Sun, 7 Sep 2014 10:51:05 +0000 (12:51 +0200)]
updated tinymce to 3.5.11

9 years agoadded Greenzero as colorset of duepuntozero
Tobias Diekershoff [Sun, 7 Sep 2014 10:48:23 +0000 (12:48 +0200)]
added Greenzero as colorset of duepuntozero

9 years agoMerge pull request #1121 from Beanow/hotfix/bug-1105
fabrixxm [Sun, 7 Sep 2014 10:48:13 +0000 (12:48 +0200)]
Merge pull request #1121 from Beanow/hotfix/bug-1105

Fix illegal offset error for vier and quattro.

9 years agoSomebody stop me! (not really..)
fabrixxm [Sun, 7 Sep 2014 10:35:08 +0000 (12:35 +0200)]
Somebody stop me! (not really..)

9 years agoMore template gore!
fabrixxm [Sun, 7 Sep 2014 10:29:13 +0000 (12:29 +0200)]
More template gore!

9 years agoanother massacre of templates
fabrixxm [Sun, 7 Sep 2014 09:48:23 +0000 (11:48 +0200)]
another massacre of templates

9 years agoFix illegal offset error for vier and quattro.
Beanow [Sun, 7 Sep 2014 09:47:08 +0000 (11:47 +0200)]
Fix illegal offset error for vier and quattro.

Fixes #1105

9 years agoMerge pull request #1120 from silke/deprecated-themes
fabrixxm [Sun, 7 Sep 2014 09:42:04 +0000 (11:42 +0200)]
Merge pull request #1120 from silke/deprecated-themes

Deprecated themes

9 years agoMerge pull request #1119 from annando/1409-issue-881
fabrixxm [Sun, 7 Sep 2014 09:41:51 +0000 (11:41 +0200)]
Merge pull request #1119 from annando/1409-issue-881

The useragent string doesn't contains of the words "Mozilla" anymore

9 years agoMerge pull request #1118 from tugelbend/master
fabrixxm [Sun, 7 Sep 2014 09:37:55 +0000 (11:37 +0200)]
Merge pull request #1118 from tugelbend/master

bug fix #1115: settings were hidden on "social network" and "plugin" page

9 years agoMerge pull request #1117 from annando/1409-suppress-unsported-themes
fabrixxm [Sun, 7 Sep 2014 09:37:25 +0000 (11:37 +0200)]
Merge pull request #1117 from annando/1409-suppress-unsported-themes

Unsupported themes aren't displayed anymore

9 years agofix indentation
fabrixxm [Sun, 7 Sep 2014 09:31:42 +0000 (11:31 +0200)]
fix indentation

9 years agohtml mail template add img tag only if source_photo is defined
fabrixxm [Sun, 7 Sep 2014 09:20:56 +0000 (11:20 +0200)]
html mail template add img tag only if source_photo is defined

9 years agonew password mail via notification()
fabrixxm [Sun, 7 Sep 2014 09:20:06 +0000 (11:20 +0200)]
new password mail via notification()
new include/text.php::deindent() function
remove unused templates

9 years agomarked four more themes as unsupported
Silke Meyer [Sun, 7 Sep 2014 09:00:58 +0000 (11:00 +0200)]
marked four more themes as unsupported

9 years agoThe useragent string doesn't contains of the words "Mozilla" anymore - but the name...
Michael Vogel [Sun, 7 Sep 2014 08:47:37 +0000 (10:47 +0200)]
The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url

9 years agolost password verification mail via notification()
fabrixxm [Sun, 7 Sep 2014 08:27:39 +0000 (10:27 +0200)]
lost password verification mail via notification()

9 years agoMarked several themes from the zero theme as deprecated (all but
Silke Meyer [Sun, 7 Sep 2014 08:26:45 +0000 (10:26 +0200)]
Marked several themes from the zero theme as deprecated (all but
duepunto).

9 years agobug fix #1115
hauke [Sun, 7 Sep 2014 08:26:38 +0000 (10:26 +0200)]
bug fix #1115

9 years agoUnsupported themes aren't displayed anymore
Michael Vogel [Sun, 7 Sep 2014 08:06:57 +0000 (10:06 +0200)]
Unsupported themes aren't displayed anymore

9 years agoMerge pull request #1116 from silke/unsupported-themes
fabrixxm [Sun, 7 Sep 2014 07:02:51 +0000 (09:02 +0200)]
Merge pull request #1116 from silke/unsupported-themes

Marked several old themes as unsupported

9 years agoMarked several old themes as unsupported
Silke Meyer [Sun, 7 Sep 2014 06:17:22 +0000 (08:17 +0200)]
Marked several old themes as unsupported

9 years agoMerge pull request #1114 from annando/1409-api-search-users
fabrixxm [Sun, 7 Sep 2014 05:40:44 +0000 (07:40 +0200)]
Merge pull request #1114 from annando/1409-api-search-users

API: The command "users/search" is now supported.

9 years agoAPI: The command "users/search" is now supported.
Michael Vogel [Sun, 7 Sep 2014 05:32:09 +0000 (07:32 +0200)]
API: The command "users/search" is now supported.

9 years agoMerge pull request #1112 from tugelbend/master
tobiasd [Sat, 6 Sep 2014 21:26:10 +0000 (23:26 +0200)]
Merge pull request #1112 from tugelbend/master

bug fix: library shouldn't be included remotely

9 years agobug fix, wrong js lib included
hauke [Sat, 6 Sep 2014 17:14:58 +0000 (19:14 +0200)]
bug fix, wrong js lib included

9 years agosend ostatus follow/share notifications via notification()
fabrixxm [Sat, 6 Sep 2014 16:15:18 +0000 (18:15 +0200)]
send ostatus follow/share notifications via notification()
remove unused templates

9 years agoMerge branch 'master' of https://github.com/friendica/friendica
hauke [Sat, 6 Sep 2014 15:51:00 +0000 (17:51 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

9 years agoMerge pull request #1111 from tugelbend/master
tobiasd [Sat, 6 Sep 2014 15:50:44 +0000 (17:50 +0200)]
Merge pull request #1111 from tugelbend/master

minified js files were out of date and inconsistently used.

9 years agoMerge branch 'master' of https://github.com/friendica/friendica
hauke [Sat, 6 Sep 2014 15:50:32 +0000 (17:50 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

9 years agoMerge pull request #1110 from annando/1409-issue-1094
tobiasd [Sat, 6 Sep 2014 15:48:56 +0000 (17:48 +0200)]
Merge pull request #1110 from annando/1409-issue-1094

Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.

9 years agoMerge pull request #1109 from tugelbend/master
tobiasd [Sat, 6 Sep 2014 15:48:02 +0000 (17:48 +0200)]
Merge pull request #1109 from tugelbend/master

Sections on setting pages fold/unfold on click

9 years agominified js files where out of date and inconsistently used. Removed until decision...
hauke [Sat, 6 Sep 2014 15:46:31 +0000 (17:46 +0200)]
minified js files where out of date and inconsistently used. Removed until decision on minifying strategy

9 years agoconnection confirm notification mail via notification()
fabrixxm [Sat, 6 Sep 2014 15:28:46 +0000 (17:28 +0200)]
connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server

9 years agoIssue 1094: "remote self" is not working on twitter contacts but can be activated...
Michael Vogel [Sat, 6 Sep 2014 15:22:59 +0000 (17:22 +0200)]
Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.

9 years agoMerge branch 'release/ui-improvements'
hauke [Sat, 6 Sep 2014 15:02:25 +0000 (17:02 +0200)]
Merge branch 'release/ui-improvements'

9 years agochanged cursor style on settings page globally
hauke [Sat, 6 Sep 2014 15:01:05 +0000 (17:01 +0200)]
changed cursor style on settings page globally

9 years agoMerge branch 'feature/2014-09-hackathon-ui-improvements' into develop
hauke [Sat, 6 Sep 2014 14:55:07 +0000 (16:55 +0200)]
Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop

9 years agoMerge pull request #1108 from tugelbend/master
tobiasd [Sat, 6 Sep 2014 14:35:24 +0000 (16:35 +0200)]
Merge pull request #1108 from tugelbend/master

jquery update to version 1.11

9 years agoMerge branch 'release/jquery-update'
hauke [Sat, 6 Sep 2014 14:24:42 +0000 (16:24 +0200)]
Merge branch 'release/jquery-update'

9 years agoupdated jquery to version 1.11, updated themes frost and diabook where necessary
hauke [Sat, 6 Sep 2014 14:21:03 +0000 (16:21 +0200)]
updated jquery to version 1.11, updated themes frost and diabook where necessary

9 years agofix italian smarty3 email templates
fabrixxm [Sat, 6 Sep 2014 14:12:05 +0000 (16:12 +0200)]
fix italian smarty3 email templates

9 years agoMerge pull request #1107 from annando/1409-issue-964
tobiasd [Sat, 6 Sep 2014 13:57:35 +0000 (15:57 +0200)]
Merge pull request #1107 from annando/1409-issue-964

Issue 964 "Image upload from Twidere" is solved now

9 years agocleanup multipart email sending code
fabrixxm [Sat, 6 Sep 2014 13:52:53 +0000 (15:52 +0200)]
cleanup multipart email sending code
remove 'EmailNotification' class and rename 'enotify' class as 'Emailer'

9 years agoIssue 964 "Image upload from Twidere" is solved now
Michael Vogel [Sat, 6 Sep 2014 13:47:45 +0000 (15:47 +0200)]
Issue 964 "Image upload from Twidere" is solved now

9 years agoMerge pull request #1104 from fabrixxm/uimport_fix_avatar_urls
tobiasd [Sat, 6 Sep 2014 12:52:43 +0000 (14:52 +0200)]
Merge pull request #1104 from fabrixxm/uimport_fix_avatar_urls

fix avatars urls on profile import

9 years agoMerge pull request #1106 from silke/frost-mobile-modifications
tobiasd [Sat, 6 Sep 2014 12:52:12 +0000 (14:52 +0200)]
Merge pull request #1106 from silke/frost-mobile-modifications

Frost mobile modifications

9 years agoShrink user icons in timeline to 48x48
Silke Meyer [Sat, 6 Sep 2014 12:38:43 +0000 (14:38 +0200)]
Shrink user icons in timeline to 48x48

9 years agodifferent minor modifications
Silke Meyer [Sat, 6 Sep 2014 12:25:36 +0000 (14:25 +0200)]
different minor modifications

9 years agomake items on settings pages fold/unfold on click
hauke [Sat, 6 Sep 2014 11:53:23 +0000 (13:53 +0200)]
make items on settings pages fold/unfold on click

9 years agoMerge pull request #1103 from tobiasd/editsave
tobiasd [Sat, 6 Sep 2014 10:52:37 +0000 (12:52 +0200)]
Merge pull request #1103 from tobiasd/editsave

when editing a posting save it, not edit it to submit the changes

9 years agowhen editing a posting save it, not edit it to submit the changes
Tobias Diekershoff [Sat, 6 Sep 2014 10:49:34 +0000 (12:49 +0200)]
when editing a posting save it, not edit it to submit the changes

9 years agoReduced height of navbar
Silke Meyer [Sat, 6 Sep 2014 10:20:55 +0000 (12:20 +0200)]
Reduced height of navbar

9 years agoMerge pull request #1102 from tobiasd/newstrings20140906a
tobiasd [Sat, 6 Sep 2014 10:20:42 +0000 (12:20 +0200)]
Merge pull request #1102 from tobiasd/newstrings20140906a

updating message.po and string.php

9 years agoZH-CN: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:13:04 +0000 (12:13 +0200)]
ZH-CN: update to the strings

9 years agoRO: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:12:38 +0000 (12:12 +0200)]
RO: update to the strings

9 years agoPT-BR: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:12:19 +0000 (12:12 +0200)]
PT-BR: update to the strings

9 years agoPL: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:11:59 +0000 (12:11 +0200)]
PL: update to the strings

9 years agoNL: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:11:44 +0000 (12:11 +0200)]
NL: update to the strings

9 years agoNB-NO: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:11:00 +0000 (12:11 +0200)]
NB-NO: update to the strings

9 years agoIT: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:10:36 +0000 (12:10 +0200)]
IT: update to the strings

9 years agoIS: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:09:08 +0000 (12:09 +0200)]
IS: update to the strings

9 years agoRU: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:08:48 +0000 (12:08 +0200)]
RU: update to the strings

9 years agoFR: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:08:20 +0000 (12:08 +0200)]
FR: update to the strings

9 years agoES: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:08:02 +0000 (12:08 +0200)]
ES: update to the strings

9 years agoEO: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:07:45 +0000 (12:07 +0200)]
EO: update to the strings

9 years agoDE: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:07:13 +0000 (12:07 +0200)]
DE: update to the strings

9 years agoCA: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:05:44 +0000 (12:05 +0200)]
CA: update to the strings

9 years agoCS: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:05:25 +0000 (12:05 +0200)]
CS: update to the strings

9 years agoBG: update to the strings
Tobias Diekershoff [Sat, 6 Sep 2014 10:04:23 +0000 (12:04 +0200)]
BG: update to the strings