]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoconvert ent_quotes for jquery calendar title/summary
friendica [Sat, 30 Jun 2012 03:11:36 +0000 (20:11 -0700)]
convert ent_quotes for jquery calendar title/summary

12 years agomaintain page position when hovering on pop-outs
friendica [Fri, 29 Jun 2012 05:19:12 +0000 (22:19 -0700)]
maintain page position when hovering on pop-outs

12 years agomore pager limits
friendica [Fri, 29 Jun 2012 04:39:02 +0000 (21:39 -0700)]
more pager limits

12 years agowrong column name (- vs _)
friendica [Fri, 29 Jun 2012 04:32:49 +0000 (21:32 -0700)]
wrong column name (- vs _)

12 years agoundefined fn
friendica [Fri, 29 Jun 2012 04:15:43 +0000 (21:15 -0700)]
undefined fn

12 years agoremote_self feeds are not private
friendica [Fri, 29 Jun 2012 01:52:49 +0000 (18:52 -0700)]
remote_self feeds are not private

12 years agocreate third privacy state - public post but not searchable or publicly visible
friendica [Fri, 29 Jun 2012 00:43:29 +0000 (17:43 -0700)]
create third privacy state - public post but not searchable or publicly visible

12 years agocss smiley class
friendica [Thu, 28 Jun 2012 23:42:40 +0000 (16:42 -0700)]
css smiley class

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 28 Jun 2012 23:05:28 +0000 (16:05 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoremove titles in ostatus even when edited date differs from created date
friendica [Thu, 28 Jun 2012 23:04:00 +0000 (16:04 -0700)]
remove titles in ostatus even when edited date differs from created date

12 years agoMerge pull request #367 from simonlnu/master
Simon [Thu, 28 Jun 2012 16:16:53 +0000 (09:16 -0700)]
Merge pull request #367 from simonlnu/master

fix item-delete-selected* css

12 years agofix item-delete-selected* css
Simon L'nu [Thu, 28 Jun 2012 16:15:32 +0000 (12:15 -0400)]
fix item-delete-selected* css

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

* remotes/upstream/master:
  fix logic for nested lists--should be OR, not AND

12 years agoMerge pull request #366 from fermionic/fix-big-monster-list-logic
fermionic [Thu, 28 Jun 2012 03:24:18 +0000 (20:24 -0700)]
Merge pull request #366 from fermionic/fix-big-monster-list-logic

fix logic for nested lists--should be OR, not AND

12 years agofix logic for nested lists--should be OR, not AND
Zach Prezkuta [Thu, 28 Jun 2012 03:21:26 +0000 (21:21 -0600)]
fix logic for nested lists--should be OR, not AND

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 27 Jun 2012 17:11:22 +0000 (13:11 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Friendicaland - couple of new 'countries'
  insidious little parsing bug
  have no idea why the if/endif macro block was getting printed and not processed.
  highlight js events-reminder on birthday events
  moved api direct message formating to own function. added same formating to direct reply message, when posting a new message.
  fixed direct message reply in api call.
  modified api message reply to set title to conversion title, when replying.
  add reliable way to get server version
  make it selectable
  I want HTML code!
  new param getUserObjects to avoid retransmitting the whole user info objects
  bugfix
  changes on api_direct_messages_box to allow to retrieve conversations and all messages
  modified direct_messages
  added replyto and subject to direct messages.
  modified conversion to use x function for parameter checking.

12 years agoFriendicaland - couple of new 'countries'
Thomas Willingham [Wed, 27 Jun 2012 15:06:02 +0000 (16:06 +0100)]
Friendicaland - couple of new 'countries'

12 years agoMerge pull request #365 from ridcully/master
friendica [Wed, 27 Jun 2012 08:36:03 +0000 (01:36 -0700)]
Merge pull request #365 from ridcully/master

Direct-Message Api-Modified

12 years agoinsidious little parsing bug
friendica [Wed, 27 Jun 2012 05:32:07 +0000 (22:32 -0700)]
insidious little parsing bug

12 years agohave no idea why the if/endif macro block was getting printed and not processed.
friendica [Wed, 27 Jun 2012 04:35:03 +0000 (21:35 -0700)]
have no idea why the if/endif macro block was getting printed and not processed.

12 years agohighlight js events-reminder on birthday events
friendica [Wed, 27 Jun 2012 03:49:35 +0000 (13:49 +1000)]
highlight js events-reminder on birthday events

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 27 Jun 2012 02:31:15 +0000 (22:31 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  service class restrict the email connector
  stray s
  typos
  add event titles to discovered birthday events
  change required doco
  change event behaviour so that title is required but description is not
  event summary/title
  propagate remote deletes
  remove possibly unnecessary checks for likes or comments created by Diaspora users
  store signature info for remote users too
  was passing the wrong arguments to the signature storage function
  add some debug logging
  revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
  Clean up the Diaspora connectivity:
  improve remote delete forwarding
  typos in bbcode, add service class restrictions to jot uploads
  rev update

12 years agoservice class restrict the email connector
friendica [Wed, 27 Jun 2012 01:30:20 +0000 (18:30 -0700)]
service class restrict the email connector

12 years agomoved api direct message formating to own function.
Sebastian Egbers [Tue, 26 Jun 2012 06:54:01 +0000 (08:54 +0200)]
moved api direct message formating to own function.
added same formating to direct reply message, when posting a new message.

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Sebastian Egbers [Tue, 26 Jun 2012 06:33:41 +0000 (08:33 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agostray s
friendica [Tue, 26 Jun 2012 05:01:32 +0000 (22:01 -0700)]
stray s

12 years agotypos
friendica [Tue, 26 Jun 2012 04:39:07 +0000 (21:39 -0700)]
typos

12 years agoadd event titles to discovered birthday events
friendica [Tue, 26 Jun 2012 04:37:38 +0000 (21:37 -0700)]
add event titles to discovered birthday events

12 years agochange required doco
friendica [Tue, 26 Jun 2012 04:27:34 +0000 (21:27 -0700)]
change required doco

12 years agochange event behaviour so that title is required but description is not
friendica [Tue, 26 Jun 2012 04:20:08 +0000 (21:20 -0700)]
change event behaviour so that title is required but description is not

12 years agoevent summary/title
friendica [Tue, 26 Jun 2012 03:55:27 +0000 (20:55 -0700)]
event summary/title

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 26 Jun 2012 01:16:55 +0000 (18:16 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agopropagate remote deletes
friendica [Tue, 26 Jun 2012 01:15:56 +0000 (18:15 -0700)]
propagate remote deletes

12 years agoMerge pull request #364 from fermionic/diaspora-refactor-and-better-disabling
fermionic [Tue, 26 Jun 2012 01:09:39 +0000 (18:09 -0700)]
Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling

Diaspora refactor and better disabling

12 years agoremove possibly unnecessary checks for likes or comments created by Diaspora users
Zach Prezkuta [Sat, 23 Jun 2012 18:40:53 +0000 (12:40 -0600)]
remove possibly unnecessary checks for likes or comments created by Diaspora users

12 years agostore signature info for remote users too
Zach Prezkuta [Sat, 23 Jun 2012 18:09:01 +0000 (12:09 -0600)]
store signature info for remote users too

12 years agowas passing the wrong arguments to the signature storage function
Zach Prezkuta [Sat, 16 Jun 2012 17:29:56 +0000 (11:29 -0600)]
was passing the wrong arguments to the signature storage function

12 years agoadd some debug logging
Zach Prezkuta [Wed, 13 Jun 2012 01:05:01 +0000 (19:05 -0600)]
add some debug logging

12 years agorevert extra Diaspora disabling changes to try to eliminate Mustard double-posting
Zach Prezkuta [Wed, 13 Jun 2012 00:38:24 +0000 (18:38 -0600)]
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting

12 years agoClean up the Diaspora connectivity:
Zach Prezkuta [Sun, 10 Jun 2012 00:39:21 +0000 (18:39 -0600)]
Clean up the Diaspora connectivity:

- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled

12 years agoimprove remote delete forwarding
friendica [Tue, 26 Jun 2012 00:45:33 +0000 (17:45 -0700)]
improve remote delete forwarding

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 25 Jun 2012 23:05:42 +0000 (16:05 -0700)]
Merge https://github.com/friendica/friendica into pull

Conflicts:
include/bbcode.php

12 years agotypos in bbcode, add service class restrictions to jot uploads
friendica [Mon, 25 Jun 2012 23:03:46 +0000 (16:03 -0700)]
typos in bbcode, add service class restrictions to jot uploads

12 years agoMerge pull request #363 from simonlnu/master
Simon [Mon, 25 Jun 2012 22:50:35 +0000 (15:50 -0700)]
Merge pull request #363 from simonlnu/master

fix typo and syntax error in include/bbcode.php

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 25 Jun 2012 22:49:46 +0000 (18:49 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

12 years agofix typo and syntax error
Simon L'nu [Mon, 25 Jun 2012 22:49:36 +0000 (18:49 -0400)]
fix typo and syntax error

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #362 from simonlnu/master
Simon [Mon, 25 Jun 2012 22:43:02 +0000 (15:43 -0700)]
Merge pull request #362 from simonlnu/master

fix margin of .wall-item-body

12 years agofix margin of wall-item-body
Simon L'nu [Mon, 25 Jun 2012 22:42:18 +0000 (18:42 -0400)]
fix margin of wall-item-body

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 25 Jun 2012 22:34:57 +0000 (15:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Mon, 25 Jun 2012 22:34:23 +0000 (15:34 -0700)]
rev update

12 years agoMerge pull request #361 from simonlnu/master
Simon [Mon, 25 Jun 2012 21:25:33 +0000 (14:25 -0700)]
Merge pull request #361 from simonlnu/master

cleaned up the css a bit

12 years agoMerge pull request #360 from fermionic/more-nested-lists
friendica [Mon, 25 Jun 2012 21:20:16 +0000 (14:20 -0700)]
Merge pull request #360 from fermionic/more-nested-lists

allow nested [ol] and [ul] lists too

12 years agoMerge pull request #359 from fermionic/mustard-prevent-comment-doubles
friendica [Mon, 25 Jun 2012 21:19:48 +0000 (14:19 -0700)]
Merge pull request #359 from fermionic/mustard-prevent-comment-doubles

fix check for parent of StatusNet API post

12 years agoMerge pull request #358 from rdc/master
friendica [Mon, 25 Jun 2012 21:17:23 +0000 (14:17 -0700)]
Merge pull request #358 from rdc/master

Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar

12 years agofix delete thingy, and minor clean up
Simon L'nu [Mon, 25 Jun 2012 21:17:06 +0000 (17:17 -0400)]
fix delete thingy, and minor clean up

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agofix check for parent of StatusNet API post
Zach Prezkuta [Sun, 17 Jun 2012 03:41:23 +0000 (21:41 -0600)]
fix check for parent of StatusNet API post

12 years agoallow nested [ol] and [ul] lists too
Zach Prezkuta [Sun, 24 Jun 2012 15:37:31 +0000 (09:37 -0600)]
allow nested [ol] and [ul] lists too

12 years agofixed direct message reply in api call.
Sebastian Egbers [Mon, 25 Jun 2012 14:25:34 +0000 (16:25 +0200)]
fixed direct message reply in api call.

12 years agomodified api message reply to set title to conversion title, when replying.
Sebastian Egbers [Mon, 25 Jun 2012 13:53:56 +0000 (15:53 +0200)]
modified api message reply to set title to conversion title, when replying.

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Sebastian Egbers [Mon, 25 Jun 2012 11:59:39 +0000 (13:59 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoAdded App::get_cached_avatar_image usage for displaying "Last users"
Zvi ben Yaakov (a.k.a rdc) [Mon, 25 Jun 2012 11:01:16 +0000 (14:01 +0300)]
Added App::get_cached_avatar_image usage for displaying "Last users"
avatar thumbs in right sidebar

12 years agoMerge git://github.com/friendica/friendica
Zvi ben Yaakov (a.k.a rdc) [Mon, 25 Jun 2012 10:59:53 +0000 (13:59 +0300)]
Merge git://github.com/friendica/friendica

12 years agomore service class functionality
friendica [Mon, 25 Jun 2012 10:25:06 +0000 (03:25 -0700)]
more service class functionality

12 years agoservice limits for photo uploads
friendica [Mon, 25 Jun 2012 08:37:44 +0000 (01:37 -0700)]
service limits for photo uploads

12 years agoimplement "follow" service limits
friendica [Mon, 25 Jun 2012 05:23:17 +0000 (22:23 -0700)]
implement "follow" service limits

12 years agoadd like/dislike to profiles
friendica [Mon, 25 Jun 2012 04:16:55 +0000 (21:16 -0700)]
add like/dislike to profiles

12 years agosidebar photo album list not visible to anybody if user['hidewall'] set
friendica [Sun, 24 Jun 2012 23:51:39 +0000 (16:51 -0700)]
sidebar photo album list not visible to anybody if user['hidewall'] set

12 years agoservice class basics
friendica [Sun, 24 Jun 2012 07:56:27 +0000 (00:56 -0700)]
service class basics

12 years agoMerge pull request #357 from fermionic/fix-relayable-signature-handle
fermionic [Sun, 24 Jun 2012 04:29:52 +0000 (21:29 -0700)]
Merge pull request #357 from fermionic/fix-relayable-signature-handle

ok now I'm just making silly mistakes--take out premature function locki...

12 years agook now I'm just making silly mistakes--take out premature function locking code
Zach Prezkuta [Sun, 24 Jun 2012 04:28:28 +0000 (22:28 -0600)]
ok now I'm just making silly mistakes--take out premature function locking code

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 24 Jun 2012 04:11:41 +0000 (21:11 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agosort out some "like" issues
friendica [Sun, 24 Jun 2012 04:11:18 +0000 (21:11 -0700)]
sort out some "like" issues

12 years agoMerge pull request #356 from fermionic/fix-relayable-signature-handle
fermionic [Sun, 24 Jun 2012 04:08:43 +0000 (21:08 -0700)]
Merge pull request #356 from fermionic/fix-relayable-signature-handle

use author handle instead of sender handle

12 years agoMerge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora
fermionic [Sun, 24 Jun 2012 04:08:19 +0000 (21:08 -0700)]
Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora

allow bare URLS to make it through to Diaspora

12 years agouse author handle instead of sender handle
Zach Prezkuta [Sun, 24 Jun 2012 04:04:20 +0000 (22:04 -0600)]
use author handle instead of sender handle

12 years agoallow bare URLS to make it through to Diaspora
Zach Prezkuta [Sun, 24 Jun 2012 04:02:08 +0000 (22:02 -0600)]
allow bare URLS to make it through to Diaspora

12 years agoMerge pull request #354 from fermionic/always-terminate-bbcode-list-elements
fermionic [Sun, 24 Jun 2012 02:08:32 +0000 (19:08 -0700)]
Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements

Fix Diaspora list formatting

12 years agosmall optimization
Zach Prezkuta [Sun, 24 Jun 2012 02:01:29 +0000 (20:01 -0600)]
small optimization

12 years agofix BB-to-Diaspora list formatting
Zach Prezkuta [Sun, 24 Jun 2012 01:57:59 +0000 (19:57 -0600)]
fix BB-to-Diaspora list formatting

12 years agoMerge remote-tracking branch 'sebastian/master'
Max Weller [Sat, 23 Jun 2012 20:59:03 +0000 (22:59 +0200)]
Merge remote-tracking branch 'sebastian/master'

12 years agoadd reliable way to get server version
Max Weller [Sat, 23 Jun 2012 20:52:50 +0000 (22:52 +0200)]
add reliable way to get server version

12 years agoMerge git://github.com/friendica/friendica
Zvi ben Yaakov (a.k.a rdc) [Sat, 23 Jun 2012 20:51:08 +0000 (23:51 +0300)]
Merge git://github.com/friendica/friendica

12 years agomake it selectable
Max Weller [Sat, 23 Jun 2012 20:39:11 +0000 (22:39 +0200)]
make it selectable

12 years agoI want HTML code!
Max Weller [Sat, 23 Jun 2012 20:35:43 +0000 (22:35 +0200)]
I want HTML code!

12 years agonew param getUserObjects to avoid retransmitting the whole user info objects
Max Weller [Sat, 23 Jun 2012 17:38:15 +0000 (19:38 +0200)]
new param getUserObjects to avoid retransmitting the whole user info objects

12 years agoMerge pull request #352 from fermionic/diaspora-display-scaled-down-image
Simon [Sat, 23 Jun 2012 17:37:59 +0000 (10:37 -0700)]
Merge pull request #352 from fermionic/diaspora-display-scaled-down-image

allow linking to Diaspora's scaled-down images

12 years agoMerge pull request #353 from simonlnu/master
Simon [Sat, 23 Jun 2012 17:36:52 +0000 (10:36 -0700)]
Merge pull request #353 from simonlnu/master

jquery update; templates

12 years agobugfix
Max Weller [Sat, 23 Jun 2012 17:35:01 +0000 (19:35 +0200)]
bugfix

12 years agoupdate jquery to 1.7.2; fix some dispy templates to be more in sync with view/
Simon L'nu [Sat, 23 Jun 2012 17:33:58 +0000 (13:33 -0400)]
update jquery to 1.7.2; fix some dispy templates to be more in sync with view/

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agochanges on api_direct_messages_box to allow to retrieve conversations and all messages
Max Weller [Sat, 23 Jun 2012 17:29:58 +0000 (19:29 +0200)]
changes on api_direct_messages_box to allow to retrieve conversations and all messages

12 years agomodified direct_messages
Max Weller [Sat, 23 Jun 2012 17:21:48 +0000 (19:21 +0200)]
modified direct_messages

12 years agoallow linking to Diaspora's scaled-down images
Zach Prezkuta [Wed, 20 Jun 2012 02:45:24 +0000 (20:45 -0600)]
allow linking to Diaspora's scaled-down images

12 years agothis is going to take some more debug before it can be roller out
friendica [Sat, 23 Jun 2012 14:43:56 +0000 (07:43 -0700)]
this is going to take some more debug before it can be roller out

12 years agodebugging
friendica [Sat, 23 Jun 2012 14:26:45 +0000 (07:26 -0700)]
debugging

12 years agocokmment likes not propagating
friendica [Sat, 23 Jun 2012 13:41:37 +0000 (06:41 -0700)]
cokmment likes not propagating

12 years agomake feeds work with comment likes/dislikes
friendica [Sat, 23 Jun 2012 13:13:11 +0000 (06:13 -0700)]
make feeds work with comment likes/dislikes

12 years agotypo
friendica [Sat, 23 Jun 2012 13:04:56 +0000 (06:04 -0700)]
typo

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 23 Jun 2012 12:47:31 +0000 (05:47 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agolike comments
friendica [Sat, 23 Jun 2012 12:46:15 +0000 (05:46 -0700)]
like comments

12 years agoMerge pull request #351 from annando/master
friendica [Sat, 23 Jun 2012 12:11:31 +0000 (05:11 -0700)]
Merge pull request #351 from annando/master

Massive change in bbcode2markdown