]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge pull request #309 from fabrixxm/master
Simon [Wed, 23 May 2012 22:10:24 +0000 (15:10 -0700)]
Merge pull request #309 from fabrixxm/master

Update install wizard

12 years agoMerge pull request #311 from simonlnu/master
Simon [Wed, 23 May 2012 22:08:43 +0000 (15:08 -0700)]
Merge pull request #311 from simonlnu/master

clean up and fixing things

12 years agoclean up and make nice the dispy photo edit stuff
Simon L'nu [Wed, 23 May 2012 22:06:49 +0000 (18:06 -0400)]
clean up and make nice the dispy photo edit stuff

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, 23 May 2012 22:04:23 +0000 (18:04 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #310 from simonlnu/master
Simon [Wed, 23 May 2012 20:05:10 +0000 (13:05 -0700)]
Merge pull request #310 from simonlnu/master

add a placeholder attribute on #search-text; dispy fixes

12 years agoadd a placeholder attribute on search-text; dispy fixes
Simon L'nu [Wed, 23 May 2012 19:58:22 +0000 (15:58 -0400)]
add a placeholder attribute on search-text; dispy fixes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoUpdate install wizard
root [Wed, 23 May 2012 11:38:31 +0000 (07:38 -0400)]
Update install wizard
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 23 May 2012 09:03:05 +0000 (05:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  photo rotation
  event calendar theming
  import quattro event reminder
  mark bubbles unsupported
  keep FB out of private notes
  clear submanage, etc from session on logout
  if identity (uid) changes - reload any other open browser windows on next ping.

* master:

12 years agophoto rotation
friendica [Wed, 23 May 2012 08:01:04 +0000 (01:01 -0700)]
photo rotation

12 years agoevent calendar theming
friendica [Wed, 23 May 2012 05:34:35 +0000 (22:34 -0700)]
event calendar theming

12 years agoimport quattro event reminder
friendica [Wed, 23 May 2012 05:06:52 +0000 (22:06 -0700)]
import quattro event reminder

12 years agomark bubbles unsupported
friendica [Wed, 23 May 2012 04:54:19 +0000 (21:54 -0700)]
mark bubbles unsupported

12 years agokeep FB out of private notes
friendica [Wed, 23 May 2012 04:20:31 +0000 (21:20 -0700)]
keep FB out of private notes

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 23 May 2012 01:06:34 +0000 (18:06 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoclear submanage, etc from session on logout
friendica [Wed, 23 May 2012 01:05:58 +0000 (18:05 -0700)]
clear submanage, etc from session on logout

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 22 May 2012 23:49:03 +0000 (19:49 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Oops - but lets commit the right revision, sorry.  There's a spare line in the last one.
  Fix darkzero/ns BB icon background colours.
  cause of bogus wall-to-wall posts found
  add queue totals to admin summary page
  DE: update to the strings and some mail templates
  fix setting array values to config items
  redir links for permission controlled attachments

* master:

12 years agoif identity (uid) changes - reload any other open browser windows on next ping.
friendica [Tue, 22 May 2012 23:01:07 +0000 (16:01 -0700)]
if identity (uid) changes - reload any other open browser windows on next ping.

12 years agoOops - but lets commit the right revision, sorry. There's a spare line in the last...
Thomas Willingham [Tue, 22 May 2012 18:19:36 +0000 (19:19 +0100)]
Oops - but lets commit the right revision, sorry.  There's a spare line in the last one.

12 years agoFix darkzero/ns BB icon background colours.
Thomas Willingham [Tue, 22 May 2012 18:14:58 +0000 (19:14 +0100)]
Fix darkzero/ns BB icon background colours.

12 years agocause of bogus wall-to-wall posts found
friendica [Tue, 22 May 2012 10:55:11 +0000 (03:55 -0700)]
cause of bogus wall-to-wall posts found

12 years agoadd queue totals to admin summary page
friendica [Tue, 22 May 2012 10:44:03 +0000 (03:44 -0700)]
add queue totals to admin summary page

12 years agoDE: update to the strings and some mail templates
Tobias Diekershoff [Tue, 22 May 2012 10:17:01 +0000 (12:17 +0200)]
DE: update to the strings and some mail templates

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Tue, 22 May 2012 09:57:19 +0000 (11:57 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agofix setting array values to config items
Tobias Diekershoff [Tue, 22 May 2012 09:56:49 +0000 (11:56 +0200)]
fix setting array values to config items

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 22 May 2012 05:56:39 +0000 (22:56 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoredir links for permission controlled attachments
friendica [Tue, 22 May 2012 05:54:39 +0000 (22:54 -0700)]
redir links for permission controlled attachments

12 years agoMerge pull request #308 from simonlnu/master
Simon [Tue, 22 May 2012 01:39:50 +0000 (18:39 -0700)]
Merge pull request #308 from simonlnu/master

fix (mini-)search-text text

12 years agofix (min-)search-text text
Simon L'nu [Tue, 22 May 2012 01:38:53 +0000 (21:38 -0400)]
fix (min-)search-text text

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #307 from simonlnu/master
Simon [Tue, 22 May 2012 01:30:36 +0000 (18:30 -0700)]
Merge pull request #307 from simonlnu/master

updates to dispy family; fix typo in INSTALL.txt

12 years agoupdates to dispy family; fix typo in INSTALL.txt
Simon L'nu [Tue, 22 May 2012 01:29:18 +0000 (21:29 -0400)]
updates to dispy family; fix typo in INSTALL.txt

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, 22 May 2012 01:23:40 +0000 (21:23 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update, bug 428, 429, and ability to block globaldir submissions from demo sites

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 21 May 2012 23:43:07 +0000 (16:43 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update, bug 428, 429, and ability to block globaldir submissions from demo sites
friendica [Mon, 21 May 2012 23:40:11 +0000 (16:40 -0700)]
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 21 May 2012 10:50:00 +0000 (06:50 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #306 from simonlnu/master
Simon [Mon, 21 May 2012 10:49:46 +0000 (03:49 -0700)]
Merge pull request #306 from simonlnu/master

more light fixes

12 years agomore light fixes
Simon L'nu [Mon, 21 May 2012 10:48:08 +0000 (06:48 -0400)]
more light fixes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #305 from simonlnu/master
Simon [Mon, 21 May 2012 06:49:59 +0000 (23:49 -0700)]
Merge pull request #305 from simonlnu/master

fix dumb mistake in light

12 years agofix dumb mistake in light
Simon L'nu [Mon, 21 May 2012 06:47:43 +0000 (02:47 -0400)]
fix dumb mistake in light

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, 21 May 2012 04:36:38 +0000 (00:36 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 21 May 2012 01:30:52 +0000 (18:30 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Mon, 21 May 2012 01:30:02 +0000 (18:30 -0700)]
rev update

12 years agoMerge pull request #303 from simonlnu/master
Simon [Sun, 20 May 2012 18:38:25 +0000 (11:38 -0700)]
Merge pull request #303 from simonlnu/master

fix brown paper bag with dispy light

12 years agofix dispy light
Simon L'nu [Sun, 20 May 2012 18:37:20 +0000 (14:37 -0400)]
fix dispy light

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, 20 May 2012 18:33:15 +0000 (14:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  search with leading @ performs directory search (# for tag search), nothing for text search
  Darkzero-NS + 'Friendicaland' countries.
  set comment permissions explicitly to parent permissions

* master:

12 years agosearch with leading @ performs directory search (# for tag search), nothing for text...
friendica [Sun, 20 May 2012 04:53:27 +0000 (21:53 -0700)]
search with leading @ performs directory search (# for tag search), nothing for text search

12 years agoDarkzero-NS + 'Friendicaland' countries.
Thomas Willingham [Sun, 20 May 2012 00:44:07 +0000 (01:44 +0100)]
Darkzero-NS + 'Friendicaland' countries.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 20 May 2012 00:22:00 +0000 (17:22 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoset comment permissions explicitly to parent permissions
friendica [Sat, 19 May 2012 23:42:24 +0000 (16:42 -0700)]
set comment permissions explicitly to parent permissions

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 19 May 2012 22:53:57 +0000 (18:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero, another missing part of "everything"
  Diabook-dark - some more cleaning up
  Okay, so maybe not *everything*
  Give Darkzero some loving.
  backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
  sql script to ccnvert all tables to innodb

* master:

12 years agoDarkzero, another missing part of "everything"
Thomas Willingham [Sat, 19 May 2012 16:30:55 +0000 (17:30 +0100)]
Darkzero, another missing part of "everything"

12 years agoDiabook-dark - some more cleaning up
Thomas Willingham [Sat, 19 May 2012 16:20:27 +0000 (17:20 +0100)]
Diabook-dark - some more cleaning up

12 years agoOkay, so maybe not *everything*
Thomas Willingham [Sat, 19 May 2012 14:17:35 +0000 (15:17 +0100)]
Okay, so maybe not *everything*

12 years agoGive Darkzero some loving.
Thomas Willingham [Sat, 19 May 2012 13:51:10 +0000 (14:51 +0100)]
Give Darkzero some loving.

Everything that used to be hidden with light text on light backgrounds is legible now.

12 years agobackend support for 'x' deliveries per process - x is configurable, more importantly...
friendica [Sat, 19 May 2012 09:42:11 +0000 (02:42 -0700)]
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 19 May 2012 07:46:49 +0000 (00:46 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agosql script to ccnvert all tables to innodb
friendica [Sat, 19 May 2012 07:45:45 +0000 (00:45 -0700)]
sql script to ccnvert all tables to innodb

12 years agoMerge pull request #302 from simonlnu/master
Simon [Sat, 19 May 2012 07:16:44 +0000 (00:16 -0700)]
Merge pull request #302 from simonlnu/master

fix -desc again

12 years agofix -desc again
Simon L'nu [Sat, 19 May 2012 07:15:35 +0000 (03:15 -0400)]
fix -desc again

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

* remotes/upstream/master:
  profile change activity link bug

* master:

12 years agoprofile change activity link bug
friendica [Sat, 19 May 2012 00:55:11 +0000 (17:55 -0700)]
profile change activity link bug

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 18 May 2012 16:12:40 +0000 (12:12 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  apply max-width to images in posts, duepuntozero
  theming for default group selector
  catch more places to apply default group
  make it difficult to setup a private forum with no privacy
  more private forums, default privacy group for new contacts
  tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

* master:

12 years agoapply max-width to images in posts, duepuntozero
friendica [Fri, 18 May 2012 08:46:02 +0000 (01:46 -0700)]
apply max-width to images in posts, duepuntozero

12 years agotheming for default group selector
friendica [Fri, 18 May 2012 08:38:11 +0000 (01:38 -0700)]
theming for default group selector

12 years agocatch more places to apply default group
friendica [Fri, 18 May 2012 08:03:46 +0000 (01:03 -0700)]
catch more places to apply default group

12 years agomake it difficult to setup a private forum with no privacy
friendica [Fri, 18 May 2012 06:05:41 +0000 (23:05 -0700)]
make it difficult to setup a private forum with no privacy

12 years agomore private forums, default privacy group for new contacts
friendica [Fri, 18 May 2012 05:44:52 +0000 (22:44 -0700)]
more private forums, default privacy group for new contacts

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 18 May 2012 03:01:46 +0000 (23:01 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  setup delivery chain for private groups (work in progress)
  bring in the *much better* xml parser from the original zot branch
  rev update
  merged from wrong project
  initial commit

* master:

12 years agotell browser not to cache permission denied (private) photos so that after authentica...
friendica [Fri, 18 May 2012 02:59:46 +0000 (19:59 -0700)]
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

12 years agosetup delivery chain for private groups (work in progress)
friendica [Fri, 18 May 2012 02:35:24 +0000 (19:35 -0700)]
setup delivery chain for private groups (work in progress)

12 years agobring in the *much better* xml parser from the original zot branch
friendica [Thu, 17 May 2012 04:29:57 +0000 (21:29 -0700)]
bring in the *much better* xml parser from the original zot branch

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 20:55:00 +0000 (13:55 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Wed, 16 May 2012 20:52:11 +0000 (13:52 -0700)]
rev update

12 years agoMerge pull request #301 from simonlnu/master
Simon [Wed, 16 May 2012 17:34:30 +0000 (10:34 -0700)]
Merge pull request #301 from simonlnu/master

fix admin links

12 years agofix admin links...
Simon L'nu [Wed, 16 May 2012 17:33:20 +0000 (13:33 -0400)]
fix admin links...

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agomerged from wrong project
friendica [Wed, 16 May 2012 12:08:15 +0000 (05:08 -0700)]
merged from wrong project

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 11:59:15 +0000 (04:59 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #300 from simonlnu/master
Simon [Wed, 16 May 2012 09:52:35 +0000 (02:52 -0700)]
Merge pull request #300 from simonlnu/master

*sigh*. fix dark *again*

12 years ago*sigh*. fix dark *again*
Simon L'nu [Wed, 16 May 2012 09:51:29 +0000 (05:51 -0400)]
*sigh*. fix dark *again*

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #299 from simonlnu/master
Simon [Wed, 16 May 2012 09:33:10 +0000 (02:33 -0700)]
Merge pull request #299 from simonlnu/master

get rid of the monstrosity for .button. need to find alternate solution

12 years agoget rid of the monstrosity for .button. need to find alternate solution
Simon L'nu [Wed, 16 May 2012 09:32:08 +0000 (05:32 -0400)]
get rid of the monstrosity for .button. need to find alternate solution

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, 16 May 2012 09:29:34 +0000 (05:29 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 06:15:29 +0000 (23:15 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #298 from simonlnu/master
Simon [Wed, 16 May 2012 06:01:20 +0000 (23:01 -0700)]
Merge pull request #298 from simonlnu/master

slight re-design of wall stuff and css/font cleaning

12 years agoslight re-design of wall stuff and css/font cleaning
Simon L'nu [Wed, 16 May 2012 05:58:55 +0000 (01:58 -0400)]
slight re-design of wall stuff and css/font cleaning

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge https://github.com/friendica/dir into dpull
friendica [Wed, 16 May 2012 05:30:47 +0000 (22:30 -0700)]
Merge https://github.com/friendica/dir into dpull

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 16 May 2012 03:40:35 +0000 (23:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:

12 years agoupdate tinymce to 3.5.0.1
friendica [Wed, 16 May 2012 00:18:46 +0000 (17:18 -0700)]
update tinymce to 3.5.0.1

12 years agorev update
friendica [Wed, 16 May 2012 00:05:28 +0000 (17:05 -0700)]
rev update

12 years agoinitial commit
friendica [Tue, 15 May 2012 12:09:26 +0000 (05:09 -0700)]
initial commit

12 years agoDE strings
Tobias Diekershoff [Tue, 15 May 2012 08:44:01 +0000 (10:44 +0200)]
DE strings

12 years agoslackr drop shadows extended
friendica [Tue, 15 May 2012 04:45:37 +0000 (21:45 -0700)]
slackr drop shadows extended

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 15 May 2012 03:36:27 +0000 (20:36 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #297 from mexon/upstream
friendica [Tue, 15 May 2012 01:57:55 +0000 (18:57 -0700)]
Merge pull request #297 from mexon/upstream

Allow plugins to modify the contact photo menu

12 years agoAllow plugins to modify the contact photo menu
Matthew Exon [Sun, 13 May 2012 08:15:54 +0000 (10:15 +0200)]
Allow plugins to modify the contact photo menu

12 years agorev update
friendica [Mon, 14 May 2012 23:32:21 +0000 (16:32 -0700)]
rev update

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 14 May 2012 23:29:06 +0000 (19:29 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #296 from simonlnu/master
Simon [Mon, 14 May 2012 04:33:07 +0000 (21:33 -0700)]
Merge pull request #296 from simonlnu/master

finish dispy light colour fixes

12 years agofinish dipsy light colour fixes
Simon L'nu [Mon, 14 May 2012 04:30:25 +0000 (00:30 -0400)]
finish dipsy light colour 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 [Mon, 14 May 2012 04:26:34 +0000 (00:26 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 13 May 2012 23:40:46 +0000 (16:40 -0700)]
Merge https://github.com/friendica/friendica into pull