]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoSeveral improvements
Michael Vogel [Sat, 31 Mar 2012 14:28:39 +0000 (16:28 +0200)]
Several improvements

12 years agoMerge commit 'upstream/master'
Michael Vogel [Wed, 28 Mar 2012 17:52:30 +0000 (19:52 +0200)]
Merge commit 'upstream/master'

12 years agoMerge branch 'pull'
friendica [Wed, 28 Mar 2012 12:16:25 +0000 (05:16 -0700)]
Merge branch 'pull'

12 years agoMerge pull request #183 from simonlnu/master
Simon [Wed, 28 Mar 2012 10:49:10 +0000 (03:49 -0700)]
Merge pull request #183 from simonlnu/master

final pull req for now. really fixed.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 28 Mar 2012 10:48:05 +0000 (06:48 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master:

12 years agoreally fix it this time...
Simon L'nu [Wed, 28 Mar 2012 10:47:38 +0000 (06:47 -0400)]
really fix it this time...

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #182 from fabrixxm/master
fabrixxm [Wed, 28 Mar 2012 10:46:29 +0000 (03:46 -0700)]
Merge pull request #182 from fabrixxm/master

viewsrc returns only text if page is requested via ajax

12 years agoMerge pull request #181 from simonlnu/master
Simon [Wed, 28 Mar 2012 10:21:34 +0000 (03:21 -0700)]
Merge pull request #181 from simonlnu/master

how the default.php gets read just changed from under me. not pleasant.

12 years agoWITH is going on?
Simon L'nu [Wed, 28 Mar 2012 10:20:13 +0000 (06:20 -0400)]
WITH is going on?

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'pull'
friendica [Wed, 28 Mar 2012 10:19:42 +0000 (03:19 -0700)]
Merge branch 'pull'

12 years agotitle not updated when editing post
friendica [Wed, 28 Mar 2012 10:18:26 +0000 (03:18 -0700)]
title not updated when editing post

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 28 Mar 2012 10:05:54 +0000 (06:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  filer: replace "file as" prompt with combobox opened in fancybox
  filer: info() on item filed
  template: field_combobox

* master:

12 years agoMerge pull request #180 from simonlnu/master
Simon [Wed, 28 Mar 2012 10:03:47 +0000 (03:03 -0700)]
Merge pull request #180 from simonlnu/master

duh...

12 years agodoh fix
Simon L'nu [Wed, 28 Mar 2012 10:03:04 +0000 (06:03 -0400)]
doh fix

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #179 from fabrixxm/master
fabrixxm [Wed, 28 Mar 2012 10:00:24 +0000 (03:00 -0700)]
Merge pull request #179 from fabrixxm/master

new field_combobox template and some eyecandy to "file as" function

12 years agoMerge pull request #178 from simonlnu/master
Simon [Wed, 28 Mar 2012 09:55:15 +0000 (02:55 -0700)]
Merge pull request #178 from simonlnu/master

i fixed the worst but ...

12 years agoadd some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broke...
Simon L'nu [Wed, 28 Mar 2012 09:52:28 +0000 (05:52 -0400)]
add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 28 Mar 2012 09:42:47 +0000 (05:42 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  support autocomplete @-tags in plaintext mode
  vier navbar messed up after default theme template move
  profile_tabs hook
  use theme directory for page templates, not language directory
  turn on gecko spellcheck in tinymce
  small fix in diabook
  fixes in diabook
  provide a close-option for boxes in right_aside and store info via js and cookies
  provide a close-option for boxes in right_aside and store info via js and cookies
  form security error when using existing photo

* master:

12 years agoviewsrc: return only body if page is requested via ajax
Fabio Comuni [Wed, 28 Mar 2012 09:42:04 +0000 (11:42 +0200)]
viewsrc: return only body if page is requested via ajax

12 years agofiler: replace "file as" prompt with combobox opened in fancybox
Fabio Comuni [Wed, 28 Mar 2012 08:49:34 +0000 (10:49 +0200)]
filer: replace "file as" prompt with combobox opened in fancybox

12 years agofiler: info() on item filed
Fabio Comuni [Wed, 28 Mar 2012 08:45:16 +0000 (10:45 +0200)]
filer: info() on item filed

12 years agotemplate: field_combobox
Fabio Comuni [Wed, 28 Mar 2012 08:43:52 +0000 (10:43 +0200)]
template: field_combobox

a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.

12 years agosupport autocomplete @-tags in plaintext mode
friendica [Wed, 28 Mar 2012 07:44:45 +0000 (00:44 -0700)]
support autocomplete @-tags in plaintext mode

12 years agovier navbar messed up after default theme template move
friendica [Wed, 28 Mar 2012 07:16:22 +0000 (00:16 -0700)]
vier navbar messed up after default theme template move

12 years agoprofile_tabs hook
friendica [Wed, 28 Mar 2012 03:15:15 +0000 (20:15 -0700)]
profile_tabs hook

12 years agouse theme directory for page templates, not language directory
friendica [Wed, 28 Mar 2012 01:39:52 +0000 (18:39 -0700)]
use theme directory for page templates, not language directory

12 years agoMerge branch 'pull'
friendica [Tue, 27 Mar 2012 22:21:30 +0000 (15:21 -0700)]
Merge branch 'pull'

12 years agoturn on gecko spellcheck in tinymce
friendica [Tue, 27 Mar 2012 22:20:36 +0000 (15:20 -0700)]
turn on gecko spellcheck in tinymce

12 years agosmall fix in diabook
tommy tomson [Tue, 27 Mar 2012 21:41:19 +0000 (23:41 +0200)]
small fix in diabook

12 years agofixes in diabook
tommy tomson [Tue, 27 Mar 2012 21:27:43 +0000 (23:27 +0200)]
fixes in diabook

12 years agoMerge pull request #177 from tomtom84/master
tomtom84 [Tue, 27 Mar 2012 17:05:32 +0000 (10:05 -0700)]
Merge pull request #177 from tomtom84/master

fixes in theme diabook

12 years agoprovide a close-option for boxes in right_aside and store info via js and cookies
tommy tomson [Tue, 27 Mar 2012 17:02:07 +0000 (19:02 +0200)]
provide a close-option for boxes in right_aside and store info via js and cookies

12 years agoMerge pull request #176 from tomtom84/master
tomtom84 [Tue, 27 Mar 2012 13:32:30 +0000 (06:32 -0700)]
Merge pull request #176 from tomtom84/master

fixes in theme diabook-blue

12 years agoprovide a close-option for boxes in right_aside and store info via js and cookies
tommy tomson [Tue, 27 Mar 2012 13:29:46 +0000 (15:29 +0200)]
provide a close-option for boxes in right_aside and store info via js and cookies

12 years agoMerge branch 'pull'
friendica [Tue, 27 Mar 2012 11:52:39 +0000 (04:52 -0700)]
Merge branch 'pull'

12 years agoform security error when using existing photo
friendica [Tue, 27 Mar 2012 11:51:20 +0000 (04:51 -0700)]
form security error when using existing photo

12 years agoMerge pull request #175 from simonlnu/master
Simon [Tue, 27 Mar 2012 08:43:01 +0000 (01:43 -0700)]
Merge pull request #175 from simonlnu/master

various fixes for dispys

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 27 Mar 2012 08:40:42 +0000 (04:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master:

12 years agomore fixes for dispys
Simon L'nu [Tue, 27 Mar 2012 08:40:31 +0000 (04:40 -0400)]
more fixes for dispys

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoprofile wall privacy
friendica [Tue, 27 Mar 2012 08:31:47 +0000 (01:31 -0700)]
profile wall privacy

12 years agoadd dispy-dark snapshot; fix toolbar
Simon L'nu [Tue, 27 Mar 2012 07:57:47 +0000 (03:57 -0400)]
add dispy-dark snapshot; fix toolbar

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'pull'
friendica [Tue, 27 Mar 2012 07:55:25 +0000 (00:55 -0700)]
Merge branch 'pull'

12 years agodon't expire filed items
friendica [Tue, 27 Mar 2012 07:54:34 +0000 (00:54 -0700)]
don't expire filed items

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 27 Mar 2012 07:23:50 +0000 (03:23 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add "find friends" to right_aside to diabook, fixes in css in diabook
  fixed Umlaute in de strings.php

* master:

12 years agoadd "find friends" to right_aside to diabook, fixes in css in diabook
tommy tomson [Tue, 27 Mar 2012 06:28:47 +0000 (08:28 +0200)]
add "find friends" to right_aside to diabook, fixes in css in diabook

12 years agofixed Umlaute in de strings.php
Tobias Diekershoff [Tue, 27 Mar 2012 05:18:20 +0000 (07:18 +0200)]
fixed Umlaute in de strings.php

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 27 Mar 2012 04:54:47 +0000 (00:54 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  @-completion bug
  qcomment enhancements
  theme description with preview (non-translatable unfortunately)
  preparation for some possibly killer features
  translate br with extra elements
  revup
  Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.

* master:

12 years ago@-completion bug
friendica [Tue, 27 Mar 2012 04:48:04 +0000 (21:48 -0700)]
@-completion bug

12 years agoqcomment enhancements
friendica [Tue, 27 Mar 2012 03:13:03 +0000 (20:13 -0700)]
qcomment enhancements

12 years agotheme description with preview (non-translatable unfortunately)
friendica [Tue, 27 Mar 2012 01:15:10 +0000 (18:15 -0700)]
theme description with preview (non-translatable unfortunately)

12 years agopreparation for some possibly killer features
friendica [Tue, 27 Mar 2012 00:57:27 +0000 (17:57 -0700)]
preparation for some possibly killer features

12 years agotranslate br with extra elements
friendica [Mon, 26 Mar 2012 23:56:44 +0000 (16:56 -0700)]
translate br with extra elements

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 21:55:35 +0000 (14:55 -0700)]
Merge branch 'pull'

12 years agorevup
friendica [Mon, 26 Mar 2012 21:54:30 +0000 (14:54 -0700)]
revup

12 years agoMerge pull request #174 from beardy-unixer/master
friendica [Mon, 26 Mar 2012 21:40:47 +0000 (14:40 -0700)]
Merge pull request #174 from beardy-unixer/master

Fixed regions

12 years agoFixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland...
Thomas Willingham [Mon, 26 Mar 2012 21:03:54 +0000 (22:03 +0100)]
Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.

12 years agoMerge remote-tracking branch 'main/master'
Thomas Willingham [Mon, 26 Mar 2012 19:17:01 +0000 (20:17 +0100)]
Merge remote-tracking branch 'main/master'

12 years agoMerge pull request #173 from simonlnu/master
Simon [Mon, 26 Mar 2012 18:33:31 +0000 (11:33 -0700)]
Merge pull request #173 from simonlnu/master

fix dispy's nav element; fix colours in #search-text

12 years agofix dispy's nav element; fix colours in #search-text
Simon L'nu [Mon, 26 Mar 2012 18:19:59 +0000 (14:19 -0400)]
fix dispy's nav element; fix colours in #search-text

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 18:18:39 +0000 (14:18 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
  marking quattro-green as extension of quattro and deleting the tpl files
  minor css fixes in diabook
  screenshot for darkzero-NS, same as darkzero
  added quaddro templates to quaddro-green
  language issues in enotify
  small fix in diabook :: add local friendica to right_aside
  comix screenshot
  diabook: small fix in theme_info array
  more theme screenshots
  themes: use duepuntozero tpls as default

* master:

12 years agoadd "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside...
tommy tomson [Mon, 26 Mar 2012 16:54:57 +0000 (18:54 +0200)]
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Mon, 26 Mar 2012 12:49:15 +0000 (14:49 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agomarking quattro-green as extension of quattro and deleting the tpl files
Tobias Diekershoff [Mon, 26 Mar 2012 12:48:01 +0000 (14:48 +0200)]
marking quattro-green as extension of quattro and deleting the tpl files

12 years agominor css fixes in diabook
tommy tomson [Mon, 26 Mar 2012 11:52:44 +0000 (13:52 +0200)]
minor css fixes in diabook

12 years agoscreenshot for darkzero-NS, same as darkzero
friendica [Mon, 26 Mar 2012 11:25:20 +0000 (04:25 -0700)]
screenshot for darkzero-NS, same as darkzero

12 years agoadded quaddro templates to quaddro-green
Tobias Diekershoff [Mon, 26 Mar 2012 09:28:38 +0000 (11:28 +0200)]
added quaddro templates to quaddro-green

12 years agoMerge pull request #172 from fabrixxm/master
friendica [Mon, 26 Mar 2012 09:00:14 +0000 (02:00 -0700)]
Merge pull request #172 from fabrixxm/master

Rearrange theme tpls

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 08:43:48 +0000 (01:43 -0700)]
Merge branch 'pull'

12 years agolanguage issues in enotify
friendica [Mon, 26 Mar 2012 08:43:26 +0000 (01:43 -0700)]
language issues in enotify

12 years agosmall fix in diabook :: add local friendica to right_aside
tommy tomson [Mon, 26 Mar 2012 08:33:28 +0000 (10:33 +0200)]
small fix in diabook :: add local friendica to right_aside

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 07:53:32 +0000 (00:53 -0700)]
Merge branch 'pull'

12 years agocomix screenshot
friendica [Mon, 26 Mar 2012 07:52:54 +0000 (00:52 -0700)]
comix screenshot

12 years agodiabook: small fix in theme_info array
Fabio Comuni [Mon, 26 Mar 2012 07:48:38 +0000 (09:48 +0200)]
diabook: small fix in theme_info array

12 years agomore theme screenshots
friendica [Mon, 26 Mar 2012 07:47:52 +0000 (00:47 -0700)]
more theme screenshots

12 years agoMerge pull request #171 from simonlnu/master
Simon [Mon, 26 Mar 2012 07:41:22 +0000 (00:41 -0700)]
Merge pull request #171 from simonlnu/master

changes in contact_edit.tpl

12 years ago[fix] contact_edit.tpl syntax; reduce cols to fit better
Simon L'nu [Mon, 26 Mar 2012 07:39:06 +0000 (03:39 -0400)]
[fix] contact_edit.tpl syntax; reduce cols to fit better

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 07:38:19 +0000 (03:38 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add screenshots to diabook

* master:

12 years agoadd screenshots to diabook
tommy tomson [Mon, 26 Mar 2012 07:37:14 +0000 (09:37 +0200)]
add screenshots to diabook

12 years agothemes: use duepuntozero tpls as default
Fabio Comuni [Mon, 26 Mar 2012 07:09:14 +0000 (09:09 +0200)]
themes: use duepuntozero tpls as default

12 years agoMerge pull request #170 from simonlnu/master
Simon [Mon, 26 Mar 2012 07:02:51 +0000 (00:02 -0700)]
Merge pull request #170 from simonlnu/master

fix search box in dispys

12 years agofix the search box
Simon L'nu [Mon, 26 Mar 2012 07:01:13 +0000 (03:01 -0400)]
fix the search box

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 06:51:40 +0000 (02:51 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:

12 years agosmall fix
tommy tomson [Mon, 26 Mar 2012 05:02:27 +0000 (07:02 +0200)]
small fix

12 years agodon't include friend suggestions for people with the same name as current contacts...
friendica [Mon, 26 Mar 2012 04:43:17 +0000 (21:43 -0700)]
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.

12 years agoposition the theme-preview on settings page
friendica [Mon, 26 Mar 2012 04:12:10 +0000 (21:12 -0700)]
position the theme-preview on settings page

12 years agomore wordsmithing of the Friendica invitation email
friendica [Mon, 26 Mar 2012 03:52:34 +0000 (20:52 -0700)]
more wordsmithing of the Friendica invitation email

12 years agoscreenshot gallery
friendica [Mon, 26 Mar 2012 03:08:28 +0000 (20:08 -0700)]
screenshot gallery

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 02:48:17 +0000 (19:48 -0700)]
Merge branch 'pull'

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 02:47:56 +0000 (22:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  typo datarry -> datarray

* master:

12 years agoMerge pull request #167 from unary/typo
Simon [Mon, 26 Mar 2012 02:47:39 +0000 (19:47 -0700)]
Merge pull request #167 from unary/typo

typo datarry -> datarray

12 years agoMerge pull request #169 from simonlnu/master
Simon [Mon, 26 Mar 2012 02:46:59 +0000 (19:46 -0700)]
Merge pull request #169 from simonlnu/master

search box

12 years agoadd in the search box
Simon L'nu [Mon, 26 Mar 2012 02:45:44 +0000 (22:45 -0400)]
add in the search box

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 02:40:24 +0000 (22:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme screenshots

* master:

12 years agotheme preview for end users
friendica [Mon, 26 Mar 2012 02:05:14 +0000 (19:05 -0700)]
theme preview for end users

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 01:19:58 +0000 (18:19 -0700)]
Merge branch 'pull'

12 years agotheme screenshots
friendica [Mon, 26 Mar 2012 00:55:43 +0000 (17:55 -0700)]
theme screenshots

12 years agominor fix to dispy theme.php
Simon L'nu [Sun, 25 Mar 2012 21:13:24 +0000 (17:13 -0400)]
minor fix to dispy theme.php

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 21:07:43 +0000 (17:07 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #168 from simonlnu/master
Simon [Sun, 25 Mar 2012 21:07:33 +0000 (14:07 -0700)]
Merge pull request #168 from simonlnu/master

fix dispy-dark

12 years agourgent fix to dispy-dark theme.php
Simon L'nu [Sun, 25 Mar 2012 21:06:38 +0000 (17:06 -0400)]
urgent fix to dispy-dark theme.php

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>