Michael Vogel
bcca817b9a
Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr.
2012-06-30 09:25:22 +02:00
Michael Vogel
65268d25e6
Merge remote branch 'upstream/master'
...
Conflicts:
include/items.php
2012-06-29 21:43:49 +02:00
Michael Vogel
52569e536e
Tests considering removing of the title
2012-06-29 21:40:54 +02:00
friendica
be658788de
maintain page position when hovering on pop-outs
2012-06-28 22:19:12 -07:00
friendica
7b63e5792a
more pager limits
2012-06-28 21:39:02 -07:00
friendica
43036bee98
wrong column name (- vs _)
2012-06-28 21:32:49 -07:00
friendica
0ecba60503
undefined fn
2012-06-28 21:15:43 -07:00
friendica
1830ecc9ba
remote_self feeds are not private
2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d
create third privacy state - public post but not searchable or publicly visible
2012-06-28 17:43:29 -07:00
friendica
43d3721fa9
css smiley class
2012-06-28 16:42:40 -07:00
friendica
d7f35c81db
Merge https://github.com/friendica/friendica into pull
2012-06-28 16:05:28 -07:00
friendica
de93c61e0d
remove titles in ostatus even when edited date differs from created date
2012-06-28 16:04:00 -07:00
Simon
3bd0975c07
Merge pull request #367 from simonlnu/master
...
fix item-delete-selected* css
2012-06-28 09:16:53 -07:00
Simon L'nu
ecf9ad9a08
fix item-delete-selected* css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-28 12:15:32 -04:00
Simon L'nu
4ae5589df7
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix logic for nested lists--should be OR, not AND
2012-06-28 12:12:43 -04:00
fermionic
26156e1dc4
Merge pull request #366 from fermionic/fix-big-monster-list-logic
...
fix logic for nested lists--should be OR, not AND
2012-06-27 20:24:18 -07:00
Zach Prezkuta
cd9ce0ecb3
fix logic for nested lists--should be OR, not AND
2012-06-27 21:21:26 -06:00
Simon L'nu
4f488c7e3c
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.
2012-06-27 13:11:22 -04:00
Thomas Willingham
3968e71d4c
Friendicaland - couple of new 'countries'
2012-06-27 16:06:02 +01:00
friendica
04397865f9
Merge pull request #365 from ridcully/master
...
Direct-Message Api-Modified
2012-06-27 01:36:03 -07:00
friendica
eb3bbd9081
insidious little parsing bug
2012-06-26 22:32:07 -07:00
friendica
f995a11641
have no idea why the if/endif macro block was getting printed and not processed.
2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd
highlight js events-reminder on birthday events
2012-06-27 13:49:35 +10:00
Simon L'nu
5b35a02d26
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
2012-06-26 22:31:15 -04:00
friendica
b02c733967
service class restrict the email connector
2012-06-26 18:30:20 -07:00
Sebastian Egbers
587b081a38
moved api direct message formating to own function.
...
added same formating to direct reply message, when posting a new message.
2012-06-26 08:54:01 +02:00
Sebastian Egbers
0f0fb2e2f3
Merge branch 'master' of https://github.com/friendica/friendica
2012-06-26 08:33:41 +02:00
friendica
a4b407eb54
stray s
2012-06-25 22:01:32 -07:00
friendica
d32d0e2154
typos
2012-06-25 21:39:07 -07:00
friendica
78ede4744f
add event titles to discovered birthday events
2012-06-25 21:37:38 -07:00
friendica
0f0ffce1b6
change required doco
2012-06-25 21:27:34 -07:00
friendica
359a98cd22
change event behaviour so that title is required but description is not
2012-06-25 21:20:08 -07:00
friendica
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
friendica
53f0aee82d
Merge https://github.com/friendica/friendica into pull
2012-06-25 18:16:55 -07:00
friendica
f1991a5952
propagate remote deletes
2012-06-25 18:15:56 -07:00
fermionic
32f5d4e04a
Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling
...
Diaspora refactor and better disabling
2012-06-25 18:09:39 -07:00
Zach Prezkuta
28526dbf21
remove possibly unnecessary checks for likes or comments created by Diaspora users
2012-06-25 19:03:03 -06:00
Zach Prezkuta
9e8573507e
store signature info for remote users too
2012-06-25 19:03:03 -06:00
Zach Prezkuta
f495ba2bcb
was passing the wrong arguments to the signature storage function
2012-06-25 19:03:03 -06:00
Zach Prezkuta
5773241537
add some debug logging
2012-06-25 19:03:03 -06:00
Zach Prezkuta
c0c50ece0f
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb
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
2012-06-25 19:03:03 -06:00
friendica
f0b41709eb
improve remote delete forwarding
2012-06-25 17:45:33 -07:00
friendica
fad2679c7e
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
include/bbcode.php
2012-06-25 16:05:42 -07:00
friendica
b044cd922d
typos in bbcode, add service class restrictions to jot uploads
2012-06-25 16:03:46 -07:00
Simon
c291581e13
Merge pull request #363 from simonlnu/master
...
fix typo and syntax error in include/bbcode.php
2012-06-25 15:50:35 -07:00
Simon L'nu
f04647ca4b
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
2012-06-25 18:49:46 -04:00
Simon L'nu
939ebe16f8
fix typo and syntax error
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:49:36 -04:00
Simon
33b7cd32a6
Merge pull request #362 from simonlnu/master
...
fix margin of .wall-item-body
2012-06-25 15:43:02 -07:00
Simon L'nu
eb6bf7e7fa
fix margin of wall-item-body
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:42:18 -04:00
