]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge pull request #215 from tomtom84/master
tomtom84 [Sun, 8 Apr 2012 22:04:59 +0000 (15:04 -0700)]
Merge pull request #215 from tomtom84/master

fixes in diabook-themes

12 years agofixed z-index of youtube-vids
tommy tomson [Sun, 8 Apr 2012 22:02:48 +0000 (00:02 +0200)]
fixed z-index of youtube-vids
 fixed bug to hide right_side

12 years agoprepare for using a master theme_init()
friendica [Sun, 8 Apr 2012 13:20:57 +0000 (06:20 -0700)]
prepare for using a master theme_init()

12 years agoprovide theme_init() functions
friendica [Sun, 8 Apr 2012 12:52:00 +0000 (05:52 -0700)]
provide theme_init() functions

12 years agorev updates
friendica [Sun, 8 Apr 2012 12:24:11 +0000 (05:24 -0700)]
rev updates

12 years agoMerge pull request #214 from annando/master
friendica [Sun, 8 Apr 2012 12:19:54 +0000 (05:19 -0700)]
Merge pull request #214 from annando/master

API, Locking, some changes to "vier"

12 years agoMerge commit 'upstream/master'
Michael Vogel [Sun, 8 Apr 2012 08:07:39 +0000 (10:07 +0200)]
Merge commit 'upstream/master'

12 years agoMerge pull request #213 from simonlnu/master
Simon [Sun, 8 Apr 2012 03:47:37 +0000 (20:47 -0700)]
Merge pull request #213 from simonlnu/master

minor dispy* fixes

