]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge pull request #326 from zzottel/master
zzottel [Wed, 6 Jun 2012 23:45:57 +0000 (16:45 -0700)]
Merge pull request #326 from zzottel/master

German translations

12 years agoA few corrections in German translations.
zottel [Wed, 6 Jun 2012 23:43:32 +0000 (01:43 +0200)]
A few corrections in German translations.

12 years agoMerge remote branch 'upstream/master'
zottel [Wed, 6 Jun 2012 23:07:33 +0000 (01:07 +0200)]
Merge remote branch 'upstream/master'

12 years agorev update
friendica [Wed, 6 Jun 2012 23:02:10 +0000 (16:02 -0700)]
rev update

12 years agoMerge remote branch 'upstream/master'
zottel [Wed, 6 Jun 2012 06:08:09 +0000 (08:08 +0200)]
Merge remote branch 'upstream/master'

12 years agoset minchars to 2 for PM lookups too
friendica [Wed, 6 Jun 2012 03:49:56 +0000 (20:49 -0700)]
set minchars to 2 for PM lookups too

12 years agoset minchars to 2 for contacts search
friendica [Wed, 6 Jun 2012 03:47:26 +0000 (20:47 -0700)]
set minchars to 2 for contacts search

12 years agocontacts search autocomplete
friendica [Wed, 6 Jun 2012 03:33:11 +0000 (20:33 -0700)]
contacts search autocomplete

12 years agoadd email probe logging, limit typo check to main addon files and skip additional...
friendica [Wed, 6 Jun 2012 02:28:04 +0000 (19:28 -0700)]
add email probe logging, limit typo check to main addon files and skip additional support files

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 6 Jun 2012 00:59:49 +0000 (17:59 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Wed, 6 Jun 2012 00:59:12 +0000 (17:59 -0700)]
rev update

12 years agoMerge pull request #325 from annando/master
friendica [Wed, 6 Jun 2012 00:58:56 +0000 (17:58 -0700)]
Merge pull request #325 from annando/master

