Evan Prodromou
1f5f5474f1
Merge branch '0.9.x' into adminpanel
2009-11-10 16:27:23 -05: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
Evan Prodromou
691beefd0f
Merge branch '0.9.x' into adminpanel
2009-11-08 21:41:43 -05:00
Evan Prodromou
76b0e6e6f4
Merge branch '0.9.x' into adminpanel
2009-11-08 21:23:09 -05: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
104a47e4a2
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-11-08 23:22:50 +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
111f6a775d
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b
Restructure theme.php to define a class Theme
...
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.
I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.
I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Brion Vibber
8d44b6a5a2
Fix bug 1962: deleteuser.php regression when OpenID plugin not enabled
...
The User_openid data object was explicitly listed as a related field to delete from in User::delete(); this class doesn't exist anymore by default since OpenID was broken out to a plugin.
Added UserDeleteRelated event for plugins to add related tables to delete from at user delete time.
2009-11-08 14:40:30 +01:00
Evan Prodromou
408510f527
pkeyGet() and save() methods for Config
2009-11-07 23:16:59 -05:00
Evan Prodromou
144f817109
add a break to switch in hasRight()
2009-11-07 23:15:59 -05:00
Evan Prodromou
38833af6f1
use upper-case constants for roles and rights in hasRight()
2009-11-07 19:16:54 -05:00
Evan Prodromou
eaec5b03f5
add constants for user roles
2009-11-07 19:16:33 -05: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
b9d40f723b
Added 'login' command that gives you a link that can be used to login to the website
2009-11-02 18:40:49 -05:00
Evan Prodromou
a2b8303925
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
classes/User.php
2009-11-02 18:13:04 -05:00
Evan Prodromou
61419038e5
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
README
2009-11-02 18:11:45 -05:00
Craig Andrews
15d0055c6f
allowed_nickname blocks top level url router names
2009-11-02 15:18:56 -05:00
Brion Vibber
5581143bee
Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
...
Caching support will be added in future work after unit tests have been added.
* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
* adapted GeonamesPlugin for new HTTPResponse interface
Note some plugins haven't been fully tested yet.
2009-11-02 09:14:15 -08:00
Brion Vibber
b22fc5b74a
Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."
...
Going to restructure a little more before finalizing this...
This reverts commit fa37967858
.
2009-11-02 07:51:29 -08:00
Brion Vibber
fa37967858
Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
...
Caching support will be added in future work after unit tests have been added.
* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
Note some plugins haven't been tested yet.
2009-11-02 06:31:28 -08:00
Evan Prodromou
6664528244
Revert "Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames."
...
This reverts commit 15f9c80c28
.
So, so, elegant! And so, so, incorrect!
We can't have a user named 'notice' because that would interfere with
URLs like /notice/1234. However, there is no file named 'notice' in
the Web root.
If there were a way to automatically pull out the virtual paths in the
root dir, this may make sense. Until then, we keep track here.
2009-11-01 11:09:14 -05:00
Craig Andrews
acaf07f6e8
Added an "Verify Your Identity" page to the OpenID provider
2009-10-30 13:21:37 -04: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
5d2b35cce6
get location from a Profile
2009-10-29 14:43:25 -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
6c615f6801
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-28 14:21:51 -04:00
Evan Prodromou
7df082abb8
replace some boolean-evaluations with calls to empty()
2009-10-28 14:21:42 -04:00
Carlos Perilla
bf701b8235
Enable welcome bot to broadcast it's notices
2009-10-27 23:38:08 -04:00
Evan Prodromou
3c724ccd0d
Merge branch '0.9.x' into location
2009-10-24 19:59:46 -04:00
Evan Prodromou
967de94665
update location while saving new profile
2009-10-23 11:47:00 -04:00
Evan Prodromou
943b2bea09
update location while registering
2009-10-23 11:46:44 -04:00
Craig Andrews
c93b9b9523
Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-10-23 11:15:25 -04:00
Evan Prodromou
b7a4437e79
flip x flag on generated files
2009-10-21 22:43:41 -04:00
Evan Prodromou
6fc5c934ed
statusnet.ini update
2009-10-21 22:43:41 -04:00
Evan Prodromou
2ed073f295
new data structures for location
2009-10-21 22:43:40 -04:00
Zach Copley
0bbc05c1d5
Merge branch '0.9.x' into TwitterBridgePlugin
2009-10-16 23:42:02 +00:00
Trever Fischer
1241e651ae
Added support for profile designs to the twitter API
2009-10-15 05:16:37 -04:00
Zach Copley
0fd8e758ad
Make queuing and daemons work via events
2009-10-14 04:50:16 +00:00
Evan Prodromou
4f5badda94
remove inboxes option
2009-10-13 17:38:27 -04:00
Craig Andrews
f719720e8a
Merge remote branch 'statusnet/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
2009-10-11 13:39:10 -04:00
Evan Prodromou
bf1c662990
Merge branch '0.8.x' into 0.9.x
2009-10-09 14:07:45 -04:00
Evan Prodromou
88e7092d23
don't write session if it's unchanged
2009-10-09 10:39:56 -04:00
Evan Prodromou
c5047fd90a
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
classes/Profile.php
2009-10-04 03:07:37 -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
be513db013
copy-and-paste typo in profile deletion
2009-10-02 15:42:34 -04:00
Evan Prodromou
94e3f6bb09
also delete blocks
2009-10-02 15:29:57 -04:00
Evan Prodromou
b3b3af9a2e
Merge branch '0.8.x' into deleteuser
2009-10-02 15:27:55 -04:00
Evan Prodromou
0a57d1ccee
change string return from Notice::saveNew to exceptions
2009-09-29 17:16:07 -04:00
Evan Prodromou
3afcdc18f7
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 21:15:14 -04:00
Evan Prodromou
38345d0783
let hooks override standard user rights
2009-09-27 21:11:45 -04:00
Evan Prodromou
6c069312e2
user rights
2009-09-27 21:11:45 -04:00
Craig Andrews
fc2426d7ce
Fix some bugs in the URL linkification, and fixed the unit test.
2009-09-27 16:52:15 -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
Evan Prodromou
b5b3690eef
Merge branch 'master' into 0.8.x
2009-09-24 17:15:36 -04:00
Evan Prodromou
8284b3cb82
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/requesttoken.php
classes/File.php
install.php
lib/noticeform.php
2009-09-23 09:45:22 -04:00
Craig Andrews
15f9c80c28
Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames.
2009-09-18 17:53:06 -04:00
Evan Prodromou
46ece1178c
check correct define (not backwards compatible)
2009-09-15 21:12:44 -04:00
Evan Prodromou
13147143fc
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-15 17:16:35 -04:00
Craig Andrews
4a97ad9efe
Remove unnecessary Profile::pkeyGet
...
Thanks for the info, Evan.
2009-09-15 17:08:26 -04:00
Craig Andrews
bb48698416
Add missing pkeyGet override to the Profile class
2009-09-13 21:43:29 -04:00
Craig Andrews
2a06f2ac5b
If there is no mimetype set, the file shouldn't be considered an enclosure
2009-09-10 21:21:01 -04:00
Evan Prodromou
e559f82e86
flip exe bit on statusnet.ini
2009-09-08 13:07:21 -07:00
Evan Prodromou
1e707008c2
flip exe bit on Deleted_notice.php
2009-09-08 13:06:46 -07:00
Evan Prodromou
3e1dc0e0b9
flip exe bit on Config.php
2009-09-08 13:06:13 -07: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
Craig Andrews
efcfd209ef
Check "Files" of type 'application/xhtml+xml' for oEmbed in addition to just text/html
2009-09-01 23:18:39 -04:00
Evan Prodromou
55972f59f6
remove Notice::gc() for now
2009-08-29 11:59:54 -07:00
Evan Prodromou
59f47fab4a
Status_network had wrong ini file
2009-08-28 10:42:49 -07:00
Evan Prodromou
c628029ef1
Status_network had wrong ini file
2009-08-28 10:42:34 -07:00
Brenda Wallace
815630fe63
used standard SQL that mysql and pgsql both like
2009-08-28 20:45:12 +12:00
Brenda Wallace
b9ea2bf1bc
used standard SQL that mysql and pgsql both like
2009-08-28 20:44:11 +12:00
Brenda Wallace
b833b725a8
make use of common_database_tablename()
2009-08-28 20:42:13 +12: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
c0d03fc279
make URL analyzer save new info on URLs
2009-08-27 20:23:31 -07:00
Evan Prodromou
34ce75c71d
remove duplicate save of Notice and streamline attachment detection
2009-08-27 20:09:07 -07:00
Evan Prodromou
35a78de93b
changes to File
2009-08-27 14:53:16 -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
522008dee5
methods on User to grant, check, and revoke roles
2009-08-27 11:38:31 -07:00
Evan Prodromou
41ee56f770
flip executable bit on User_role.php
2009-08-27 11:22:24 -07:00
Evan Prodromou
f8afad03ad
add data object class for user_role
2009-08-27 11:21:57 -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
Evan Prodromou
f1fda6c050
Merge branch '0.8.x' into 0.9.x
2009-08-27 07:56:19 -07:00
Craig Andrews
3e362233ee
Merge commit 'laconica/0.8.x' into 0.9.x
2009-08-26 21:56:59 -04:00
Craig Andrews
504c42aa7d
Fix some stupid bugs, such as a mispelling of oembed
2009-08-26 21:51:54 -04: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
Craig Andrews
d9e8dabaf4
Save the mimetype for oEmbed linked url
2009-08-26 14:53:52 -04:00
Evan Prodromou
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
Evan Prodromou
3567b9d708
global search and replace for laconica -> statusnet
2009-08-25 18:53:24 -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