]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agonetwork filter is now a permission group
friendica [Sat, 24 Mar 2012 08:33:50 +0000 (01:33 -0700)]
network filter is now a permission group

12 years agoMerge pull request #163 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 07:15:31 +0000 (00:15 -0700)]
Merge pull request #163 from tomtom84/master

fixes in diabook-derivates

12 years agoadd right_aside to diabook-blue
tommy tomson [Sat, 24 Mar 2012 07:13:48 +0000 (08:13 +0100)]
add right_aside to diabook-blue

12 years agoMerge pull request #162 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 05:20:25 +0000 (22:20 -0700)]
Merge pull request #162 from tomtom84/master

fixes in theme diabook

12 years agoadd connectable services to right_aside
tommy tomson [Sat, 24 Mar 2012 05:17:14 +0000 (06:17 +0100)]
add connectable services to right_aside

12 years agoMerge pull request #161 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 03:06:48 +0000 (20:06 -0700)]
Merge pull request #161 from tomtom84/master

fixes in theme diabook

12 years agoadd PostIt to right_aside, fixes in css
tommy tomson [Sat, 24 Mar 2012 03:05:21 +0000 (04:05 +0100)]
add PostIt to right_aside, fixes in css

12 years agoMerge pull request #160 from fabrixxm/master
tomtom84 [Fri, 23 Mar 2012 14:41:32 +0000 (07:41 -0700)]
Merge pull request #160 from fabrixxm/master

work on diabook theme and settings

12 years agodiabook: theme.php
Fabio Comuni [Fri, 23 Mar 2012 13:09:06 +0000 (14:09 +0100)]
diabook: theme.php
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)

