]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMail: Removing signatures, gpg, unnecessary line breaks
Michael Vogel [Sat, 10 Mar 2012 08:52:20 +0000 (09:52 +0100)]
Mail: Removing signatures, gpg, unnecessary line breaks

12 years agodiabook: Moving the location between the icons
Michael Vogel [Fri, 9 Mar 2012 23:15:27 +0000 (00:15 +0100)]
diabook: Moving the location between the icons

12 years agoMerge commit 'upstream/master'
Michael Vogel [Fri, 9 Mar 2012 10:41:23 +0000 (11:41 +0100)]
Merge commit 'upstream/master'

12 years agoMerge branch 'pull'
friendica [Fri, 9 Mar 2012 08:48:16 +0000 (00:48 -0800)]
Merge branch 'pull'

12 years agobug #324 - tinymce used for mail even if editplain being used.
friendica [Fri, 9 Mar 2012 08:47:10 +0000 (00:47 -0800)]
bug #324 - tinymce used for mail even if editplain being used.

12 years agobug in check for private email comment to public conversation prevents authenticated...
friendica [Fri, 9 Mar 2012 08:31:17 +0000 (00:31 -0800)]
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed

12 years agoMerge pull request #114 from simonlnu/master
Simon [Fri, 9 Mar 2012 05:28:35 +0000 (21:28 -0800)]
Merge pull request #114 from simonlnu/master

