]> git.mxchange.org Git - friendica.git/log
friendica.git
11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 3 Jun 2012 08:59:07 +0000 (04:59 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  zrl's when visiting public photos at the source site
  doco
  cleanup
  turn "follow" into a function
  add hometown to profiles
  bug #439 - remove web port number from notification email "from" address
  webfinger profile linker
  "howlong" added to marital status.
  fewer "bob smith to bob smith via wall-to-wall".
  [quote=somebody] was appearing as an extended spoiler tag.

* master:

11 years agozrl's when visiting public photos at the source site
friendica [Sun, 3 Jun 2012 08:53:11 +0000 (01:53 -0700)]
zrl's when visiting public photos at the source site

11 years agodoco
friendica [Sun, 3 Jun 2012 06:22:02 +0000 (23:22 -0700)]
doco

11 years agocleanup
friendica [Sun, 3 Jun 2012 06:17:49 +0000 (23:17 -0700)]
cleanup

11 years agoturn "follow" into a function
friendica [Sun, 3 Jun 2012 06:12:20 +0000 (23:12 -0700)]
turn "follow" into a function

11 years agoadd hometown to profiles
friendica [Sun, 3 Jun 2012 03:58:20 +0000 (20:58 -0700)]
add hometown to profiles

11 years agobug #439 - remove web port number from notification email "from" address
friendica [Sun, 3 Jun 2012 01:23:54 +0000 (18:23 -0700)]
bug #439 - remove web port number from notification email "from" address

11 years agowebfinger profile linker
friendica [Sun, 3 Jun 2012 01:05:23 +0000 (18:05 -0700)]
webfinger profile linker

11 years ago"howlong" added to marital status.
friendica [Sat, 2 Jun 2012 09:30:26 +0000 (02:30 -0700)]
"howlong" added to marital status.

11 years agofewer "bob smith to bob smith via wall-to-wall".
friendica [Sat, 2 Jun 2012 07:40:38 +0000 (00:40 -0700)]
fewer "bob smith to bob smith via wall-to-wall".

11 years agoMerge pull request #321 from beardy-unixer/master
friendica [Sat, 2 Jun 2012 04:48:23 +0000 (21:48 -0700)]
Merge pull request #321 from beardy-unixer/master

BB code [quote=somebody] fix.

11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 2 Jun 2012 03:13:24 +0000 (23:13 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  registration issue after re-factor
  install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
  admin: remove update link in admin menu

* master:

11 years agoregistration issue after re-factor
friendica [Fri, 1 Jun 2012 22:42:13 +0000 (15:42 -0700)]
registration issue after re-factor

11 years ago[quote=somebody] was appearing as an extended spoiler tag.
Thomas Willingham [Fri, 1 Jun 2012 22:31:07 +0000 (23:31 +0100)]
[quote=somebody] was appearing as an extended spoiler tag.

11 years agoMerge pull request #320 from fabrixxm/master
friendica [Fri, 1 Jun 2012 09:53:42 +0000 (02:53 -0700)]
Merge pull request #320 from fabrixxm/master

Fix bug 436, fix small typo, and incomplete feature removal

11 years agoinstall: fix bug #436 and small typo
root [Fri, 1 Jun 2012 07:31:24 +0000 (03:31 -0400)]
install: fix bug #436 and small typo
Function check_htaccess() don't perform check if curl is not installed.
This was leading to wsod beacuse check_htaccess() uses fetch_url().

11 years agoMerge remote branch 'friendica/master'
root [Fri, 1 Jun 2012 07:10:57 +0000 (03:10 -0400)]
Merge remote branch 'friendica/master'

11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 1 Jun 2012 03:22:19 +0000 (23:22 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  turn registration code into a standalone function for re-use
  query using both `id` and `parent`
  prevent email from leaking in feeds
  y didn't i think of this b4?
  some zero theming on settings page
  missing delimiter
  transition to beta for private forums
  rev update
  Friendicaland - you can't 'live' on a demo server.
  Create a "potential default group" called "Friends" on registration.
  fix private photos that also have a size specification
  private group tests, cont.
  hide private group if desired
  prvgroup should see intros
  private group fix
  possible sql injection in search
  bugfixes: private photo embeds and search for strings with %

* master:

11 years agoturn registration code into a standalone function for re-use
friendica [Fri, 1 Jun 2012 02:06:17 +0000 (19:06 -0700)]
turn registration code into a standalone function for re-use

11 years agoMerge pull request #319 from fermionic/fix-diaspora-parent-query
friendica [Fri, 1 Jun 2012 01:59:45 +0000 (18:59 -0700)]
Merge pull request #319 from fermionic/fix-diaspora-parent-query

query using both `id` and `parent`

11 years agoquery using both `id` and `parent`
Zach Prezkuta [Fri, 1 Jun 2012 01:45:58 +0000 (19:45 -0600)]
query using both `id` and `parent`

11 years agoprevent email from leaking in feeds
friendica [Thu, 31 May 2012 02:11:01 +0000 (19:11 -0700)]
prevent email from leaking in feeds

11 years agoy didn't i think of this b4?
friendica [Thu, 31 May 2012 00:22:51 +0000 (17:22 -0700)]
y didn't i think of this b4?

11 years agosome zero theming on settings page
friendica [Wed, 30 May 2012 23:30:51 +0000 (16:30 -0700)]
some zero theming on settings page

11 years agomissing delimiter
friendica [Wed, 30 May 2012 22:56:11 +0000 (15:56 -0700)]
missing delimiter

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 30 May 2012 22:53:48 +0000 (15:53 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agotransition to beta for private forums
friendica [Wed, 30 May 2012 22:52:17 +0000 (15:52 -0700)]
transition to beta for private forums

11 years agorev update
friendica [Wed, 30 May 2012 22:50:30 +0000 (15:50 -0700)]
rev update

11 years agoFriendicaland - you can't 'live' on a demo server.
Thomas Willingham [Wed, 30 May 2012 16:41:31 +0000 (17:41 +0100)]
Friendicaland - you can't 'live' on a demo server.

11 years agoCreate a "potential default group" called "Friends" on registration.
friendica [Wed, 30 May 2012 11:20:01 +0000 (04:20 -0700)]
Create a "potential default group" called "Friends" on registration.

11 years agofix private photos that also have a size specification
friendica [Wed, 30 May 2012 08:52:58 +0000 (01:52 -0700)]
fix private photos that also have a size specification

11 years agoprivate group tests, cont.
friendica [Wed, 30 May 2012 05:57:15 +0000 (22:57 -0700)]
private group tests, cont.

11 years agohide private group if desired
friendica [Wed, 30 May 2012 01:43:56 +0000 (18:43 -0700)]
hide private group if desired

11 years agoprvgroup should see intros
friendica [Wed, 30 May 2012 01:24:44 +0000 (18:24 -0700)]
prvgroup should see intros

11 years agoprivate group fix
friendica [Wed, 30 May 2012 01:14:21 +0000 (18:14 -0700)]
private group fix

11 years agopossible sql injection in search
friendica [Wed, 30 May 2012 00:14:35 +0000 (17:14 -0700)]
possible sql injection in search

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 29 May 2012 23:50:42 +0000 (16:50 -0700)]
Merge https://github.com/friendica/friendica into pull

Conflicts:
mod/search.php

11 years agobugfixes: private photo embeds and search for strings with %
friendica [Tue, 29 May 2012 23:44:02 +0000 (16:44 -0700)]
bugfixes: private photo embeds and search for strings with %

11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 29 May 2012 20:13:27 +0000 (16:13 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning
  MySQL-Fulltext search option is disabled by default
  Disabled logging of SQL statements
  Doing negative caching for config values, special logfile for database optmisations
  Saved searches now can search for tags as well
  Deactivating the test output in db engine
  Speed optimisation by enabling the posibility of the MySQL fulltext engine
  Performance tests
  API: RSS-Feeds are now shortened to 1000 characters. (With added link)

* master:

11 years agoMerge pull request #316 from annando/master
Simon [Tue, 29 May 2012 20:13:10 +0000 (13:13 -0700)]
Merge pull request #316 from annando/master

Speed improvements

11 years agoMerge pull request #317 from CatoTH/master
Simon [Tue, 29 May 2012 20:10:52 +0000 (13:10 -0700)]
Merge pull request #317 from CatoTH/master

Events: additional hooks, and a bugfix

11 years agoMerge pull request #318 from simonlnu/master
Simon [Tue, 29 May 2012 20:09:55 +0000 (13:09 -0700)]
Merge pull request #318 from simonlnu/master

fix toolbar; more size dynamicism

11 years agofix toolbar. more size dynamicism
Simon L'nu [Tue, 29 May 2012 20:09:02 +0000 (16:09 -0400)]
fix toolbar. more size dynamicism

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 29 May 2012 19:06:22 +0000 (15:06 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  ability to only expire contacts, not self
  Provide backend option to only expire other peoples' conversations.
  more theme cleanup
  rev update

* master:

11 years agoAdd two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag...
Tobias Hößl [Tue, 29 May 2012 19:03:30 +0000 (19:03 +0000)]
Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning

11 years agoMySQL-Fulltext search option is disabled by default
Michael Vogel [Tue, 29 May 2012 14:30:12 +0000 (16:30 +0200)]
MySQL-Fulltext search option is disabled by default

11 years agoDisabled logging of SQL statements
Michael Vogel [Tue, 29 May 2012 14:16:37 +0000 (16:16 +0200)]
Disabled logging of SQL statements

11 years agoMerge remote branch 'upstream/master'
Michael Vogel [Tue, 29 May 2012 14:09:26 +0000 (16:09 +0200)]
Merge remote branch 'upstream/master'

11 years agoability to only expire contacts, not self
friendica [Tue, 29 May 2012 08:14:53 +0000 (01:14 -0700)]
ability to only expire contacts, not self

11 years agoProvide backend option to only expire other peoples' conversations.
friendica [Tue, 29 May 2012 06:24:10 +0000 (23:24 -0700)]
Provide backend option to only expire other peoples' conversations.

11 years agomore theme cleanup
friendica [Tue, 29 May 2012 02:17:06 +0000 (19:17 -0700)]
more theme cleanup

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 28 May 2012 23:52:19 +0000 (16:52 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Mon, 28 May 2012 23:51:52 +0000 (16:51 -0700)]
rev update

11 years agoMerge pull request #315 from simonlnu/master
Simon [Mon, 28 May 2012 23:26:24 +0000 (16:26 -0700)]
Merge pull request #315 from simonlnu/master

fixed font-size/line-height stuffs

11 years agofixed font-size/line-height stuffs
Simon L'nu [Mon, 28 May 2012 23:25:10 +0000 (19:25 -0400)]
fixed font-size/line-height stuffs

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
11 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 28 May 2012 20:49:12 +0000 (16:49 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slackr - tone down the shadows a smidgin
  add plugin hooks to gender, sexpref, and marital selectors
  birthday in november,december bug
  rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.
  handle multiple underscores in D* links

* master:

12 years agoslackr - tone down the shadows a smidgin
friendica [Mon, 28 May 2012 06:02:25 +0000 (23:02 -0700)]
slackr - tone down the shadows a smidgin

12 years agoadd plugin hooks to gender, sexpref, and marital selectors
friendica [Mon, 28 May 2012 05:35:01 +0000 (22:35 -0700)]
add plugin hooks to gender, sexpref, and marital selectors

12 years agobirthday in november,december bug
friendica [Mon, 28 May 2012 04:36:20 +0000 (21:36 -0700)]
birthday in november,december bug

12 years agorework the way private photos are embedded to avoid url differences and also check...
friendica [Mon, 28 May 2012 04:01:58 +0000 (21:01 -0700)]
rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.

12 years agohandle multiple underscores in D* links
friendica [Sun, 27 May 2012 06:46:42 +0000 (23:46 -0700)]
handle multiple underscores in D* links

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 26 May 2012 23:39:34 +0000 (19:39 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more ssl policy stuff
  allow force ssl on notifications

* master:

12 years agomore ssl policy stuff
friendica [Sat, 26 May 2012 23:21:48 +0000 (16:21 -0700)]
more ssl policy stuff

12 years agoallow force ssl on notifications
friendica [Sat, 26 May 2012 23:11:51 +0000 (16:11 -0700)]
allow force ssl on notifications

12 years agoMerge branch 'master' of github.com:annando/friendica
Michael Vogel [Sat, 26 May 2012 13:42:23 +0000 (15:42 +0200)]
Merge branch 'master' of github.com:annando/friendica

12 years agoDoing negative caching for config values, special logfile for database optmisations
Michael Vogel [Sat, 26 May 2012 13:41:23 +0000 (15:41 +0200)]
Doing negative caching for config values, special logfile for database optmisations

12 years agoMerge branch 'master' of github.com:annando/friendica
Michael [Sat, 26 May 2012 10:06:19 +0000 (12:06 +0200)]
Merge branch 'master' of github.com:annando/friendica

Conflicts:
mod/network.php

12 years agoMerge remote branch 'upstream/master'
Michael [Sat, 26 May 2012 09:59:19 +0000 (11:59 +0200)]
Merge remote branch 'upstream/master'

12 years agoSaved searches now can search for tags as well
Michael Vogel [Sat, 26 May 2012 09:51:48 +0000 (11:51 +0200)]
Saved searches now can search for tags as well

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

* remotes/upstream/master:
  missing entries on personal tab after sql text search optimise
  bug #434 - default group placement not working after accepting dfrn friend request
  fix wall_uploaded photo permissions on group post by member
  improve location change notifications
  keep private FB stuff out of personal notes
  rev update
  DE update to strings and templates

* master:

12 years agomissing entries on personal tab after sql text search optimise
friendica [Sat, 26 May 2012 01:29:06 +0000 (18:29 -0700)]
missing entries on personal tab after sql text search optimise

12 years agoDeactivating the test output in db engine
Michael Vogel [Sat, 26 May 2012 01:23:18 +0000 (03:23 +0200)]
Deactivating the test output in db engine

12 years agoSpeed optimisation by enabling the posibility of the MySQL fulltext engine
Michael Vogel [Sat, 26 May 2012 01:21:07 +0000 (03:21 +0200)]
Speed optimisation by enabling the posibility of the MySQL fulltext engine

12 years agobug #434 - default group placement not working after accepting dfrn friend request
friendica [Sat, 26 May 2012 01:06:51 +0000 (18:06 -0700)]
bug #434 - default group placement not working after accepting dfrn friend request

12 years agofix wall_uploaded photo permissions on group post by member
friendica [Sat, 26 May 2012 00:42:35 +0000 (17:42 -0700)]
fix wall_uploaded photo permissions on group post by member

12 years agoimprove location change notifications
friendica [Fri, 25 May 2012 22:56:18 +0000 (15:56 -0700)]
improve location change notifications

12 years agokeep private FB stuff out of personal notes
friendica [Fri, 25 May 2012 21:36:17 +0000 (14:36 -0700)]
keep private FB stuff out of personal notes

12 years agoMerge remote branch 'upstream/master'
Michael Vogel [Fri, 25 May 2012 14:19:10 +0000 (16:19 +0200)]
Merge remote branch 'upstream/master'

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 25 May 2012 07:43:09 +0000 (00:43 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Fri, 25 May 2012 07:42:38 +0000 (00:42 -0700)]
rev update

12 years agoadmin: remove update link in admin menu
root [Fri, 25 May 2012 07:05:07 +0000 (03:05 -0400)]
admin: remove update link in admin menu

12 years agoDE update to strings and templates
Tobias Diekershoff [Fri, 25 May 2012 04:04:33 +0000 (06:04 +0200)]
DE update to strings and templates

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 24 May 2012 23:30:41 +0000 (19:30 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix small js error when user not logged in
  install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect

* master:

12 years agoMerge pull request #313 from fabrixxm/master
Simon [Thu, 24 May 2012 23:30:22 +0000 (16:30 -0700)]
Merge pull request #313 from fabrixxm/master

install wizard: fix php executable path

12 years agoMerge pull request #314 from simonlnu/master
Simon [Thu, 24 May 2012 23:29:29 +0000 (16:29 -0700)]
Merge pull request #314 from simonlnu/master

update dark a bit. i messed up some buttons

12 years agoupdate dark a bit. i messed up some buttons
Simon L'nu [Thu, 24 May 2012 23:28:12 +0000 (19:28 -0400)]
update dark a bit. i messed up some buttons

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

* remotes/upstream/master:
  slackr: improve interactivity
  slackr: hide calendar when posting
  more theme stuff

* master:

12 years agofix small js error when user not logged in
root [Thu, 24 May 2012 08:29:33 +0000 (04:29 -0400)]
fix small js error when user not logged in

12 years agoinstall wizard: fix php executable path
root [Thu, 24 May 2012 08:21:33 +0000 (04:21 -0400)]
install wizard: fix php executable path
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect

12 years agoslackr: improve interactivity
friendica [Thu, 24 May 2012 06:29:45 +0000 (23:29 -0700)]
slackr: improve interactivity

12 years agoslackr: hide calendar when posting
friendica [Thu, 24 May 2012 01:20:24 +0000 (18:20 -0700)]
slackr: hide calendar when posting

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

12 years agomore theme stuff
friendica [Wed, 23 May 2012 23:58:31 +0000 (16:58 -0700)]
more theme stuff

12 years agoMerge pull request #312 from simonlnu/master
Simon [Wed, 23 May 2012 23:27:34 +0000 (16:27 -0700)]
Merge pull request #312 from simonlnu/master

a few more fixes

12 years agoclean up and more fixing
Simon L'nu [Wed, 23 May 2012 23:22:07 +0000 (19:22 -0400)]
clean up and more fixing

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 23:20:24 +0000 (19:20 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slackr - better highlighting of current selections
  slackr - knock the sharp edges off the events calendar
  rev update

* master:

12 years agoslackr - better highlighting of current selections
friendica [Wed, 23 May 2012 23:16:59 +0000 (16:16 -0700)]
slackr - better highlighting of current selections

12 years agoslackr - knock the sharp edges off the events calendar
friendica [Wed, 23 May 2012 22:55:09 +0000 (15:55 -0700)]
slackr - knock the sharp edges off the events calendar

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

12 years agorev update
friendica [Wed, 23 May 2012 22:46:04 +0000 (15:46 -0700)]
rev update