12 years agouser settings: don't show emoticons
Fabio Comuni [Fri, 23 Mar 2012 11:07:22 +0000 (12:07 +0100)]
user settings: don't show emoticons

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Fri, 23 Mar 2012 09:45:10 +0000 (10:45 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agofix in css right_aside
tommy tomson [Fri, 23 Mar 2012 09:16:11 +0000 (10:16 +0100)]
fix in css right_aside

12 years agosmall fix
tommy tomson [Fri, 23 Mar 2012 06:28:48 +0000 (07:28 +0100)]
small fix

12 years agoMerge pull request #159 from tomtom84/master
tomtom84 [Fri, 23 Mar 2012 06:03:55 +0000 (23:03 -0700)]
Merge pull request #159 from tomtom84/master

fixes in theme diabook

12 years agofix 1024resolution
tommy tomson [Fri, 23 Mar 2012 06:02:21 +0000 (07:02 +0100)]
fix 1024resolution

12 years agoMerge pull request #158 from tomtom84/master
friendica [Fri, 23 Mar 2012 03:19:44 +0000 (20:19 -0700)]
Merge pull request #158 from tomtom84/master

add right_aside to theme diabook ... need author

12 years agoadd right_aside to theme diabook
tommy tomson [Fri, 23 Mar 2012 01:36:34 +0000 (02:36 +0100)]
add right_aside to theme diabook

12 years agoability to change tags in edited posts
friendica [Thu, 22 Mar 2012 23:17:10 +0000 (16:17 -0700)]
ability to change tags in edited posts

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Thu, 22 Mar 2012 13:56:23 +0000 (14:56 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoMerge branch 'pull'
friendica [Thu, 22 Mar 2012 13:20:32 +0000 (06:20 -0700)]
Merge branch 'pull'

12 years agonormalise comparison link on delegation page
friendica [Thu, 22 Mar 2012 13:19:27 +0000 (06:19 -0700)]
normalise comparison link on delegation page

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 13:10:53 +0000 (14:10 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoquattro(-green) styling the 'filed under: remove' text
Tobias Diekershoff [Thu, 22 Mar 2012 13:09:21 +0000 (14:09 +0100)]
quattro(-green) styling the 'filed under: remove' text

12 years agoMerge pull request #157 from campino/master
friendica [Thu, 22 Mar 2012 12:49:08 +0000 (05:49 -0700)]
Merge pull request #157 from campino/master

Tests for the template engine

12 years agoit's only item.filer ;-)
Tobias Diekershoff [Thu, 22 Mar 2012 12:46:05 +0000 (13:46 +0100)]
it's only item.filer ;-)

12 years agoMerge branch 'quattrofiler'
Tobias Diekershoff [Thu, 22 Mar 2012 12:42:10 +0000 (13:42 +0100)]
Merge branch 'quattrofiler'

12 years agonon static filer text
Tobias Diekershoff [Thu, 22 Mar 2012 12:41:41 +0000 (13:41 +0100)]
non static filer text

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 12:38:59 +0000 (13:38 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agonew lines removed
Alexander Kampmann [Thu, 22 Mar 2012 12:05:34 +0000 (13:05 +0100)]
new lines removed

12 years agoremoved some new lines to cut down number of changed files
Alexander Kampmann [Thu, 22 Mar 2012 12:03:28 +0000 (13:03 +0100)]
removed some new lines to cut down number of changed files

12 years agoremoved unneccessary stuff
Alexander Kampmann [Thu, 22 Mar 2012 11:52:24 +0000 (12:52 +0100)]
removed unneccessary stuff

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann [Thu, 22 Mar 2012 11:50:02 +0000 (12:50 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
boot.php
database.sql
include/template_processor.php
update.php

12 years agoremoved problem from previous commit
Alexander Kampmann [Thu, 22 Mar 2012 11:45:11 +0000 (12:45 +0100)]
removed problem from previous commit

12 years agotests for the template engine
Alexander Kampmann [Thu, 22 Mar 2012 11:43:03 +0000 (12:43 +0100)]
tests for the template engine

12 years agoadding filer functionality to quattro(-green)
Tobias Diekershoff [Thu, 22 Mar 2012 11:41:51 +0000 (12:41 +0100)]
adding filer functionality to quattro(-green)

12 years agomissing tooltip for "file as"
friendica [Thu, 22 Mar 2012 11:07:37 +0000 (04:07 -0700)]
missing tooltip for "file as"

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 10:54:09 +0000 (11:54 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoprevent re-registrations using a deleted username - not an issue with Friendica but...
friendica [Thu, 22 Mar 2012 08:46:52 +0000 (01:46 -0700)]
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms

12 years agoMerge pull request #156 from tomtom84/master
tomtom84 [Thu, 22 Mar 2012 05:57:29 +0000 (22:57 -0700)]
Merge pull request #156 from tomtom84/master

fixes in diabook-derivates

12 years agoadd file_as-option to diabook-derivates
tommy tomson [Thu, 22 Mar 2012 05:54:18 +0000 (06:54 +0100)]
add file_as-option to diabook-derivates

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 05:27:13 +0000 (06:27 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agosupport lowercase :-p smilie
friendica [Thu, 22 Mar 2012 04:45:45 +0000 (21:45 -0700)]
support lowercase :-p smilie

12 years agoMerge branch 'pull'
friendica [Thu, 22 Mar 2012 04:43:10 +0000 (21:43 -0700)]
Merge branch 'pull'

12 years agowork around doubled linefeeds in tinymce3.5b2
friendica [Thu, 22 Mar 2012 04:42:27 +0000 (21:42 -0700)]
work around doubled linefeeds in tinymce3.5b2

12 years agoMerge pull request #155 from tomtom84/master
tomtom84 [Thu, 22 Mar 2012 03:39:19 +0000 (20:39 -0700)]
Merge pull request #155 from tomtom84/master

fixes in diabook-derivates

12 years agoadd icons to aside diabook, fixes in css
tommy tomson [Thu, 22 Mar 2012 03:33:21 +0000 (04:33 +0100)]
add icons to aside diabook, fixes in css

12 years agorevert permissions relaxation on community
friendica [Wed, 21 Mar 2012 21:56:06 +0000 (14:56 -0700)]
revert permissions relaxation on community

12 years agoadd comix-plain
friendica [Wed, 21 Mar 2012 20:55:37 +0000 (13:55 -0700)]
add comix-plain

12 years agosmooth the comix comment box
friendica [Wed, 21 Mar 2012 13:48:04 +0000 (06:48 -0700)]
smooth the comix comment box

12 years agomake autocomplete work with updated tinymce
friendica [Wed, 21 Mar 2012 12:27:08 +0000 (05:27 -0700)]
make autocomplete work with updated tinymce

12 years agoika to ica
friendica [Wed, 21 Mar 2012 07:35:33 +0000 (00:35 -0700)]
ika to ica

12 years agoprivate file in repository
friendica [Wed, 21 Mar 2012 07:34:12 +0000 (00:34 -0700)]
private file in repository

12 years agofacepark is unsupported ATM
friendica [Wed, 21 Mar 2012 07:08:06 +0000 (00:08 -0700)]
facepark is unsupported ATM

12 years agoMerge branch 'pull'
friendica [Wed, 21 Mar 2012 06:59:02 +0000 (23:59 -0700)]
Merge branch 'pull'

12 years agoremove stray template variable from old code
friendica [Wed, 21 Mar 2012 06:57:33 +0000 (23:57 -0700)]
remove stray template variable from old code

12 years agoMerge pull request #154 from tonybaldwin/master
friendica [Wed, 21 Mar 2012 06:31:12 +0000 (23:31 -0700)]
Merge pull request #154 from tonybaldwin/master

added theme

12 years agoadd comix theme
friendica [Wed, 21 Mar 2012 05:54:20 +0000 (22:54 -0700)]
add comix theme

12 years agouse password field for DB input
friendica [Wed, 21 Mar 2012 05:53:19 +0000 (22:53 -0700)]
use password field for DB input

12 years agoMerge remote branch 'upstream/master'
tony baldwin [Wed, 21 Mar 2012 05:36:23 +0000 (01:36 -0400)]
Merge remote branch 'upstream/master'

12 years agoadded Vijay's theme from facepark.in
tony baldwin [Wed, 21 Mar 2012 05:33:48 +0000 (01:33 -0400)]
added Vijay's theme from facepark.in

12 years agoadded README to mcefixes to explain what is going on.
friendica [Wed, 21 Mar 2012 04:04:09 +0000 (21:04 -0700)]
added README to mcefixes to explain what is going on.

12 years agoupdate tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
friendica [Wed, 21 Mar 2012 03:47:31 +0000 (20:47 -0700)]
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks

12 years agomore friend suggestions
friendica [Wed, 21 Mar 2012 02:06:26 +0000 (19:06 -0700)]
more friend suggestions

12 years agomove friend suggestions to top of contact page, add default contact profile photos...
friendica [Tue, 20 Mar 2012 23:05:32 +0000 (16:05 -0700)]
move friend suggestions to top of contact page, add default contact profile photos if missing

12 years agoMerge branch 'pull'
friendica [Tue, 20 Mar 2012 22:45:32 +0000 (15:45 -0700)]
Merge branch 'pull'

12 years agomissed a default profile photo replacement in notifications
friendica [Tue, 20 Mar 2012 22:43:34 +0000 (15:43 -0700)]
missed a default profile photo replacement in notifications

12 years agochange default profile photo to something more interesting than a reddish brown square
friendica [Tue, 20 Mar 2012 22:41:06 +0000 (15:41 -0700)]
change default profile photo to something more interesting than a reddish brown square

12 years agoslightly relax overly strict permissions in community and search to match those in...
friendica [Tue, 20 Mar 2012 21:55:18 +0000 (14:55 -0700)]
slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible

12 years agoMerge pull request #153 from simonlnu/master
Simon [Tue, 20 Mar 2012 15:39:42 +0000 (08:39 -0700)]
Merge pull request #153 from simonlnu/master

intro boxen tweaks, dispy gets synced with -dark

12 years agosome tweakings for intro boxes (finally got an intro i could see :). dispy synced...
Simon L'nu [Tue, 20 Mar 2012 15:37:51 +0000 (11:37 -0400)]
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 20 Mar 2012 15:33:52 +0000 (11:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #339 - lostpass sending to username, not email

* master:

12 years agobug #339 - lostpass sending to username, not email
friendica [Tue, 20 Mar 2012 08:50:20 +0000 (01:50 -0700)]
bug #339 - lostpass sending to username, not email

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

* remotes/upstream/master:
  add IP address to failed login log message
  modified:   include/text.php Stupid bug fixed
  cleanup after openid refactoring
  refactor openid logins/registrations
  modified:   include/text.php  deleted:    images/diaspora.png  deleted:    images/smiley-bangheaddesk.gif  deleted:    images/smiley-beard.png  deleted:    images/smiley-shaka.gif  deleted:    images/smiley-whitebeard.png
  some openid fixes, use identity url from openid server and normalise it.
  support "no_smilies"
  ctrl + left|right cursor keys to prev/next photos
  add 'loggin_out' hook

* master:

12 years agoadd IP address to failed login log message
friendica [Tue, 20 Mar 2012 04:58:21 +0000 (21:58 -0700)]
add IP address to failed login log message

12 years agoMerge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
friendica [Mon, 19 Mar 2012 22:56:16 +0000 (15:56 -0700)]
Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27

Smiley removal

12 years ago modified: include/text.php
Thomas [Mon, 19 Mar 2012 22:32:19 +0000 (22:32 +0000)]
modified:   include/text.php
Stupid bug fixed

12 years agoMerge pull request #150 from fabrixxm/master
friendica [Mon, 19 Mar 2012 22:29:32 +0000 (15:29 -0700)]
Merge pull request #150 from fabrixxm/master

Add "logging_out" hook

12 years agocleanup after openid refactoring
friendica [Mon, 19 Mar 2012 22:10:14 +0000 (15:10 -0700)]
cleanup after openid refactoring

12 years agorefactor openid logins/registrations
friendica [Mon, 19 Mar 2012 22:03:09 +0000 (15:03 -0700)]
refactor openid logins/registrations

12 years ago modified: include/text.php
Thomas [Mon, 19 Mar 2012 21:59:06 +0000 (21:59 +0000)]
modified:   include/text.php
deleted:    images/diaspora.png
deleted:    images/smiley-bangheaddesk.gif
deleted:    images/smiley-beard.png
deleted:    images/smiley-shaka.gif
deleted:    images/smiley-whitebeard.png

Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out.

12 years agoMerge remote-tracking branch 'main/master'
Thomas [Mon, 19 Mar 2012 21:53:13 +0000 (21:53 +0000)]
Merge remote-tracking branch 'main/master'

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Mon, 19 Mar 2012 15:41:32 +0000 (16:41 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agosome openid fixes, use identity url from openid server and normalise it.
friendica [Mon, 19 Mar 2012 13:48:11 +0000 (06:48 -0700)]
some openid fixes, use identity url from openid server and normalise it.

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Mon, 19 Mar 2012 11:24:40 +0000 (12:24 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agosupport "no_smilies"
friendica [Mon, 19 Mar 2012 10:18:39 +0000 (03:18 -0700)]
support "no_smilies"

12 years agoctrl + left|right cursor keys to prev/next photos
friendica [Mon, 19 Mar 2012 08:20:53 +0000 (01:20 -0700)]
ctrl + left|right cursor keys to prev/next photos

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 19 Mar 2012 07:41:26 +0000 (03:41 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
  community discovery cont., cleanup of DB debugging

* master:

12 years agoMerge pull request #149 from CatoTH/master
Simon [Mon, 19 Mar 2012 07:40:51 +0000 (00:40 -0700)]
Merge pull request #149 from CatoTH/master

Add a missing security token [Using photos as profile photos]

12 years agoExisting photos could not be used as profile photos anymore - should be fixed now...
Tobias Hößl [Mon, 19 Mar 2012 07:37:09 +0000 (07:37 +0000)]
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier

12 years agocommunity discovery cont., cleanup of DB debugging
friendica [Mon, 19 Mar 2012 05:12:36 +0000 (22:12 -0700)]
community discovery cont., cleanup of DB debugging

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 19 Mar 2012 01:09:25 +0000 (21:09 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup
  CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)

* master:

12 years agoMerge branch 'pull'
friendica [Mon, 19 Mar 2012 00:57:54 +0000 (17:57 -0700)]
Merge branch 'pull'

12 years agorevup
friendica [Mon, 19 Mar 2012 00:57:29 +0000 (17:57 -0700)]
revup

12 years agoMerge pull request #147 from CatoTH/master
friendica [Mon, 19 Mar 2012 00:54:12 +0000 (17:54 -0700)]
Merge pull request #147 from CatoTH/master

CSRF-Protection in the group-related form

12 years agoMerge pull request #148 from simonlnu/master
Simon [Sun, 18 Mar 2012 22:47:25 +0000 (15:47 -0700)]
Merge pull request #148 from simonlnu/master

fix the comment box being too wide and looking off-kilter

12 years agofix the comment box being too wide and looking off-kilter
Simon L'nu [Sun, 18 Mar 2012 22:33:38 +0000 (18:33 -0400)]
fix the comment box being too wide and looking off-kilter

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, 18 Mar 2012 16:02:33 +0000 (12:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  replace split() by explode(); split is deprecated
  lost changes to tinymce/bbcode
  remove admin view of local directory
  bug #337, call template_unescape() only at the end of template processing
  queue optimisation - back off delivery attempts to once per hour after the first 12 hours.

* master:

12 years agoCSRF-Protection in the group-related form (creating, renaming and dropping a group...
Tobias Hößl [Sun, 18 Mar 2012 15:44:33 +0000 (15:44 +0000)]
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)

12 years agoMerge pull request #146 from CatoTH/master
friendica [Sun, 18 Mar 2012 10:59:49 +0000 (03:59 -0700)]
Merge pull request #146 from CatoTH/master

replace split() by explode(); split is deprecated

12 years agoreplace split() by explode(); split is deprecated
Tobias Hößl [Sun, 18 Mar 2012 10:36:49 +0000 (10:36 +0000)]
replace split() by explode(); split is deprecated