[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size.

12 years ago[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
Simon L'nu [Fri, 9 Mar 2012 05:26:54 +0000 (00:26 -0500)]
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agokeep tony from talking to himself
friendica [Fri, 9 Mar 2012 05:14:41 +0000 (21:14 -0800)]
keep tony from talking to himself

12 years agoMerge pull request #113 from simonlnu/master
Simon [Fri, 9 Mar 2012 05:03:16 +0000 (21:03 -0800)]
Merge pull request #113 from simonlnu/master

dispy stable enough to be considered stable IMO

12 years agoi consider dispy pretty stable at this point, so i'm removing the experimental file
Simon L'nu [Fri, 9 Mar 2012 05:00:56 +0000 (00:00 -0500)]
i consider dispy pretty stable at this point, so i'm removing the experimental file

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:

12 years agoMerge pull request #112 from tomtom84/master
tomtom84 [Fri, 9 Mar 2012 03:39:39 +0000 (19:39 -0800)]
Merge pull request #112 from tomtom84/master

fixes in diabook-derivates

12 years agoremoved info
tommy tomson [Fri, 9 Mar 2012 03:38:20 +0000 (04:38 +0100)]
removed info

12 years agoMerge pull request #111 from tomtom84/master
tomtom84 [Fri, 9 Mar 2012 03:16:01 +0000 (19:16 -0800)]
Merge pull request #111 from tomtom84/master

fixes in diabook-derivates

12 years agoadd info
tommy tomson [Fri, 9 Mar 2012 03:14:24 +0000 (04:14 +0100)]
add info

12 years agoMerge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
friendica [Fri, 9 Mar 2012 02:20:10 +0000 (18:20 -0800)]
Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5

More improved transparency smileys

12 years agoMerge pull request #110 from tomtom84/master
tomtom84 [Fri, 9 Mar 2012 02:02:25 +0000 (18:02 -0800)]
Merge pull request #110 from tomtom84/master

fixes in diabook-derivates

12 years agofixed star-bug
tommy tomson [Fri, 9 Mar 2012 01:59:13 +0000 (02:59 +0100)]
fixed star-bug

12 years agoMore improved transparency for smilies
Thomas [Fri, 9 Mar 2012 01:49:12 +0000 (01:49 +0000)]
More improved transparency for smilies

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master:

12 years agotheme info file for testbubble
friendica [Fri, 9 Mar 2012 00:30:45 +0000 (16:30 -0800)]
theme info file for testbubble

12 years agocatalan translation
friendica [Fri, 9 Mar 2012 00:29:22 +0000 (16:29 -0800)]
catalan translation

12 years agoMerge branch 'pull'
friendica [Thu, 8 Mar 2012 22:35:48 +0000 (14:35 -0800)]
Merge branch 'pull'

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 8 Mar 2012 22:35:47 +0000 (14:35 -0800)]
Merge https://github.com/friendica/friendica into pull

12 years agorevup
friendica [Thu, 8 Mar 2012 22:34:58 +0000 (14:34 -0800)]
revup

12 years agoadd theme diabook-blue, fix css
tommy tomson [Thu, 8 Mar 2012 22:22:26 +0000 (23:22 +0100)]
add theme diabook-blue, fix css

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 8 Mar 2012 20:30:47 +0000 (15:30 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #108 from simonlnu/master
Simon [Thu, 8 Mar 2012 18:39:03 +0000 (10:39 -0800)]
Merge pull request #108 from simonlnu/master

make svg from notifications.svg to ease future editing. more dispy tweaks

12 years agomake svg from notifications.svg to ease future editing. more dispy tweaks
Simon L'nu [Thu, 8 Mar 2012 18:37:45 +0000 (13:37 -0500)]
make svg from notifications.svg to ease future editing. more dispy tweaks

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, 8 Mar 2012 15:46:40 +0000 (10:46 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add links to /profiles, add some icons to diabook/icons, fixes in css
  Update README
  reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())

* master:

12 years agoMerge pull request #107 from tomtom84/master
tomtom84 [Thu, 8 Mar 2012 13:52:14 +0000 (05:52 -0800)]
Merge pull request #107 from tomtom84/master

fixes in theme diabook

12 years agoadd links to /profiles, add some icons to diabook/icons, fixes in css
tommy tomson [Thu, 8 Mar 2012 13:49:07 +0000 (14:49 +0100)]
add links to /profiles, add some icons to diabook/icons, fixes in css

12 years agoUpdate README
friendica [Thu, 8 Mar 2012 05:25:14 +0000 (16:25 +1100)]
Update README

12 years agoreworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
friendica [Thu, 8 Mar 2012 05:12:31 +0000 (21:12 -0800)]
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  still getting parent relays on remote systems
  revup

* master:

12 years agostill getting parent relays on remote systems
friendica [Thu, 8 Mar 2012 02:23:55 +0000 (18:23 -0800)]
still getting parent relays on remote systems

12 years agoMerge branch 'pull'
friendica [Wed, 7 Mar 2012 23:55:20 +0000 (15:55 -0800)]
Merge branch 'pull'

12 years agorevup
friendica [Wed, 7 Mar 2012 23:54:37 +0000 (15:54 -0800)]
revup

12 years agoMerge pull request #105 from simonlnu/master
Simon [Wed, 7 Mar 2012 17:36:28 +0000 (09:36 -0800)]
Merge pull request #105 from simonlnu/master

fix dispy breakage in jot.tpl

12 years agofix jot.tpl buttons. fix up subsequent styling breakage
Simon L'nu [Wed, 7 Mar 2012 17:35:04 +0000 (12:35 -0500)]
fix jot.tpl buttons. fix up subsequent styling breakage

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, 7 Mar 2012 17:32:28 +0000 (12:32 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #104 from simonlnu/master
Simon [Wed, 7 Mar 2012 15:08:23 +0000 (07:08 -0800)]
Merge pull request #104 from simonlnu/master

push fix for funky menu action. the overflow-x might break again for some people

12 years agopush fix for funky menu action. the overflow-x might break again for some people
Simon L'nu [Wed, 7 Mar 2012 15:07:36 +0000 (10:07 -0500)]
push fix for funky menu action. the overflow-x might break again for some people

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, 7 Mar 2012 15:05:32 +0000 (10:05 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in navbar

* master:

12 years agoMerge pull request #103 from tomtom84/master
tomtom84 [Wed, 7 Mar 2012 07:44:18 +0000 (23:44 -0800)]
Merge pull request #103 from tomtom84/master

fixes in theme diabook

12 years agofix in navbar
tommy tomson [Tue, 6 Mar 2012 23:47:43 +0000 (00:47 +0100)]
fix in navbar

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 7 Mar 2012 02:33:56 +0000 (21:33 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix photos after permissions_sql change
  [privacy] rework latest fix
  remove stray debugging

* master:

12 years agofix photos after permissions_sql change
friendica [Wed, 7 Mar 2012 01:52:00 +0000 (17:52 -0800)]
fix photos after permissions_sql change

12 years agoMerge branch 'pull'
friendica [Wed, 7 Mar 2012 01:22:13 +0000 (17:22 -0800)]
Merge branch 'pull'

12 years ago[privacy] rework latest fix
friendica [Wed, 7 Mar 2012 01:21:14 +0000 (17:21 -0800)]
[privacy] rework latest fix

12 years agoremove stray debugging
friendica [Wed, 7 Mar 2012 00:28:52 +0000 (16:28 -0800)]
remove stray debugging

12 years agoremoved dolphin file (wtf?)
Thomas [Wed, 7 Mar 2012 00:12:24 +0000 (00:12 +0000)]
removed dolphin file (wtf?)

12 years ago.
Thomas [Wed, 7 Mar 2012 00:08:50 +0000 (00:08 +0000)]
.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 7 Mar 2012 00:06:02 +0000 (19:06 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  improved smiley transparency

* master:

12 years agoMerge pull request #102 from beardy-unixer/master
Simon [Wed, 7 Mar 2012 00:05:35 +0000 (16:05 -0800)]
Merge pull request #102 from beardy-unixer/master

Improved transparency smileys

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 23:57:52 +0000 (18:57 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in navbar

* master:

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas [Tue, 6 Mar 2012 23:56:37 +0000 (23:56 +0000)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
images/smiley-beard.png

12 years agoimproved smiley transparency
Thomas [Tue, 6 Mar 2012 23:54:31 +0000 (23:54 +0000)]
improved smiley transparency

12 years agoMerge pull request #101 from tomtom84/master
tomtom84 [Tue, 6 Mar 2012 23:49:32 +0000 (15:49 -0800)]
Merge pull request #101 from tomtom84/master

fixes in theme diabook

12 years agofix in navbar
tommy tomson [Tue, 6 Mar 2012 23:47:43 +0000 (00:47 +0100)]
fix in navbar

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 23:42:00 +0000 (18:42 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #100 from simonlnu/master
Simon [Tue, 6 Mar 2012 23:41:45 +0000 (15:41 -0800)]
Merge pull request #100 from simonlnu/master

fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 23:38:44 +0000 (18:38 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix html reshares when editplain in use

* master:

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 23:29:18 +0000 (15:29 -0800)]
Merge branch 'pull'

12 years agofix html reshares when editplain in use
friendica [Tue, 6 Mar 2012 23:28:27 +0000 (15:28 -0800)]
fix html reshares when editplain in use

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 23:26:22 +0000 (18:26 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  search should be ok, but a little extra security won't hurt
  messages-menu translation, add scroll-to-top and theme-bug-report in theme
  Fixed...merged with mainline THEN added beards.
  added beard smileys
  doc/Account-Basics.md
  doc/Account-Basics.md
  a
  doc/Remove-Account.md
  doc/Making-Friends.md
  doc/Bugs-and-Issues.md
  doc/Account-Basics.md

* master:

12 years agoMerge pull request #94 from beardy-unixer/master
Simon [Tue, 6 Mar 2012 23:24:15 +0000 (15:24 -0800)]
Merge pull request #94 from beardy-unixer/master

Documentation changes

12 years agoMerge pull request #99 from tomtom84/master
Simon [Tue, 6 Mar 2012 23:22:55 +0000 (15:22 -0800)]
Merge pull request #99 from tomtom84/master

fixes in theme diabook

12 years agosearch should be ok, but a little extra security won't hurt
friendica [Tue, 6 Mar 2012 23:15:59 +0000 (15:15 -0800)]
search should be ok, but a little extra security won't hurt

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 23:15:45 +0000 (18:15 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master:

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 23:10:22 +0000 (15:10 -0800)]
Merge branch 'pull'

12 years agostring update
friendica [Tue, 6 Mar 2012 23:09:57 +0000 (15:09 -0800)]
string update

12 years agomessages-menu translation, add scroll-to-top and theme-bug-report in theme
tommy tomson [Tue, 6 Mar 2012 23:07:27 +0000 (00:07 +0100)]
messages-menu translation, add scroll-to-top and theme-bug-report in theme

12 years agoMerge pull request #98 from simonlnu/master
Simon [Tue, 6 Mar 2012 23:04:50 +0000 (15:04 -0800)]
Merge pull request #98 from simonlnu/master

missed some fixes on last request

12 years agodispy, dispy, oh what a little lispy
Simon L'nu [Tue, 6 Mar 2012 22:55:05 +0000 (17:55 -0500)]
dispy, dispy, oh what a little lispy

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years ago[PRIVACY] privacy issue bug #314
friendica [Tue, 6 Mar 2012 22:53:14 +0000 (14:53 -0800)]
[PRIVACY] privacy issue bug #314

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 22:52:12 +0000 (17:52 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bugs #312, #313
  revup

* master:

12 years agobugs #312, #313
friendica [Tue, 6 Mar 2012 22:27:53 +0000 (14:27 -0800)]
bugs #312, #313

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 21:58:26 +0000 (13:58 -0800)]
Merge branch 'pull'

12 years agorevup
friendica [Tue, 6 Mar 2012 21:57:38 +0000 (13:57 -0800)]
revup

12 years agoMerge pull request #95 from simonlnu/master
Simon [Tue, 6 Mar 2012 21:20:20 +0000 (13:20 -0800)]
Merge pull request #95 from simonlnu/master

styling fixes in dispy; typos fixed in settings.tpl

12 years agostyling fixes in dispy. fix typos in settings.tpl
Simon L'nu [Tue, 6 Mar 2012 21:18:26 +0000 (16:18 -0500)]
styling fixes in dispy. fix typos in settings.tpl

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoFixed...merged with mainline THEN added beards.
Thomas [Tue, 6 Mar 2012 20:50:38 +0000 (20:50 +0000)]
Fixed...merged with mainline THEN added beards.

12 years agoadded beard smileys
Thomas [Tue, 6 Mar 2012 20:44:53 +0000 (20:44 +0000)]
added beard smileys

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 6 Mar 2012 19:51:14 +0000 (14:51 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:

12 years agodoc/Account-Basics.md
Thomas [Tue, 6 Mar 2012 19:15:40 +0000 (19:15 +0000)]
doc/Account-Basics.md

12 years agodoc/Account-Basics.md
Thomas [Tue, 6 Mar 2012 19:15:24 +0000 (19:15 +0000)]
doc/Account-Basics.md

12 years agoa
Thomas [Tue, 6 Mar 2012 19:11:24 +0000 (19:11 +0000)]
a

12 years agodoc/Remove-Account.md
Thomas [Tue, 6 Mar 2012 19:07:15 +0000 (19:07 +0000)]
doc/Remove-Account.md

12 years agodoc/Making-Friends.md
Thomas [Tue, 6 Mar 2012 19:04:42 +0000 (19:04 +0000)]
doc/Making-Friends.md

12 years agodoc/Bugs-and-Issues.md
Thomas [Tue, 6 Mar 2012 18:55:45 +0000 (18:55 +0000)]
doc/Bugs-and-Issues.md

12 years agodoc/Account-Basics.md
Thomas [Tue, 6 Mar 2012 18:48:39 +0000 (18:48 +0000)]
doc/Account-Basics.md

12 years agoMerge pull request #93 from fabrixxm/master
fabrixxm [Tue, 6 Mar 2012 13:09:03 +0000 (05:09 -0800)]
Merge pull request #93 from fabrixxm/master

quattro: theme settings

12 years agoremove "smilie" expansion for Diaspora logo
friendica [Tue, 6 Mar 2012 12:28:45 +0000 (04:28 -0800)]
remove "smilie" expansion for Diaspora logo

12 years agoprevent duplicate likes
friendica [Tue, 6 Mar 2012 10:17:55 +0000 (02:17 -0800)]
prevent duplicate likes

12 years agoMerge branch 'pull'
friendica [Tue, 6 Mar 2012 09:04:16 +0000 (01:04 -0800)]
Merge branch 'pull'

12 years agoquattro: theme settings (a bit hackish)
Fabio Comuni [Tue, 6 Mar 2012 08:50:18 +0000 (09:50 +0100)]
quattro: theme settings (a bit hackish)

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Tue, 6 Mar 2012 08:48:08 +0000 (09:48 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoMerge pull request #92 from tomtom84/master
tomtom84 [Tue, 6 Mar 2012 07:34:24 +0000 (23:34 -0800)]
Merge pull request #92 from tomtom84/master

fixes in theme diabbook