]> git.mxchange.org Git - friendica.git/log
friendica.git
10 years agotweak quattro theme
Fabrixxm [Wed, 17 Sep 2014 08:59:19 +0000 (10:59 +0200)]
tweak quattro theme

10 years agoMerge branch 'Beanow-feature/collapse-menulink' into friendica/master
Fabrixxm [Wed, 17 Sep 2014 06:59:01 +0000 (08:59 +0200)]
Merge branch 'Beanow-feature/collapse-menulink' into friendica/master

10 years agoremove dollar sign
Fabrixxm [Wed, 17 Sep 2014 06:57:53 +0000 (08:57 +0200)]
remove dollar sign

10 years agoMerge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into...
Fabrixxm [Wed, 17 Sep 2014 06:54:46 +0000 (08:54 +0200)]
Merge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into Beanow-feature/collapse-menulink

10 years agoMerge pull request #1147 from tugelbend/master
fabrixxm [Wed, 17 Sep 2014 06:49:54 +0000 (08:49 +0200)]
Merge pull request #1147 from tugelbend/master

small js bug fix, vagrant works again

10 years agoMenu links now collapse if clicked again.
Beanow [Mon, 15 Sep 2014 23:21:27 +0000 (01:21 +0200)]
Menu links now collapse if clicked again.

10 years agomade vagrant partly work again
hauke [Mon, 15 Sep 2014 17:48:47 +0000 (19:48 +0200)]
made vagrant partly work again

10 years agobug fix: live function is deprecated
hauke [Mon, 15 Sep 2014 17:48:17 +0000 (19:48 +0200)]
bug fix: live function is deprecated

10 years agoMerge pull request #1144 from tobiasd/docs2014
tobiasd [Sun, 14 Sep 2014 19:37:31 +0000 (21:37 +0200)]
Merge pull request #1144 from tobiasd/docs2014

documentation

10 years agomissing ?
Tobias Diekershoff [Sun, 14 Sep 2014 07:17:21 +0000 (09:17 +0200)]
missing ?

10 years agoadded list of clients to the FAQ
Tobias Diekershoff [Sun, 14 Sep 2014 07:06:47 +0000 (09:06 +0200)]
added list of clients to the FAQ

10 years agoadd API docs to home.md
Tobias Diekershoff [Sat, 13 Sep 2014 06:10:03 +0000 (08:10 +0200)]
add API docs to home.md

10 years agoMerge pull request #1143 from annando/master
tobiasd [Fri, 12 Sep 2014 04:58:41 +0000 (06:58 +0200)]
Merge pull request #1143 from annando/master

Bugfix: "nurl" wasn't set/"remoteconnect" was missing in several templates

10 years agoIn the profiles the remote connect field was missing
Michael Vogel [Thu, 11 Sep 2014 21:38:24 +0000 (23:38 +0200)]
In the profiles the remote connect field was missing

10 years agoBugfix: When repairing the url, the nurl wasn't set.
Michael Vogel [Thu, 11 Sep 2014 21:37:55 +0000 (23:37 +0200)]
Bugfix: When repairing the url, the nurl wasn't set.

10 years agoMerge pull request #1142 from fabrixxm/quattro_update
fabrixxm [Thu, 11 Sep 2014 17:01:20 +0000 (19:01 +0200)]
Merge pull request #1142 from fabrixxm/quattro_update

fix quattro scroll and flash and vier flash on display page

10 years agofix quattro scroll and flash and vier flash on display page
fabrixxm [Thu, 11 Sep 2014 16:56:33 +0000 (18:56 +0200)]
fix quattro scroll and flash and vier flash on display page

10 years agoMerge pull request #1140 from fabrixxm/master
fabrixxm [Wed, 10 Sep 2014 17:08:07 +0000 (19:08 +0200)]
Merge pull request #1140 from fabrixxm/master

Update IT strings

10 years agoUpdate IT strings
fabrixxm [Wed, 10 Sep 2014 17:05:43 +0000 (19:05 +0200)]
Update IT strings

10 years agoMerge pull request #1139 from fabrixxm/notifix
fabrixxm [Wed, 10 Sep 2014 16:33:01 +0000 (18:33 +0200)]
Merge pull request #1139 from fabrixxm/notifix

Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

10 years agoOverride 'enotify_no_content' system option if type is SYSTEM_EMAIL
fabrixxm [Wed, 10 Sep 2014 16:30:30 +0000 (18:30 +0200)]
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

10 years agoMerge pull request #1138 from fabrixxm/notifix
fabrixxm [Tue, 9 Sep 2014 20:10:16 +0000 (22:10 +0200)]
Merge pull request #1138 from fabrixxm/notifix

fix some emails

10 years agofix email for
fabrixxm [Tue, 9 Sep 2014 20:07:47 +0000 (22:07 +0200)]
fix email for
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny

10 years agocurrent API documentation from the github wiki
Tobias Diekershoff [Tue, 9 Sep 2014 06:41:58 +0000 (08:41 +0200)]
current API documentation from the github wiki

10 years agocopy of the Home.md so github has an index file to show
Tobias Diekershoff [Tue, 9 Sep 2014 06:41:35 +0000 (08:41 +0200)]
copy of the Home.md so github has an index file to show

10 years agoMerge pull request #1136 from tobiasd/33rc
tobiasd [Sun, 7 Sep 2014 18:43:29 +0000 (20:43 +0200)]
Merge pull request #1136 from tobiasd/33rc

RC for 3.3

10 years agoRC for 3.3
Tobias Diekershoff [Sun, 7 Sep 2014 18:41:33 +0000 (20:41 +0200)]
RC for 3.3

10 years agoMerge pull request #1133 from tugelbend/master
tobiasd [Sun, 7 Sep 2014 16:08:02 +0000 (18:08 +0200)]
Merge pull request #1133 from tugelbend/master

added cc license to default avatar

10 years agoMerge pull request #1132 from tobiasd/20140907b
tobiasd [Sun, 7 Sep 2014 16:04:49 +0000 (18:04 +0200)]
Merge pull request #1132 from tobiasd/20140907b

missing template file

10 years agoadded cc license to default avatar
hauke [Sun, 7 Sep 2014 16:04:35 +0000 (18:04 +0200)]
added cc license to default avatar

10 years agomissed the settings template for duepunto
Tobias Diekershoff [Sun, 7 Sep 2014 16:02:58 +0000 (18:02 +0200)]
missed the settings template for duepunto

10 years agoMerge pull request #1131 from fabrixxm/master
tobiasd [Sun, 7 Sep 2014 15:52:52 +0000 (17:52 +0200)]
Merge pull request #1131 from fabrixxm/master

Bug fixes!

10 years agofix email to new registerd users.
fabrixxm [Sun, 7 Sep 2014 15:46:31 +0000 (17:46 +0200)]
fix email to new registerd users.
fix notification in case of error sending email.

10 years agofix update routine to support update from 3.2
fabrixxm [Sun, 7 Sep 2014 15:28:38 +0000 (17:28 +0200)]
fix update routine to support update from 3.2
disable PDO support

10 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.

10 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

10 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

10 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

10 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

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

10 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.

10 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.

10 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.

10 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

10 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

10 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

10 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

10 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

10 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

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

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

10 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

10 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

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

10 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

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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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.

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

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

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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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()

10 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).

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

10 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

10 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

10 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

10 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.

10 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.

10 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

10 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

10 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

10 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

10 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.

10 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

10 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.

10 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

10 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

10 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

10 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.

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