Brion Vibber
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
Zach Copley
89dc6dee01
Add PoCo namespace to optional ns output in Notice::asAtomEntry()
2010-02-22 17:56:43 -08:00
Zach Copley
cbf6ebae01
Merge branch 'rationalize-activity' into testing
...
* rationalize-activity:
Move ActivityObject and related stuff to core
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 17:12:33 -08:00
Zach Copley
6a711c6cdc
Move ActivityObject and related stuff to core
2010-02-22 17:10:50 -08:00
Brion Vibber
d410df0406
OStatus group delivery initial implementation.
...
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
it's relatively cheap and gives us a clean list of target
groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
- 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
are delivered to local group members
- messages that come in via PuSH and contain remote group targets
are delivered to local members of the remote group
Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
Evan Prodromou
891e002883
don't calculate replies for remote notices
2010-02-21 23:56:48 -05:00
Evan Prodromou
ab3db8c899
Combine code that finds mentions into one place and add hook points
...
Combined the code that finds mentions of other profiles into one place.
common_find_mentions() finds mentions and calls hooks to allow
supplemental syntax for mentions (like OStatus).
common_linkify_mentions() links mentions.
common_linkify_mention() links a mention.
Notice::saveReplies() now uses common_find_mentions() instead of
trying to parse everything again.
2010-02-21 16:20:30 -05:00
Evan Prodromou
e9d22138ef
permalink on a note represented by rel=alternate
2010-02-21 09:23:51 -05:00
Evan Prodromou
9498a16480
Notice::saveNew() accepts url and rendered options
2010-02-21 09:17:00 -05:00
Brion Vibber
9c2fe8492f
OStatus: send favorite/unfavorite notifications to remote authors
2010-02-20 15:56:36 -08:00
Evan Prodromou
3d665f82d1
add type='text/html' to alternate link in Notice Atom
2010-02-18 22:13:47 -05:00
Evan Prodromou
c2ba764535
always distribute to inbox of author immediately
2010-02-18 07:11:20 -05:00
Zach Copley
198c046c89
- Set the root of a new local conversation to a new conversation.id
...
- Output conversation URIs from conversation.uri
2010-02-17 01:12:13 -08:00
Zach Copley
c892726c80
Take remote profiles into account when looking up canonical profile URIs
2010-02-16 16:22:58 -08:00
Brion Vibber
d6f1df8b76
fix for Atom notice output: correct check against conversation & current id
2010-02-12 15:30:23 -08:00
Zach Copley
525358fa10
Fix retarded spelling mistake
2010-02-11 17:08:50 -08:00
Zach Copley
3beddffc39
ostatus:attention links in Notice Atom output
2010-02-11 16:29:27 -08:00
Zach Copley
e2c0f59414
Some upgrades to Atom output for OStatus
2010-02-11 13:56:05 -08:00
Brion Vibber
8449256817
OStatus partial support for group subscriptions:
...
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior
Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
2010-02-09 18:32:52 -08:00
Brion Vibber
384387c9b0
OStatus cleanup...
...
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
2010-02-08 14:58:12 -08:00
Evan Prodromou
dbeb388ade
clear cache for Profile::hasRepeated() at Notice::insert() time
2010-02-03 12:31:25 -05:00
Evan Prodromou
fec8066bf7
error clearing tags for profiles from memcached
2010-01-30 14:37:39 -05:00
Evan Prodromou
d13d73c563
Last-chance distribution if enqueueing fails
2010-01-28 16:53:37 -08:00
Brion Vibber
fbd52111e1
fix notice -- drop unused return value of variable that isn't initialized :) thx @ g0 for the catch
2010-01-27 19:58:33 -08:00
Brion Vibber
3abfb454a3
Adds an emergency switch so we can run inbox distribution at save time (bypassing 'distrib' queue)
...
Set $config['queue']['inboxes'] = false to do so
2010-01-27 18:39:17 -08:00
Evan Prodromou
e26a843caf
Offload inbox updates to a queue handler to speed up posting online
...
Moved much of the writing that happens when posting a notice to a new
queuehandler, distribqueuehandler. This updates tags, groups, replies
and inboxes at queue time (or at Web time, if queues are disabled).
To make this work well, I had to break up the monolithic
Notice::blowCaches() and make cache blowing happen closer to where
data is updated.
Squashed commit of the following:
commit 5257626c62750ac4ac1db0ce2b71410c5711cfa3
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 14:56:41 2010 -0500
slightly better handling of blowing tag memory cache
commit 8a22a3cdf6ec28685da129a0313e7b2a0837c9ef
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:42:56 2010 -0500
change 'distribute' to 'distrib' so not too long for dbqueue
commit 7a063315b0f7fad27cb6fbd2bdd74e253af83e4f
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:39:15 2010 -0500
change handle_notice() to handle() in distributqueuehandler
commit 1a39ccd28b9994137d7bfd21bb4f230546938e77
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 16:05:25 2010 -0500
error with queuemanager
commit e6b3bb93f305cfd2de71a6340b8aa6fb890049b7
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:11:34 2010 -0500
Blow memcache at different point rather than one big function for Notice class
commit 94d557cdc016187d1d0647ae1794cd94d6fb8ac8
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 00:48:44 2010 -0500
Blow memcache at different point rather than one big function for Notice class
commit 1c781dd08c88a35dafc5c01230b4872fd6b95182
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 20 08:54:18 2010 -0500
move broadcasting and distributing to new queuehandler
commit da3e46d26b84e4f028f34a13fd2ee373e4c1b954
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 20 08:53:12 2010 -0500
Move distribution of notices to new distribute queue handler
2010-01-25 18:08:21 -05:00
Brion Vibber
d35faa04c1
Fix for background recalculation of groups; needs to get Group objects not IDs; also don't list any groups for repeats to match saveGroups behavior
...
todo: merge calculation portion with saveGroups so they don't get out of sync
2010-01-15 13:06:21 -08:00
Evan Prodromou
d032fc038a
make sure whoGets() doesn't write anything
2010-01-13 12:37:01 -08:00
Evan Prodromou
43ff542189
Don't save reply info for repeats
2010-01-13 01:13:06 -08:00
Evan Prodromou
8bfa7fdeaf
repeats don't get posted to groups
2010-01-13 00:47:12 -08:00
Evan Prodromou
5397249e50
remove vestiges of Notice_inbox from cache clearing code in Notice
2010-01-13 00:45:12 -08:00
Evan Prodromou
3d579fc580
memoize Notice::whoGets()
2010-01-13 00:16:54 -08:00
Evan Prodromou
fb0d837ddc
remove transaction for Notice save; causes deadlocks
2010-01-12 23:41:33 -08:00
Evan Prodromou
96e51dad4b
whoGets() method for Notice
2010-01-09 13:55:54 -08:00
Evan Prodromou
f2a403589c
Use inbox instead of notice_inbox
2010-01-09 10:02:07 -08:00
Ciaran Gultnieks
deeaafe712
Fixes to bugs where non-local messages were being wrong put in the public timeline and public xmpp feed
2010-01-07 20:59:31 +00:00
Brion Vibber
8af7ba0226
Fix for overlong RT trimming: don't trim if textlimit is 0 (unlimited)
2010-01-05 16:16:25 -08:00
Brion Vibber
9215496902
Ticket 2135: trim overlong repeats with ellipsis rather than failing.
...
In web interface and retweet/repeat API we show the original untrimmed text, but some back-compat API messages will still show the trimmed 'RT' version.
This matches Twitter's behavior on overlong retweets, though we're outputting the RT version in more API results than they do.
2010-01-05 16:10:00 -08:00
Evan Prodromou
06b6a27d7d
cached id streams can be empty, compare against false
2010-01-04 10:03:57 -10:00
Evan Prodromou
90a2563a90
Merge branch 'master' into 0.9.x
...
Conflicts:
classes/Memcached_DataObject.php
2010-01-02 19:47:34 -10:00
Evan Prodromou
52fbd10162
incorrectly used empty() instead of isset() for a variable that could be 0
2010-01-02 08:36:47 -10:00
Evan Prodromou
05e2b4d92d
Merge branch 'master' into 0.9.x
2009-12-29 12:09:17 -08:00
Evan Prodromou
45c4078ca9
notices are immutable, use created date for updated
2009-12-28 17:51:04 -08:00
Evan Prodromou
ca6669538a
Move location-argument-handling code into a single function
...
Moved the important parts of the location-argument-handling stuff
to a single function. Handles defaults and overrides correctly, and
easy to use. Changed Web and API channels to use it.
2009-12-28 15:13:15 -08:00
Brion Vibber
0ca80f78fb
Add doc comments listing the array parameters for User::register() and Notice::saveNew()
2009-12-16 09:27:48 -05:00
Brion Vibber
00fb5feff8
Cleanup undefined variable notice: set a couple more null defaults for new params in Notice::saveNew().
...
Fixes this notice seen while using AJAX repeat button:
Notice: Undefined variable: uri in classes/Notice.php on line 243
2009-12-16 09:27:48 -05:00
Brion Vibber
e2e1843639
slight cleanup for a bit in Notice.php where a var was reused for different types, confusing tracking down a bug
2009-12-16 09:27:47 -05:00
Evan Prodromou
2a8eee0e0b
add friends_timeline with no repeats in it
2009-12-14 16:41:25 -05:00
Evan Prodromou
438a0d7f1c
remove obsoleted getStream, getStreamDirect, getCachedStream from Notice; use stream() instead
2009-12-12 16:58:39 -05:00
Evan Prodromou
1ec54d3433
add statuses/retweeted_to_me to API
2009-12-12 16:15:23 -05:00
Evan Prodromou
698b28c95c
clear repeat_of flag when a notice is deleted
2009-12-12 16:02:44 -05:00
Evan Prodromou
cfe67a9c01
add statuses/retweets_of_me to API
2009-12-12 16:00:27 -05:00
Evan Prodromou
138ce0cd05
add statuses/retweeted_by_me api action
2009-12-12 15:35:05 -05:00
Evan Prodromou
c622d14440
add statuses/retweets to API
2009-12-12 14:46:24 -05:00
Evan Prodromou
afc86a86d3
save repeats from the form
2009-12-11 11:51:09 -05:00
Evan Prodromou
60754fc6de
Merge branch '0.9.x' into forward
2009-12-11 11:38:08 -05:00
Evan Prodromou
79f81ad76d
change Notice::saveNew() to use named arguments for little-used options
2009-12-11 11:29:51 -05:00
Evan Prodromou
da30890988
add repeat_of column to notice class
2009-12-11 10:22:56 -05:00
Evan Prodromou
45408142e9
reorder notices when not using memcached
2009-12-08 21:02:54 -05:00
Evan Prodromou
72c82a2e29
Basic function to store forwards and redistribute
2009-12-08 16:30:33 -05:00
Brion Vibber
2b8a3e3511
Fix regression in group posting: bug introduced in commit 1319002e15
. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
2009-11-27 14:52:58 -08:00
Brion Vibber
e85e47b509
Log database errors when saving notice_inbox entries
2009-11-27 14:20:57 -08:00
Zach Copley
638df94f88
Need to check the Profile rather than the User.
2009-11-17 08:48:16 -08:00
Evan Prodromou
f1efb845e4
don't allow sandboxed users to post public notices
2009-11-16 19:22:22 +01:00
Evan Prodromou
d2145a5b7f
Move rights check to profile and add right for new notices
...
Added a right for new notices, realized that the hasRight() method
should be on the profile, and moved it.
Makes this a less atomic commit but that's the way it goes sometimes.
2009-11-16 19:03:59 +01:00
Evan Prodromou
cb64cfb44c
add geo output to statuses in json, xml, atom, rss in API
2009-11-10 16:15:05 -05:00
Brion Vibber
088081675f
Revert "Remove more contractions"
...
This reverts commit 5ab709b739
.
Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Siebrand Mazeland
b10f362ede
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-11-08 23:33:58 +01:00
Siebrand Mazeland
5ab709b739
Remove more contractions
...
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
fc5002015b
Revert "* [Cc]an't -> [Cc]annot"
...
This reverts commit 0ab17f382b
.
2009-11-08 23:28:51 +01:00
Siebrand Mazeland
0ab17f382b
* [Cc]an't -> [Cc]annot
...
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Evan Prodromou
1319002e15
don't distribute group notices to inboxes for users who've blocked the author
2009-11-07 12:22:00 -05:00
Craig Andrews
005f85b5ea
Removed reference to 'api' action which no longer exists since api refactor
2009-10-30 01:25:52 -04:00
Evan Prodromou
e9644f03de
get location from a Notice
2009-10-29 14:43:18 -04:00
Evan Prodromou
b73d6d18ba
Merge branch '0.9.x' into location
2009-10-28 17:24:53 -04:00
Evan Prodromou
2df1189465
save replies in the inbox
2009-10-28 15:33:10 -04:00
Evan Prodromou
7df082abb8
replace some boolean-evaluations with calls to empty()
2009-10-28 14:21:42 -04:00
Evan Prodromou
967de94665
update location while saving new profile
2009-10-23 11:47:00 -04:00
Evan Prodromou
2ed073f295
new data structures for location
2009-10-21 22:43:40 -04:00
Evan Prodromou
4f5badda94
remove inboxes option
2009-10-13 17:38:27 -04:00
Evan Prodromou
18f4a7eaea
reformat Notice.php
2009-10-03 20:34:40 -04:00
Brenda Wallace
bcdf31c639
added all them doxygens
2009-10-04 11:14:26 +13:00
Evan Prodromou
0a57d1ccee
change string return from Notice::saveNew to exceptions
2009-09-29 17:16:07 -04:00
Evan Prodromou
93b7e60115
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
2009-09-24 17:24:15 -04:00
Craig Andrews
a535ccdc4e
Merge remote branch 'laconica/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
lib/twitter.php
2009-09-02 16:42:15 -04:00
Evan Prodromou
55972f59f6
remove Notice::gc() for now
2009-08-29 11:59:54 -07:00
Brenda Wallace
06514aa001
fix for SQL error: ERROR: syntax error at or near ")" at character 45
...
http://laconi.ca/trac/ticket/1735
2009-08-28 20:05:19 +12:00
Brenda Wallace
e277c856d6
fix for SQL error: ERROR: syntax error at or near ")" at character 45
...
http://laconi.ca/trac/ticket/1735
2009-08-28 20:00:55 +12:00
Evan Prodromou
34ce75c71d
remove duplicate save of Notice and streamline attachment detection
2009-08-27 20:09:07 -07:00
Evan Prodromou
a08c76a434
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
...
Conflicts:
classes/laconica.ini
2009-08-27 14:52:32 -07:00
Evan Prodromou
5d09b6b3f0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
2009-08-27 11:16:45 -07:00
Craig Andrews
6d60d74093
Display linked oembed resources as enclosures if they are of non-html mime types
2009-08-26 15:40:51 -04:00
Evan Prodromou
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
Evan Prodromou
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
Evan Prodromou
4737563b95
a distributed -> the distributed
2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
Evan Prodromou
b2664e1ae2
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Evan Prodromou
d5825893c8
validation code in Notice correctly checks length of content
2009-08-21 08:12:57 -04:00
Evan Prodromou
4d05afae30
Notice class has methods to check content length
2009-08-21 08:05:13 -04:00
Evan Prodromou
d213a8cf90
update data classes for TEXT content in notice
2009-08-21 06:33:21 -04:00
Marcel van der Boom
418a5a95ab
Change the notice type defines all into class constants and adapt all files.
2009-08-20 13:11:22 -04:00
Evan Prodromou
a074cccb0e
save an archive of deleted notices
2009-08-04 06:05:04 -04:00
Evan Prodromou
18573632b4
New algorithm for reply_to saving
...
I changed the reply-to algorithm so that we only say a notice is in
reply to another notice if a) we receive that information from the Web
or API or b) it's in a "low bandwidth" (XMPP, SMS) channel, and begins
with "@nickname" or "T NICKNAME".
The goal is to avoid false-positives and make conversation trees more
accurate and useful.
2009-07-29 11:45:32 -04:00
Evan Prodromou
0dab5f5872
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-07-23 14:45:44 -07:00
Evan Prodromou
749d9bfbbf
Merge branch 'master' into 0.8.x
...
Conflicts:
scripts/twitterstatusfetcher.php
2009-07-23 14:45:21 -07:00
Evan Prodromou
5f7fb99447
change NOTICE_GATEWAY to Notice::GATEWAY so autoloading works
2009-07-23 14:22:22 -07:00
Brenda Wallace
d95f45f070
turn into canonical terms before checking for unique-ness of a tag in a notice
2009-07-20 14:18:48 +12:00
Brenda Wallace
711ade9835
look for full unicode when saving tags
2009-07-20 14:01:51 +12:00
CiaranG
1139f7cad5
Merge commit 'br3nda/0.8.x-pgfixes' into 0.8.x
2009-07-19 08:05:53 +01:00
Evan Prodromou
83cbf246a8
use a soft limit so there's not a whole bunch of deletes on every write
2009-07-16 00:26:51 -04:00
Evan Prodromou
da512ad8c2
gc inboxes on a regular basis
2009-07-16 00:19:34 -04:00
Brenda Wallace
788dd66dbe
add quotes around table named "user" when quote_identifiers is true
2009-07-15 20:23:52 +12:00
Brenda Wallace
403bb38bcd
used single quotes in SQL
2009-07-15 20:18:30 +12:00
Craig Andrews
593af9feb6
Moved the decision logic as to whether an attachment should be an enclosure to the File class
2009-07-14 13:33:40 -04:00
Toby Inkster
38784141d1
Copy isset($attachment->filename) fix from RSS 1.0 to RSS 2.0 and Atom 1.0 feeds.
2009-07-13 16:56:52 +01:00
Evan Prodromou
8b65883f9d
cache frequently-used subscriber, subscription, notice and fave count values
2009-07-09 17:28:38 -07:00
Craig Andrews
69574591d0
Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
...
http://laconi.ca/trac/ticket/1690
2009-07-09 13:18:57 -04:00
Evan Prodromou
cb019f7aad
don't send unused variable for streams
2009-07-04 01:43:35 -04:00
Evan Prodromou
e2f8b8d65d
no limit on conversation stream
2009-07-03 10:40:23 -04:00
Evan Prodromou
4e6cd42757
conversation code changes
2009-06-30 11:50:16 -04:00
Evan Prodromou
addfcc976a
remove debugging code from Notice.php
2009-06-27 07:02:36 -07:00
Evan Prodromou
bb04f68e93
boxcar notice inbox requests
2009-06-26 00:47:27 -07:00
Evan Prodromou
994768b821
break up big inbox queries into lots of small ones
2009-06-25 23:00:46 -07:00
Evan Prodromou
c96572c090
fix caching for conversations, again
2009-06-25 11:23:47 -07:00
Evan Prodromou
4d56bc6a0a
streamline the file action
2009-06-25 11:08:32 -07:00
Evan Prodromou
3ca9e85ce4
update conversations to use newer query format
2009-06-25 09:43:30 -07:00
Evan Prodromou
262f864555
don't try to load a null notice into the list
2009-06-25 02:57:16 -07:00
Evan Prodromou
79547d99cf
blow cache when new notice in conversation is saved
2009-06-25 02:11:34 -07:00
Zach Copley
31325f0995
Stop Twitter gateway notices from leaking via user faves pages
2009-06-23 13:51:23 -07:00
Evan Prodromou
aec6456c91
Update copyright dates in files modified in 2009
2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155
change Controlez-Vous to Control Yourself
2009-06-20 16:00:04 -07:00
Evan Prodromou
3f54840b51
Only show twitter msgs in your own inbox
2009-06-18 11:45:48 -07:00
Evan Prodromou
420e8994f8
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile
2009-06-17 15:05:24 -07:00
Evan Prodromou
07f5797f2f
Make the personal tag streams actually work
2009-06-17 15:04:57 -07:00
Robin Millette
fd6de17a4a
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 16:22:47 -04:00
Robin Millette
1505e3a4c3
Fixed recent attachment bug that required URLs to be posted twice to be taken into account.
2009-06-17 16:21:50 -04:00
Evan Prodromou
8384e7c7f6
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 08:18:33 -07:00
Evan Prodromou
90b2b3f9d1
names for Notice is_local states
2009-06-16 21:37:04 -07:00
Robin Millette
befbfc9c73
Moved url handling to its proper place, from newnotice to Notice.php
2009-06-16 23:10:17 -04:00
Evan Prodromou
1b6b00a6d0
Link and distribute notices tagged for a group alias
...
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
2009-06-14 23:43:47 -07:00
Evan Prodromou
e0bdaa787d
Merge branch '0.7.x' into 0.8.x
2009-06-14 11:27:22 -07:00
Evan Prodromou
ce6285d0fc
push length check to Notice class
2009-06-12 09:47:57 -07:00
Evan Prodromou
b4e649fe90
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-10 13:52:32 -07:00
Evan Prodromou
361a52a9c8
some changes based on code review with zach
2009-06-10 13:52:15 -07:00
Robin Millette
4699fa7936
Now correctly identifiying notices with uploaded content.
2009-06-10 15:24:25 -04:00
Robin Millette
ba6beaa310
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53
Uploaded content now displays in overlay (and removed var_dump crap)
2009-06-10 14:17:46 -04:00
Evan Prodromou
ed627bb4bd
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-09 21:48:56 -07:00
Robin Millette
27af3c67a2
Improve file upload and attachment interface.
2009-06-09 15:18:12 -04:00
Evan Prodromou
adfb79a9bb
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00