API: Repeating items only when there is content

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 5 Jun 2012 16:46:42 +0000 (12:46 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master:

12 years agoDE: update for the strings
Tobias Diekershoff [Tue, 5 Jun 2012 09:42:57 +0000 (11:42 +0200)]
DE: update for the strings

12 years agoMerge remote branch 'upstream/master'
zottel [Tue, 5 Jun 2012 06:20:41 +0000 (08:20 +0200)]
Merge remote branch 'upstream/master'

12 years agonamed anchors on display page
friendica [Mon, 4 Jun 2012 11:28:20 +0000 (04:28 -0700)]
named anchors on display page

12 years agoquattro: added editor buttons to comments
Tobias Diekershoff [Mon, 4 Jun 2012 09:49:16 +0000 (11:49 +0200)]
quattro: added editor buttons to comments

12 years agoMerge remote branch 'upstream/master'
Michael Vogel [Mon, 4 Jun 2012 06:09:15 +0000 (08:09 +0200)]
Merge remote branch 'upstream/master'

12 years agoAPI: Only repeat items if there is a content
Michael Vogel [Mon, 4 Jun 2012 06:08:45 +0000 (08:08 +0200)]
API: Only repeat items if there is a content

12 years agoquattro: cleanup the less file
Tobias Diekershoff [Mon, 4 Jun 2012 05:17:23 +0000 (07:17 +0200)]
quattro: cleanup the less file

12 years agoMerge pull request #324 from simonlnu/master
Simon [Sun, 3 Jun 2012 22:11:13 +0000 (15:11 -0700)]
Merge pull request #324 from simonlnu/master

really odd error fixed in the mini photo-menu

12 years agofix mini photo-menu bug
Simon L'nu [Sun, 3 Jun 2012 22:10:04 +0000 (18:10 -0400)]
fix mini photo-menu bug

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

* remotes/upstream/master:
  rev update
  database updates
  Debugged implementation of Diaspora relayable_retractions
  cleanup and logging
  first shot at getting like/unlike functions to work consistently
  Fix bugs in the retraction code
  prepare to implement database update
  Implement relaying of relayable_retractions
  Support relayable_retractions that are relayed to us by the top-level post owner
  quattro: admin panel styling and 1st buttons for addon/theme overview
  privacy settings: make submit button translateable
  DE: update to the strings
  prv messages: make submit translateable

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 3 Jun 2012 21:48:28 +0000 (14:48 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sun, 3 Jun 2012 21:47:53 +0000 (14:47 -0700)]
rev update

12 years agoMerge pull request #323 from fermionic/add-relayable-retraction-support-for-diaspora
friendica [Sun, 3 Jun 2012 21:47:04 +0000 (14:47 -0700)]
Merge pull request #323 from fermionic/add-relayable-retraction-support-for-diaspora

Add relayable retraction support for diaspora

12 years agodatabase updates
Zach Prezkuta [Sun, 3 Jun 2012 20:52:42 +0000 (14:52 -0600)]
database updates

12 years agoDebugged implementation of Diaspora relayable_retractions
Zach Prezkuta [Sun, 3 Jun 2012 20:32:17 +0000 (14:32 -0600)]
Debugged implementation of Diaspora relayable_retractions

Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

Friendica top-level post:
Diaspora comment deleted, disappears in Friendica
Friendica comment deleted, disappears in Diaspora
Diaspora like retracted, disappears in Friendica
Friendica like retracted, disappears in Diaspora

Diaspora top-level post:
Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.

12 years agocleanup and logging
Zach Prezkuta [Sun, 3 Jun 2012 17:12:16 +0000 (11:12 -0600)]
cleanup and logging

12 years agofirst shot at getting like/unlike functions to work consistently
Zach Prezkuta [Sun, 3 Jun 2012 05:56:42 +0000 (23:56 -0600)]
first shot at getting like/unlike functions to work consistently

12 years agoFix bugs in the retraction code
Zach Prezkuta [Sat, 2 Jun 2012 22:11:31 +0000 (16:11 -0600)]
Fix bugs in the retraction code

Currently, the following seems to be the functional status:
For a Diaspora top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete for top-level owner
Diaspora comments show up for non-owner
Diaspora comments sometimes don't delete for non-owner
-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
Diaspora likes show up
Diaspora non-owner can't unlike
-> Same as comments, seems to be Diaspora's fault

For a Friendica top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete

Friendica likes don't show up in Diaspora sometimes
Friendica doesn't even message Diaspora for unlikes (sometimes?)
Diaspora likes and unlikes work

12 years agoprepare to implement database update
Zach Prezkuta [Fri, 1 Jun 2012 15:07:51 +0000 (09:07 -0600)]
prepare to implement database update

12 years agoImplement relaying of relayable_retractions
Zach Prezkuta [Fri, 1 Jun 2012 01:40:12 +0000 (19:40 -0600)]
Implement relaying of relayable_retractions

Also: some whitespace cleanup, fix Diaspora parent DB query

12 years agoSupport relayable_retractions that are relayed to us by the top-level post owner
Zach Prezkuta [Sat, 26 May 2012 00:26:09 +0000 (18:26 -0600)]
Support relayable_retractions that are relayed to us by the top-level post owner

12 years agoquattro: admin panel styling and 1st buttons for addon/theme overview
Tobias Diekershoff [Sun, 3 Jun 2012 20:32:42 +0000 (22:32 +0200)]
quattro: admin panel styling and 1st buttons for addon/theme overview

12 years agoprivacy settings: make submit button translateable
Tobias Diekershoff [Sun, 3 Jun 2012 15:38:05 +0000 (17:38 +0200)]
privacy settings: make submit button translateable

12 years agoDE: update to the strings
Tobias Diekershoff [Sun, 3 Jun 2012 15:33:28 +0000 (17:33 +0200)]
DE: update to the strings

12 years agoprv messages: make submit translateable
Tobias Diekershoff [Sun, 3 Jun 2012 15:16:29 +0000 (17:16 +0200)]
prv messages: make submit translateable

12 years agoMerge remote branch 'upstream/master'
zottel [Sun, 3 Jun 2012 12:21:51 +0000 (14:21 +0200)]
Merge remote branch 'upstream/master'

12 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:

12 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

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

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

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

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

12 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

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

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

12 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".

12 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.

12 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:

12 years agoMerge remote branch 'upstream/master'
zottel [Sat, 2 Jun 2012 00:37:20 +0000 (02:37 +0200)]
Merge remote branch 'upstream/master'

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

12 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.

12 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

12 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().

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

12 years agoMerge remote branch 'upstream/master'
zottel [Fri, 1 Jun 2012 06:31:38 +0000 (08:31 +0200)]
Merge remote branch 'upstream/master'

12 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:

12 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

12 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`

12 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`

12 years agoMerge remote branch 'upstream/master'
zottel [Thu, 31 May 2012 06:43:14 +0000 (08:43 +0200)]
Merge remote branch 'upstream/master'

12 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

12 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?

12 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

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

12 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

12 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

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

12 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.

12 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.

12 years agoMerge remote branch 'upstream/master'
zottel [Wed, 30 May 2012 09:08:02 +0000 (11:08 +0200)]
Merge remote branch 'upstream/master'

12 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

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

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

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

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

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

12 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

12 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 %

12 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:

12 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

12 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

12 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

12 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>
12 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:

12 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

12 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

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

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

12 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

12 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.

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

12 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

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

12 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

12 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>
12 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