Commit graph

6068 commits

Author SHA1 Message Date
fabrixxm
fcf8f301e5 Merge pull request #327 from fabrixxm/master
events: fix select events query
2012-06-07 08:43:55 -07:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
fabrixxm
757037c3bf events: fix select events query
select events that starts before display start date and/or ends
after display end date.
2012-06-07 08:28:10 -04:00
friendica
6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
friendica
d2e86bdabc Merge https://github.com/friendica/friendica into pull 2012-06-06 22:29:35 -07:00
friendica
3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
zzottel
6158fcf7be Merge pull request #326 from zzottel/master
German translations
2012-06-06 16:45:57 -07:00
zottel
6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
zottel
3b5b216cad Merge remote branch 'upstream/master' 2012-06-07 01:07:33 +02:00
friendica
dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
zottel
2a83ebf77f Merge remote branch 'upstream/master' 2012-06-06 08:08:09 +02:00
friendica
6c3ab225f7 set minchars to 2 for PM lookups too 2012-06-05 20:49:56 -07:00
friendica
6f41594634 set minchars to 2 for contacts search 2012-06-05 20:47:26 -07:00
friendica
49732114d7 contacts search autocomplete 2012-06-05 20:33:11 -07:00
friendica
5389efffa9 add email probe logging, limit typo check to main addon files and skip additional support files 2012-06-05 19:28:04 -07:00
friendica
ae08d2c49b Merge https://github.com/friendica/friendica into pull 2012-06-05 17:59:49 -07:00
friendica
7cc7a14380 rev update 2012-06-05 17:59:12 -07:00
friendica
d873ceb719 Merge pull request #325 from annando/master
API: Repeating items only when there is content
2012-06-05 17:58:56 -07:00
Simon L'nu
5bb4a5912b 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:
2012-06-05 12:46:42 -04:00
Tobias Diekershoff
c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00
zottel
ef6446288b Merge remote branch 'upstream/master' 2012-06-05 08:20:41 +02:00
friendica
fe1dc1bf98 named anchors on display page 2012-06-04 04:28:20 -07:00
Tobias Diekershoff
b13c6ea9ad quattro: added editor buttons to comments 2012-06-04 11:49:16 +02:00
Michael Vogel
0353410cd4 Merge remote branch 'upstream/master' 2012-06-04 08:09:15 +02:00
Michael Vogel
5de91c2a7c API: Only repeat items if there is a content 2012-06-04 08:08:45 +02:00
Tobias Diekershoff
ca105f1c66 quattro: cleanup the less file 2012-06-04 07:17:23 +02:00
Simon
4d9ab1d775 Merge pull request #324 from simonlnu/master
really odd error fixed in the mini photo-menu
2012-06-03 15:11:13 -07:00
Simon L'nu
34f210bc2d fix mini photo-menu bug
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-03 18:10:04 -04:00
Simon L'nu
8d4c77fc43 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:
2012-06-03 18:03:20 -04:00
friendica
9f4b897261 Merge https://github.com/friendica/friendica into pull 2012-06-03 14:48:28 -07:00
friendica
0b657aa235 rev update 2012-06-03 14:47:53 -07:00
friendica
a66baf2918 Merge pull request #323 from fermionic/add-relayable-retraction-support-for-diaspora
Add relayable retraction support for diaspora
2012-06-03 14:47:04 -07:00
Zach Prezkuta
2a01ae8149 database updates 2012-06-03 14:53:30 -06:00
Zach Prezkuta
9920fb39e5 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.
2012-06-03 14:53:30 -06:00
Zach Prezkuta
06263f72a8 cleanup and logging 2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d 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
2012-06-03 14:53:30 -06:00
Zach Prezkuta
b000088ded prepare to implement database update 2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Zach Prezkuta
1fe1ac022f Support relayable_retractions that are relayed to us by the top-level post owner 2012-06-03 14:53:29 -06:00
Tobias Diekershoff
959b264c44 quattro: admin panel styling and 1st buttons for addon/theme overview 2012-06-03 22:32:42 +02:00
Tobias Diekershoff
2741ce67f8 privacy settings: make submit button translateable 2012-06-03 17:38:05 +02:00
Tobias Diekershoff
283524d990 DE: update to the strings 2012-06-03 17:33:28 +02:00
Tobias Diekershoff
6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
zottel
70c4ab6875 Merge remote branch 'upstream/master' 2012-06-03 14:21:51 +02:00
Simon L'nu
598a2563e8 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:
2012-06-03 04:59:07 -04:00
friendica
daa4f5213f zrl's when visiting public photos at the source site 2012-06-03 01:53:11 -07:00
friendica
97576e3e33 doco 2012-06-02 23:22:02 -07:00
friendica
ee42c3be94 cleanup 2012-06-02 23:17:49 -07:00