Sarven Capadisli
579f09417b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-12 22:14:07 +00:00
Evan Prodromou
3b5fd8fb6b
Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
...
This reverts commit 9f035e2847
.
It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae
Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
...
This reverts commit 616bdd43a9
.
Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Evan Prodromou
5c31dcb430
Merge branch 'devevan/master' into 0.7.x
2009-02-12 15:51:34 -05:00
Evan Prodromou
e686ef042b
Make ID of SMS Carrier not autoincrement
...
Since we're doing fixed IDs for SMS Carrier, we change the definition
so it's not auto increment.
2009-02-12 14:16:58 -05:00
Evan Prodromou
654a91cc1c
Add fixed IDs to SMS carrier list
...
Changed the SMS carrier list to use a fixed ID number for each carrier
distributed with the software. We claim IDs > 100000; admins can use
IDs < 100000 for local values. I'd be pretty surprised if there were
more than 100K wireless carriers in the world, but hey.
2009-02-12 14:03:15 -05:00
Evan Prodromou
5118643695
move carrier.sql to sms_carrier.sql
2009-02-12 13:58:05 -05:00
Sarven Capadisli
033503dc84
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-12 18:30:10 +00:00
Evan Prodromou
ab8d27b8d1
don't over specialize URLs
2009-02-12 09:22:45 -05:00
Evan Prodromou
eaae456222
Add XMLStringer for building XML strings
...
We had a bunch of
2009-02-12 08:38:43 -05:00
Evan Prodromou
99773e3b5e
wrap multiline regexp in quotes so it doesn't mess up my editor's indenting
2009-02-12 07:58:36 -05:00
Evan Prodromou
a845d06c77
ignore no-data error, since we use it all the time
2009-02-12 06:49:34 -05:00
Zach Copley
616bdd43a9
Just discovered the PEAR_Error handling function in index.php. Duh.
...
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847
Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
...
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Sarven Capadisli
3c8c0572ef
Ticket 1172. Capitalizing first character of each word to uppercase
...
instead of putting all characters to uppercase.
2009-02-11 23:03:12 +00:00
Evan Prodromou
c6070200fe
Merge branch 'master' of git://gitorious.org/laconica/mainline
2009-02-11 20:53:11 +00:00
Evan Prodromou
9d07032334
fix command classes
2009-02-11 15:48:30 -05:00
Evan Prodromou
03fff15a51
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 15:47:47 -05:00
Evan Prodromou
5127396325
Move Commands stuff out of classes
...
The classes/ subdir is primarily for the DB_DataObject classes. Stuff
in there can get stomped by various generation scripts.
I've moved the lurkers there -- related to command-handling -- to
lib/. Since auto-loading works fine with lib/, there shouldn't be much
of a visible change here.
2009-02-11 15:46:29 -05:00
Evan Prodromou
1d5296e596
change htmloutputter to use exception instead of common_user_error
2009-02-11 15:39:49 -05:00
Sarven Capadisli
87f243917d
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 19:56:59 +00:00
Sarven Capadisli
21f6c91161
Minor correction: pikiw -> piwik
2009-02-11 19:56:17 +00:00
Evan Prodromou
ab37f84b5a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 14:46:47 -05:00
Evan Prodromou
b5cc7e4aab
Handle DB_DataObject errors better
...
We try to handle DB_DataObject errors a little bit better. Previously,
they just spit out a cryptic string to the browser with a suggestion
to turn on debugging (not a good idea!). So, we catch the error, write
the full error message to the log, and then tell users that the can
contact the admins if they need to.
2009-02-11 14:45:06 -05:00
Sarven Capadisli
012288bdf6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 16:53:01 +00:00
Sarven Capadisli
fc293545be
Minor. Changed from @class location to label
2009-02-11 16:50:07 +00:00
Evan Prodromou
22b10399aa
Unify feeds definition in actions
...
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.
I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.
I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Evan Prodromou
ad65c447d5
fix Atom link, add Atom and RSS 2.0 to <head>
2009-02-11 10:35:15 -05:00
Evan Prodromou
27e23f2dd3
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-11 10:11:26 -05:00
Evan Prodromou
26b0bc3aab
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 09:54:23 -05:00
Evan Prodromou
880d0b477b
Merge branch 'urlroute' into 0.7.x
2009-02-11 09:53:54 -05:00
Evan Prodromou
c640b747f7
add related link to Atom for feeds for some downstream users
2009-02-11 08:35:09 -05:00
Evan Prodromou
d345c746b9
add related link to Atom for feeds for some downstream users
2009-02-11 08:34:21 -05:00
Evan Prodromou
bba1dbdb40
Use a router singleton
2009-02-11 00:45:11 -05:00
Evan Prodromou
fbecbcb693
Build urls using Net_URL_Mapper, too
2009-02-10 22:49:25 -05:00
Evan Prodromou
1a7337f2fd
Moved /doc/ to /doc-src/
...
Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.
2009-02-10 22:33:57 -05:00
Evan Prodromou
7b9e69eb89
integrate URL routing into core code
2009-02-10 22:32:38 -05:00
Sean Murphy
646fdea1bf
Fixed 1174: schemeless URL auto-linking bug
2009-02-10 17:42:58 -05:00
Robin Millette
7763f804ca
trac #233 Explicitely show we have an rss feed for notice searches.
2009-02-10 22:04:47 +00:00
Evan Prodromou
b45ea01dab
Required Net URL needed for Net URL Mapper
2009-02-10 16:19:45 -05:00
Evan Prodromou
e21f2cf29e
Move Mapper to correct spot in the hierarchy
2009-02-10 15:55:37 -05:00
Evan Prodromou
3f859026e6
Add Net_URL_Mapper to extlib
2009-02-10 15:54:13 -05:00
Sean Murphy
d8ed013612
Merge commit 'upstream/0.7.x' into 0.7.x
2009-02-09 20:18:27 -05:00
Sean Murphy
55fcc150fe
Fixed #1025 : Delete avatar option.
2009-02-09 20:17:56 -05:00
Sean Murphy
cf29ef2bc4
Fixed remaining substr_replace with multibyte equivalent.
2009-02-09 19:15:30 -05:00
Evan Prodromou
80429ca70c
Fixed remote subscribe avatar problems
...
Had some Avatar file-copying issues; seem to be fixed.
2009-02-09 18:18:28 -05:00
Evan Prodromou
47a5d2b7f0
Fixed remote subscribe avatar problems
...
Had some Avatar file-copying issues; seem to be fixed.
2009-02-09 23:13:11 +00:00
Robin Millette
0d58652487
trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown.
2009-02-09 17:40:01 -05:00
Sean Murphy
bdd9f6ce1d
Merge commit 'upstream/0.7.x' into 0.7.x
2009-02-09 17:29:39 -05:00
Sean Murphy
f6705f06c0
Fixed #1170 : Auto-linking bug when URL cotains special chars.
2009-02-09 17:29:27 -05:00