12 years agominor dispy* fixes
Simon L'nu [Sun, 8 Apr 2012 03:46:47 +0000 (23:46 -0400)]
minor dispy* fixes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoAPI: API is now enhanced. mentions, repeat and destroy now works.
Michael Vogel [Sat, 7 Apr 2012 22:02:25 +0000 (00:02 +0200)]
API: API is now enhanced. mentions, repeat and destroy now works.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 7 Apr 2012 18:47:02 +0000 (14:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix
  changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
  ignore utf8 offset error for unit tests
  had arg order backwards
  try assertContains
  tag tests cont.
  fix autonamenegativelength test
  some work on tests

* master:

12 years agodiabook-themes: small fix
tommy tomson [Sat, 7 Apr 2012 17:56:00 +0000 (19:56 +0200)]
diabook-themes: small fix

12 years ago"vier": Some design stuff
Michael Vogel [Sat, 7 Apr 2012 16:35:37 +0000 (18:35 +0200)]
"vier": Some design stuff

12 years agoMerge commit 'upstream/master'
Michael Vogel [Sat, 7 Apr 2012 16:35:29 +0000 (18:35 +0200)]
Merge commit 'upstream/master'

12 years agoMerge pull request #212 from tomtom84/master
tomtom84 [Sat, 7 Apr 2012 14:41:23 +0000 (07:41 -0700)]
Merge pull request #212 from tomtom84/master

fixes in diabook-themes

12 years agochangelog 1.014 :
tommy tomson [Sat, 7 Apr 2012 14:39:43 +0000 (16:39 +0200)]
changelog 1.014 :
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section

css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed

12 years agoignore utf8 offset error for unit tests
friendica [Sat, 7 Apr 2012 09:31:41 +0000 (02:31 -0700)]
ignore utf8 offset error for unit tests

12 years agohad arg order backwards
friendica [Sat, 7 Apr 2012 09:23:11 +0000 (02:23 -0700)]
had arg order backwards

12 years agotry assertContains
friendica [Sat, 7 Apr 2012 09:21:55 +0000 (02:21 -0700)]
try assertContains

12 years agotag tests cont.
friendica [Sat, 7 Apr 2012 09:11:56 +0000 (02:11 -0700)]
tag tests cont.

12 years agofix autonamenegativelength test
friendica [Sat, 7 Apr 2012 08:20:38 +0000 (01:20 -0700)]
fix autonamenegativelength test

12 years agosome work on tests
friendica [Sat, 7 Apr 2012 08:04:45 +0000 (01:04 -0700)]
some work on tests

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 7 Apr 2012 07:10:09 +0000 (03:10 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  ignore removed plugins
  fix messed up config tables w/ duplicate entries
  small fixes for the German strings
  fix bad sql update
  revert config changes, we're getting duplicate keys
  new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...

* master:

12 years ago"vier": Bookmarks now look better.
Michael Vogel [Fri, 6 Apr 2012 23:19:07 +0000 (01:19 +0200)]
"vier": Bookmarks now look better.

12 years agoignore removed plugins
friendica [Fri, 6 Apr 2012 12:21:42 +0000 (05:21 -0700)]
ignore removed plugins

12 years agoMerge branch 'pull'
friendica [Fri, 6 Apr 2012 12:12:18 +0000 (05:12 -0700)]
Merge branch 'pull'

12 years agofix messed up config tables w/ duplicate entries
friendica [Fri, 6 Apr 2012 12:11:09 +0000 (05:11 -0700)]
fix messed up config tables w/ duplicate entries

12 years agoMerge pull request #211 from tomtom84/master
tomtom84 [Fri, 6 Apr 2012 11:33:26 +0000 (04:33 -0700)]
Merge pull request #211 from tomtom84/master

small fix

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Fri, 6 Apr 2012 11:29:20 +0000 (13:29 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agoMerge pull request #210 from tomtom84/master
tomtom84 [Fri, 6 Apr 2012 11:29:01 +0000 (04:29 -0700)]
Merge pull request #210 from tomtom84/master

fixes in diabook-derivates

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Fri, 6 Apr 2012 10:58:41 +0000 (12:58 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Fri, 6 Apr 2012 10:43:44 +0000 (12:43 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agosmall fixes for the German strings
Tobias Diekershoff [Fri, 6 Apr 2012 10:43:20 +0000 (12:43 +0200)]
small fixes for the German strings

12 years agofix bad sql update
friendica [Fri, 6 Apr 2012 10:25:01 +0000 (03:25 -0700)]
fix bad sql update

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Fri, 6 Apr 2012 10:24:05 +0000 (12:24 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agoMerge branch 'pull'
friendica [Fri, 6 Apr 2012 10:12:02 +0000 (03:12 -0700)]
Merge branch 'pull'

12 years agorevert config changes, we're getting duplicate keys
friendica [Fri, 6 Apr 2012 10:10:46 +0000 (03:10 -0700)]
revert config changes, we're getting duplicate keys

12 years agonew-contacts-introductions in contacts-drop-down and new-messages in messages-drop...
tommy tomson [Fri, 6 Apr 2012 09:19:12 +0000 (11:19 +0200)]
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 6 Apr 2012 07:54:09 +0000 (03:54 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update to the German strings
  add network_tabs hook
  pass autoname(0) test
  rev update
  added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.

* master:

12 years agoupdate to the German strings
Tobias Diekershoff [Fri, 6 Apr 2012 07:37:50 +0000 (09:37 +0200)]
update to the German strings

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 6 Apr 2012 04:50:34 +0000 (00:50 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php

* master:

12 years agoMerge branch 'pull'
friendica [Fri, 6 Apr 2012 04:43:38 +0000 (21:43 -0700)]
Merge branch 'pull'

12 years agoadd network_tabs hook
friendica [Fri, 6 Apr 2012 04:42:47 +0000 (21:42 -0700)]
add network_tabs hook

12 years agopass autoname(0) test
friendica [Fri, 6 Apr 2012 01:44:36 +0000 (18:44 -0700)]
pass autoname(0) test

12 years agoMerge commit 'upstream/master'
Michael Vogel [Thu, 5 Apr 2012 22:00:46 +0000 (00:00 +0200)]
Merge commit 'upstream/master'

12 years agorev update
friendica [Thu, 5 Apr 2012 21:37:30 +0000 (14:37 -0700)]
rev update

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Alexander Kampmann [Thu, 5 Apr 2012 11:39:15 +0000 (13:39 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
include/config.php
update.php

12 years agoadded index to config and pconfig table
Alexander Kampmann [Thu, 5 Apr 2012 11:27:09 +0000 (13:27 +0200)]
added index to config and pconfig table
changed config.php to use REPLACE instead of INSERT,
this removes one db hit.

12 years agomake 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
friendica [Thu, 5 Apr 2012 09:15:03 +0000 (02:15 -0700)]
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php

12 years agoMerge pull request #207 from simonlnu/master
Simon [Thu, 5 Apr 2012 04:05:13 +0000 (21:05 -0700)]
Merge pull request #207 from simonlnu/master

styled cat tags and input

12 years agofinish styling category tags and category input
Simon L'nu [Thu, 5 Apr 2012 04:04:23 +0000 (00:04 -0400)]
finish styling category tags and category input

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 04:03:30 +0000 (00:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  also block outbound
  let's catch d* disabled at a higher level and not waste any resources on it.

* master:

12 years agoalso block outbound
friendica [Thu, 5 Apr 2012 03:48:35 +0000 (20:48 -0700)]
also block outbound

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 03:47:48 +0000 (23:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agostyle categorytags
Simon L'nu [Thu, 5 Apr 2012 03:47:35 +0000 (23:47 -0400)]
style categorytags

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agolet's catch d* disabled at a higher level and not waste any resources on it.
friendica [Thu, 5 Apr 2012 03:45:48 +0000 (20:45 -0700)]
let's catch d* disabled at a higher level and not waste any resources on it.

12 years agoMerge pull request #206 from simonlnu/master
Simon [Thu, 5 Apr 2012 03:35:59 +0000 (20:35 -0700)]
Merge pull request #206 from simonlnu/master

update the template files

12 years agoupdate the dispy* templates
Simon L'nu [Thu, 5 Apr 2012 03:35:07 +0000 (23:35 -0400)]
update the dispy* templates

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 03:32:16 +0000 (23:32 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  correct some filer dialog weirdness caused by introduction of categories
  move alert box away from nav links
  log disabled requests
  fix config storage of booleans

* master:

12 years agoMerge pull request #205 from unary/filerfix
friendica [Thu, 5 Apr 2012 03:23:20 +0000 (20:23 -0700)]
Merge pull request #205 from unary/filerfix

correct some filer dialog weirdness caused by introduction of categories

12 years agocorrect some filer dialog weirdness caused by introduction of categories
Michael Johnston [Thu, 5 Apr 2012 03:08:16 +0000 (23:08 -0400)]
correct some filer dialog weirdness caused by introduction of categories

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 02:58:32 +0000 (22:58 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master:

12 years agomove alert box away from nav links
friendica [Thu, 5 Apr 2012 02:13:41 +0000 (19:13 -0700)]
move alert box away from nav links

12 years agolog disabled requests
friendica [Thu, 5 Apr 2012 01:49:39 +0000 (18:49 -0700)]
log disabled requests

12 years agofix config storage of booleans
friendica [Thu, 5 Apr 2012 00:51:59 +0000 (17:51 -0700)]
fix config storage of booleans

12 years agowell that was a stupid mistake...
friendica [Thu, 5 Apr 2012 00:19:46 +0000 (17:19 -0700)]
well that was a stupid mistake...

12 years agostring update
friendica [Wed, 4 Apr 2012 22:51:56 +0000 (15:51 -0700)]
string update

12 years agobug: diaspora_enabled setting turns it on but doesn't fully turn it off.
friendica [Wed, 4 Apr 2012 21:13:34 +0000 (14:13 -0700)]
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.

12 years agoMerge branch 'pull'
friendica [Wed, 4 Apr 2012 09:02:50 +0000 (02:02 -0700)]
Merge branch 'pull'

12 years agobetter handling of reshares containing embeds
friendica [Wed, 4 Apr 2012 09:02:23 +0000 (02:02 -0700)]
better handling of reshares containing embeds

12 years agoMerge pull request #204 from simonlnu/master
Simon [Wed, 4 Apr 2012 06:21:39 +0000 (23:21 -0700)]
Merge pull request #204 from simonlnu/master

many changes, all small

12 years agolatest changes are the popup menu for notifs, fixes
Simon L'nu [Wed, 4 Apr 2012 06:19:39 +0000 (02:19 -0400)]
latest changes are the popup menu for notifs, fixes

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, 4 Apr 2012 06:14:26 +0000 (02:14 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:

12 years agodisplay settings hooks
friendica [Wed, 4 Apr 2012 05:01:52 +0000 (22:01 -0700)]
display settings hooks

12 years agore-opened bug #363
friendica [Wed, 4 Apr 2012 03:14:37 +0000 (20:14 -0700)]
re-opened bug #363

12 years agothis is better
friendica [Wed, 4 Apr 2012 02:20:39 +0000 (19:20 -0700)]
this is better

12 years agoMerge branch 'pull'
friendica [Wed, 4 Apr 2012 02:16:59 +0000 (19:16 -0700)]
Merge branch 'pull'

12 years agoinclude contact_widgets for categories_widget when doing updates
friendica [Wed, 4 Apr 2012 02:16:02 +0000 (19:16 -0700)]
include contact_widgets for categories_widget when doing updates

12 years agoremove loozah themes which fell too far behind to recover
friendica [Tue, 3 Apr 2012 23:40:25 +0000 (16:40 -0700)]
remove loozah themes which fell too far behind to recover

12 years agosmal fix
tommy tomson [Tue, 3 Apr 2012 19:45:58 +0000 (21:45 +0200)]
smal fix

12 years agoMerge pull request #202 from tomtom84/master
tomtom84 [Tue, 3 Apr 2012 19:08:40 +0000 (12:08 -0700)]
Merge pull request #202 from tomtom84/master

german translation for right_aside

12 years agogerman translation for right_aside
tommy tomson [Tue, 3 Apr 2012 19:06:57 +0000 (21:06 +0200)]
german translation for right_aside

12 years agoMerge pull request #201 from tomtom84/master
tomtom84 [Tue, 3 Apr 2012 19:00:24 +0000 (12:00 -0700)]
Merge pull request #201 from tomtom84/master

fixes in diabook-themes

12 years agomake right_aside translatable and provide german translation...
tommy tomson [Tue, 3 Apr 2012 18:59:00 +0000 (20:59 +0200)]
make right_aside translatable and provide german translation...
and some css-fixes

12 years agosuppress duplicates in search
friendica [Tue, 3 Apr 2012 09:44:29 +0000 (02:44 -0700)]
suppress duplicates in search

12 years agomake contact ssl_policy change a function since it is used in a few places
friendica [Tue, 3 Apr 2012 06:07:26 +0000 (23:07 -0700)]
make contact ssl_policy change a function since it is used in a few places

12 years agomore ssl policy fixes and prevent delivery to soapbox when using local delivery
friendica [Tue, 3 Apr 2012 04:01:19 +0000 (21:01 -0700)]
more ssl policy fixes and prevent delivery to soapbox when using  local delivery

12 years agodon't change ssl settings on local photos for remote contact
friendica [Tue, 3 Apr 2012 02:38:13 +0000 (19:38 -0700)]
don't change ssl settings on local photos for remote contact

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 3 Apr 2012 01:55:10 +0000 (21:55 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #363 and a couple of other reported ssl link issues

* master:

12 years agobug #363 and a couple of other reported ssl link issues
friendica [Tue, 3 Apr 2012 00:43:11 +0000 (17:43 -0700)]
bug #363 and a couple of other reported ssl link issues

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 2 Apr 2012 20:53:47 +0000 (16:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:

12 years agoAPI: template for test function added
Michael Vogel [Mon, 2 Apr 2012 20:36:05 +0000 (22:36 +0200)]
API: template for test function added

12 years agoMerge commit 'upstream/master'
Michael Vogel [Mon, 2 Apr 2012 20:00:22 +0000 (22:00 +0200)]
Merge commit 'upstream/master'

12 years agodiabook-themes: css-fixes
tommy tomson [Mon, 2 Apr 2012 18:30:27 +0000 (20:30 +0200)]
diabook-themes: css-fixes

12 years agodiabook-themes: fixes in js
tommy tomson [Mon, 2 Apr 2012 16:16:58 +0000 (18:16 +0200)]
diabook-themes: fixes in js

12 years agodiabook-themes: fixed pageheader
tommy tomson [Mon, 2 Apr 2012 15:17:14 +0000 (17:17 +0200)]
diabook-themes: fixed pageheader

12 years agodiabook-themes: bugfixes / css-fixes
tommy tomson [Mon, 2 Apr 2012 13:06:55 +0000 (15:06 +0200)]
diabook-themes: bugfixes / css-fixes

12 years agomake the "new calendar" (javascript interactive) the default
friendica [Mon, 2 Apr 2012 08:46:35 +0000 (01:46 -0700)]
make the "new calendar" (javascript interactive) the default

12 years agoremove zrl from query string
friendica [Mon, 2 Apr 2012 07:45:45 +0000 (00:45 -0700)]
remove zrl from query string

12 years agocatch a couple more Oo smilies
friendica [Mon, 2 Apr 2012 05:57:50 +0000 (22:57 -0700)]
catch a couple more Oo smilies