Zach Copley
54ad3b21d7
Remove relationship: user_openid.user_id -> user.id. I don't think this
...
is used. And if we need it, the OpenID plugin should do it.
2009-11-25 23:55:03 +00:00
Zach Copley
2b6cf0d8b6
Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
...
This reverts commit a373d07ae0
.
Conflicts:
classes/statusnet.ini
lib/schema.php
plugins/Authentication/AuthenticationPlugin.php
plugins/OpenID/OpenIDPlugin.php
plugins/UserFlag/UserFlagPlugin.php
2009-11-25 23:54:36 +00:00
Zach Copley
bd4a613c38
Merge branch 'fix-openid' into 0.9.x
2009-11-25 23:33:13 +00:00
Zach Copley
035c8cfd71
Remove relationship: user_openid.user_id -> user.id. I don't think this
...
is used. And if we need it, the OpenID plugin should do it.
2009-11-25 23:29:12 +00:00
Brion Vibber
b771a8bb21
Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
...
DB_DataObject hides errors by silently returning null for any non-existent method call, making it harder to tell what the heck's going on... the rights check for blocked remote users returned null for the check for subscribe rights, thus eval'ing to false. We now log a note in this circumstance, which would have cut about 3 hours off of the debug time.
2009-11-25 22:23:21 +00:00
Brion Vibber
4d71dbe98c
Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
...
DB_DataObject hides errors by silently returning null for any non-existent method call, making it harder to tell what the heck's going on... the rights check for blocked remote users returned null for the check for subscribe rights, thus eval'ing to false. We now log a note in this circumstance, which would have cut about 3 hours off of the debug time.
2009-11-25 22:22:21 +00:00
Zach Copley
8acc1587b1
Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
...
This reverts commit a373d07ae0
.
Conflicts:
classes/statusnet.ini
lib/schema.php
plugins/Authentication/AuthenticationPlugin.php
plugins/OpenID/OpenIDPlugin.php
plugins/UserFlag/UserFlagPlugin.php
2009-11-25 13:38:59 -08:00
Zach Copley
c0190af982
Remove annoying log msg
2009-11-25 19:23:33 +00:00
Zach Copley
40e875f9cc
Remove annoying log msg
2009-11-25 19:22:09 +00:00
Craig Andrews
e9b877a4a3
correct the primary key for login_token
2009-11-20 10:56:06 -05:00
Evan Prodromou
224d82793c
Revert "Added 'login' command that gives you a link that can be used to login to the website"
...
This reverts commit b9d40f723b
.
Conflicts:
actions/login.php
classes/statusnet.ini
db/08to09.sql
db/08to09_pg.sql
db/statusnet_pg.sql
lib/command.php
lib/commandinterpreter.php
2009-11-20 02:50:43 -08:00
Craig Andrews
cac5a417f2
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2009-11-18 17:04:42 -05:00
Eric Helgeson
199ccdb53f
Consolidate group creation into static function in User_group
2009-11-18 15:54:24 -05:00
Craig Andrews
d07df8a796
Added Authorization plugin
...
Added LDAPAuthorization plugin
2009-11-18 14:19:43 -05:00
Evan Prodromou
3a980a75fc
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-17 14:51:38 -05:00
Zach Copley
638df94f88
Need to check the Profile rather than the User.
2009-11-17 08:48:16 -08:00
Evan Prodromou
bac2d80c91
Merge branch '0.9.x' into adminpanel
...
Conflicts:
classes/User.php
2009-11-17 08:04:14 -05:00
Evan Prodromou
6a1afda259
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
classes/statusnet.ini
2009-11-17 06:25:07 -05:00
Craig Andrews
a373d07ae0
Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them
2009-11-16 15:24:25 -05:00
Evan Prodromou
d59af02960
disallow email on faves from sandboxed users
2009-11-16 14:28:55 -05:00
Evan Prodromou
440af7ed7a
silenced users can't send direct messages
2009-11-16 19:51:41 +01:00
Evan Prodromou
e9321a1806
more rights denied to silenced and sandboxed
2009-11-16 19:46:08 +01: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
Craig Andrews
7177585630
getGroups was not handling the case where limit=null correctly
2009-11-16 11:22:45 -05:00
Evan Prodromou
3e08309826
change uses of User_role to Profile_role
2009-11-16 16:06:52 +01:00
Evan Prodromou
dd10e9729b
fix exe flag after createTable
2009-11-16 16:05:22 +01:00
Evan Prodromou
fa00aed88b
remove User_role class
2009-11-16 16:04:51 +01:00
Evan Prodromou
4e00ce01a9
Rename user_role to profile_role
...
Renamed the user_role table to profile_role. Remote users can have a
role on the site; that 'role' may be negative (silenced or sandboxed).
2009-11-16 16:02:47 +01:00
Evan Prodromou
792590bcdc
move role functions to Profile class
2009-11-16 15:52:33 +01:00
Craig Andrews
6470ccd1b8
getSubscribers and getSubscriptions were not handling the case where limit=null correctly
2009-11-16 00:19:19 -05:00
Evan Prodromou
c9475c76a8
define rights around how to silence, sandbox, and delete a user
2009-11-15 15:59:10 +01:00
Craig Andrews
ed690615de
Added a User_username table that links the external username with a StatusNet user_id
...
Added EmailAuthenticationPlugin
Added ReverseUsernameAuthenticationPlugin
Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname
User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static
2009-11-12 20:12:36 -05:00
Evan Prodromou
935410e8dc
Merge branch '0.9.x' into adminpanel
2009-11-11 00:22:42 -05:00
Brion Vibber
53c86c43c4
Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
...
Upgrade notes:
* Index names have changed from hardcoded 'Identica_people' and 'Identica_notices' to use the database name and actual table names. Must reindex.
New events:
* GetSearchEngine to override default search engine class selection from plugins
New scripts:
* gen_config.php generates a sphinx.conf from database configuration (with theoretical support for status_network table, but it doesn't seem to be cleanly queriable right now without knowing the db setup info for that. Needs generalized support.)
* Replaced old sphinx-indexer.sh and sphinx-cron.sh with index_update.php
Other fixes:
* sphinx.conf.sample better matches our live config, skipping unused stopword list and using a more realistic indexer memory limit
Further notes:
* Probably doesn't work right with PostgreSQL yet; Sphinx can pull from PG but the extraction queries currently look like they use some MySQL-specific functions.
2009-11-10 13:44:40 -08:00
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
Evan Prodromou
d0baab6978
Merge branch '0.8.x' into testing
2009-08-25 18:01:46 -04:00
Evan Prodromou
c87e1de017
Rename Laconica to StatusNet
2009-08-25 17:56:10 -04:00
Zach Copley
ec83890bc2
Take token field out of foreign_link
...
This undoes patch a49272d448
2009-08-25 15:48:06 -04:00
Craig Andrews
9fd3a41576
ftps protocol should be handled the same way as ftp
...
Canon urls that have a protocol followed by a host (and no path) automatcally get a trailing slash by the canon function - make the unit test match that
2009-08-24 20:44:06 -04:00
Evan Prodromou
ff87732053
Merge branch '0.8.x' into testing
...
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
2009-08-24 16:55:49 -04:00
Zach Copley
5d5b9f7022
Add new Foreign_link col to store OAuth access token
2009-08-24 11:52:06 -04:00
Evan Prodromou
9f356b55c6
Merge branch '0.9.x' into openidplugin
...
Conflicts:
actions/login.php
actions/register.php
2009-08-21 16:27:43 -04:00
Evan Prodromou
8236037bf0
Merge branch 'dbconfig' into 0.9.x
...
Conflicts:
lib/common.php
2009-08-21 16:17:06 -04:00
Evan Prodromou
538dcf2eef
load configuration options from database at runtime
2009-08-21 16:14:32 -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
888ed474a1
new class for configuration settings
2009-08-21 15:22:02 -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
4d3e2daf53
check correct setting in Profile bio length
2009-08-21 07:48:14 -04:00
Evan Prodromou
d2d3418b8a
Profile class has methods to check bio length
2009-08-21 07:40:46 -04:00
Evan Prodromou
d88839d167
methods for Message to check max content length
2009-08-21 07:20:59 -04:00
Evan Prodromou
92ef4895b4
can set group desc limit to unlimited without resetting global limit
2009-08-21 06:36:55 -04:00
Evan Prodromou
cd688acceb
allow configurable length for user group description
2009-08-21 06:33:22 -04:00
Evan Prodromou
900ca5c50c
data classes allow >140c in user group descriptions
2009-08-21 06:33:21 -04:00
Evan Prodromou
fa6b49ab38
data classes allow >140 bios in profiles
2009-08-21 06:33:21 -04:00
Evan Prodromou
4b44308988
Messages can be >140c in classes
2009-08-21 06:33:21 -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
Zach Copley
c049931dc7
Return null if all columns in the compound primary key aren't specified
2009-08-18 23:46:08 +00:00
Brett Taylor
3243612e76
Prevents redirect URLs that have canonical URLs longer than 255 chars from being written to the database as their canonical. Redirecting URLs will instead be saved to the database as given.
...
The reason for this is that table 'file' column 'url' is a VARCHAR(255) in MySQL and it silently truncates URLs longer than 255 characters, breaking the url.
The proper fix for this is to improve this column, making its type TEXT, but there are no database changes for 0.8.x, so this is the next best thing for data integrity. A migration script for 0.9.x could be written to audit the database checking for redirects and updating these urls to their proper canonical url.
2009-08-12 16:17:02 +12:00
Adrian Lang
bbf10e5bdf
common_config returns false if the config value is not set. Design::toWebColor checks with is_null. Hence the common_config value should be adjusted.
2009-08-10 16:35:09 -04:00
Craig Andrews
11086c7823
Implemented the list_all and list groups API methods as defined at http://laconi.ca/trac/wiki/ProposedGroupsAPI
...
Made the Autocomplete plugin also autocomplete groups
2009-08-07 18:00:04 -04:00
Adrian Lang
44b2b64247
Argh, first commit for ages and such a stupid error. Sorry.
2009-08-05 10:58:09 -05:00
Adrian Lang
ecc7090011
Argh, first commit for ages and such a stupid error. Sorry.
2009-08-05 16:05:29 +02:00
Adrian Lang
fe507928ae
Fix reference to undefined variable in Design::toWebColor.
2009-08-05 15:59:18 +02:00
Eric Helgeson
36e5d2b45f
Added correct null check. Created noisey errors on fresh install.
...
$id is not defined, should be $this->id
2009-08-04 22:11:20 -05:00
Evan Prodromou
622c0b24c3
move redirect-to-openid code to OpenID plugin
2009-08-04 13:17:43 -04:00
Evan Prodromou
2b79b4d21f
Move OpenID-related files to OpenID plugin directory
...
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
2009-08-04 13:01:23 -04:00
Evan Prodromou
a074cccb0e
save an archive of deleted notices
2009-08-04 06:05:04 -04:00
Evan Prodromou
db53cc800f
add a deleted_notice table
2009-08-04 06:05:04 -04:00
Evan Prodromou
8157336a0d
don't delete during select
2009-08-02 11:18:41 -04:00
Evan Prodromou
34e8b25cee
GC sessions one by one to make sure memcached gets cleared
2009-08-02 10:34:23 -04:00
Evan Prodromou
3af5774769
throw an exception rather than die()
2009-07-30 16:55:09 -04:00
Evan Prodromou
8371aea9c1
remove debugging code about processing a new URL
2009-07-30 16:38:50 -04:00
Evan Prodromou
ae81d36137
Site-wide design configuration
...
I added some code so that the site-wide design can be set, using the
configuration interface.
I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work.
2009-07-30 16:24: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
a5f78449b1
better check for existing DB connection runs SET NAMES UTF8 less
2009-07-27 13:51:40 -04:00
Evan Prodromou
51ac34e80c
first version of deleting users
2009-07-26 13:06:38 -06: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
Craig Andrews
ec453f0123
Merge commit 'br3nda/0.8.x-profile-pgfix' into 0.8.x
2009-07-23 11:13:27 -04:00
Brenda Wallace
27e525dbbc
fixed up a limit offset to be ANSI SQL compliant
2009-07-23 15:07:28 +12:00
Craig Andrews
684fc5d002
Merge commit 'br3nda/0.8.x-attachmentfix' into 0.8.x
2009-07-22 10:24:34 -04:00
Craig Andrews
e70a79d6ab
Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x
2009-07-22 10:23:17 -04:00
Brenda Wallace
28b62f357d
fixed SQL in checking for monthly quota - works in postgres and mysql
2009-07-22 17:10:41 +12:00
Brenda Wallace
2aa47096b8
missing AND in the SQL
2009-07-22 17:10:20 +12:00
Evan Prodromou
0a602725b1
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-07-21 12:50:45 -07:00
Evan Prodromou
eb5679b029
correctly gc sessions
2009-07-21 11:32:01 -07:00
Evan Prodromou
84fb846939
correctly gc sessions
2009-07-21 11:31:34 -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
Zach Copley
6d839ae992
Removed noisy debugging statements
2009-07-17 12:41:54 -07:00
Craig Andrews
3dbbefd5ad
Merge branch 'oembed-provider' into 0.8.x
2009-07-17 12:33:56 -04: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
Craig Andrews
a35794e3c3
Try oEmbed discovery before using oohembed
2009-07-15 17:10:36 -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
565dec0e21
use quote identifiers on the user table
2009-07-15 20:18:39 +12:00
Brenda Wallace
403bb38bcd
used single quotes in SQL
2009-07-15 20:18:30 +12:00
Brenda Wallace
63ea2b7c45
changed to SQL standard of LIMIT 20 OFFSET 1 etc.
2009-07-15 20:05:57 +12:00
Craig Andrews
c97957cf3e
HTML "File"/attachments should probably not be considered enclosures.
2009-07-14 13:38:26 -04: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
Zach Copley
db58756275
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
2009-07-09 11:28:21 -07:00
Zach Copley
c981f5bcec
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
maildaemon makes mail attachments into notice attachments
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-09 11:22:07 -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
Craig Andrews
5f72423523
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-07 15:55:10 -04:00
Evan Prodromou
84e676b687
Merge branch 'queuemanager' into 0.8.x
2009-07-07 11:35:00 -04:00
Evan Prodromou
d4db9d83d8
Revert "Merge branch '0.8.x' into cachenonexistent"
...
This reverts commit e21d2cfdb5
.
2009-07-05 12:44:18 -04:00
Evan Prodromou
e21d2cfdb5
Merge branch '0.8.x' into cachenonexistent
2009-07-05 11:53:39 -04:00
Evan Prodromou
ac361791c4
fix caching of faves by own, other
2009-07-05 11:32:57 -04:00
Evan Prodromou
9f6bea473e
cache failure to find in memcached
2009-07-05 11:31:39 -04:00
Evan Prodromou
cb019f7aad
don't send unused variable for streams
2009-07-04 01:43:35 -04:00
Evan Prodromou
741eb1a28b
Merge branch '0.8.x' into queuemanager
2009-07-03 23:34:44 -04:00
Evan Prodromou
e2f8b8d65d
no limit on conversation stream
2009-07-03 10:40:23 -04:00
Evan Prodromou
5f9a4ebef4
Merge branch '0.8.x' into queuemanager
2009-07-02 08:51:10 -04:00
Evan Prodromou
4e6cd42757
conversation code changes
2009-06-30 11:50:16 -04:00
Evan Prodromou
d03b8c4276
show section with admins in sidebar of group
2009-06-29 10:22:17 -04:00
Evan Prodromou
166e4a4b58
bad string compare in Status_network
2009-06-28 14:48:19 -04:00
Evan Prodromou
d4f1637f8a
fallback for www. addresses
2009-06-28 14:45:33 -04:00
Evan Prodromou
854c82cfd5
start of queuemanager code
2009-06-28 14:38:34 -04:00
Evan Prodromou
871f598dcc
debug flag for sessions
2009-06-27 08:11:09 -07:00
Evan Prodromou
7af94dc125
some debugging code for sessions
2009-06-27 07:09:21 -07:00
Evan Prodromou
addfcc976a
remove debugging code from Notice.php
2009-06-27 07:02:36 -07:00
Evan Prodromou
5a600a02d1
fixup perms on auto-generated files
2009-06-27 06:24:06 -07:00
Evan Prodromou
0ca22cf6e2
a memcached_dataobject class for saving sessions
2009-06-27 05:48:22 -07:00
Evan Prodromou
48d671ac39
session storage
2009-06-27 05:15:59 -07:00
Sarven Capadisli
60b47d8797
Added background-attachment:fixed for userdesigns
2009-06-26 15:20:22 +00: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
638905c270
avoid getting duplicate errors on upload
2009-06-25 11:10:34 -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
Evan Prodromou
83407cc3ca
change foreign_user.id to bigint (for Twitter, Facebook, etc.)
2009-06-24 14:44:02 -07:00
Zach Copley
f04a54ed2f
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
* '0.8.x' of git@gitorious.org:laconica/dev: (61 commits)
Using default theme design values (it was previously set to identica
Updated default colour theme and IE6 colours for transparent values
chmod +x delete_status_network.sh
rm -Rf, not rmdir
script to delete a status network
chmod allsites.php
script to show all sites on a network
use different name for connection and database
use /etc/laconica/setup.cfg instead of local file
other base directories
On XHR notice post, calls NoticeAttachment to trigger thumbnail and
oembed and thumbnail don't need sequences
add innodb by default to status networks
pwgen not pwdgen
make pwgen command configurable
a little sql script to drop full-text index and use innodb for profile and notice
remove common_debug from newnotice
append uploads to content rather than showing them double
use a subclass for single notice items to show attachments
make file command configurable
...
2009-06-23 14:29:46 -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
e744eba7eb
oembed and thumbnail don't need sequences
2009-06-23 09:52:31 -07:00
Evan Prodromou
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
Zach Copley
d9bebfd651
Attachment upload server and path now configurable
2009-06-22 22:48:31 +00:00
Evan Prodromou
2e9fc34d4f
change staticGet() from DB_DataObject to Memcached_DataObject for file classes
2009-06-22 14:24:40 -07:00
Evan Prodromou
05e5122802
Database changes for file tables
...
Some minor database changes for file tables. Namely:
* Added a timestamp to all tables
* Added a filename column for local files
* Change some tables that had unnecessary auto-increment primary
keys when they had another unique column that should act as
the primary key
* Change engine from MyISAM to InnoDB for a couple of files.
Also, rebuilt the DB_DataObject files for all these tables.
2009-06-22 14:19:41 -07:00
Evan Prodromou
876ab05927
Add like for search
2009-06-21 21:50:35 -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
68b34b3266
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-18 12:22:41 -07:00
Zach Copley
e0fb15c185
Make sure we have a DB connection before setting its charset
2009-06-18 19:19:19 +00:00
Evan Prodromou
3f54840b51
Only show twitter msgs in your own inbox
2009-06-18 11:45:48 -07:00
Zach Copley
dff43c03e4
Add design_id to User_group
2009-06-17 22:16:09 -07:00
Zach Copley
6c7bdf9df6
Merge branch 'userdesign' into 0.8.x
...
* userdesign: (56 commits)
Fix for background image repetition for various page heights
Removed height:100% for better background image repetition
A little more specific selector for notice reply
Have user favorites page show user's design
Placed a check to make sure there is a reply button in a notice before
Make MailboxAction read only
Remove stale reference to deprecated personal.php
Uppercase hex color values
Default to image being on, no tile after upload
Fix sidebar color bug default design
Update background image settings to use bitflags
It was accidently removed
Dynamically tile background image and turn background image on or off
Show a background img in settings form
IE7/8 CSS update for user design
Enable tiling of background imgs for Designs
Added background image tile flag to Design
Init styles for tile and image use on/off for user design settings
Added form option to tile background image and to turn it on and off
Add background dir
...
2009-06-17 18:49:25 -07:00
Sarven Capadisli
00736bddd1
Fix for background image repetition for various page heights
2009-06-18 01:39:37 +00: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
Zach Copley
164588ef0f
Merge branch '0.8.x' into userdesign
2009-06-17 21:40:52 +00:00
Robin Millette
28d02ec8cd
Make oohembed endpoint configurable.
2009-06-17 16:44:33 -04: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
Zach Copley
76cbeff33c
Update background image settings to use bitflags
2009-06-17 02:35:51 -07:00
Zach Copley
3d6e30d205
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
Moved url handling to its proper place, from newnotice to Notice.php
Removed more dead code.
Brought back borders for content, navigation, aside_primary but
Minor margin value change
More contrast for tabs
UI updates:
2009-06-16 22:24:11 -07:00
Zach Copley
d1ae3176b6
Enable tiling of background imgs for Designs
2009-06-16 22:18:25 -07:00
Evan Prodromou
312fd85532
names for Notice_inbox source values
2009-06-16 21:37:19 -07:00
Evan Prodromou
90b2b3f9d1
names for Notice is_local states
2009-06-16 21:37:04 -07:00
Zach Copley
7b7f119428
Added background image tile flag to Design
2009-06-16 21:36:15 -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
Zach Copley
bc1f877f6e
Design settings now save and displays backgrounds
2009-06-16 19:17:37 -07:00
Zach Copley
ab10db9bd1
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
Revert "Using neutral colour for notice hover"
Using neutral colour for notice hover
forgot to disinherit Memcached_DataObject in Status_network
Add some basic memcached handling to status_network
2009-06-16 00:59:57 -07:00
Zach Copley
37cafad2e0
Another minor tweak to showCSS() CSS output
2009-06-15 22:43:06 -07:00
Zach Copley
f3199c1369
Some fixups to the CSS output of showCSS()
2009-06-15 22:39:53 -07:00
Zach Copley
4652f316cf
Design class now uses WebColor class for outputting hex colors
2009-06-15 22:27:59 -07:00
Zach Copley
ef99f83963
Output custom stylesheets on design sub-Actions
2009-06-15 22:13:35 -07:00
Evan Prodromou
39117bf88c
forgot to disinherit Memcached_DataObject in Status_network
2009-06-15 21:55:56 -07:00
Evan Prodromou
0a886868fb
Add some basic memcached handling to status_network
...
Status_network can't be a subclass of Memcached_DataObject -- the
latter is too entrenched in Laconica's memc handling functions, which
aren't loaded when Status_network is running! But the importance of
caching these values can't be overstated. So, a considerably
slimmed-down version of the Memcached_DataObject code is transcribed
into Status_network.
2009-06-15 21:33:56 -07:00
Zach Copley
44343986c3
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
a little better query handling in redirect code
a little better query handling in redirect code
forgot some functions aren't available at status time
redirect on non-canonical server name
don't show create-a-group link if not logged in
allow a configured base for cache keys
Missing call to getProfile() caused verify_credentials to fail.
change mods for setup script
Script to set up new status networks
strncmp -> strcasecmp
Return network from network setup function
Configurable avatar directory
2009-06-15 21:24:22 -07:00
Evan Prodromou
8c24a3bc92
a little better query handling in redirect code
2009-06-15 16:55:01 -07:00
Evan Prodromou
f809663245
a little better query handling in redirect code
2009-06-15 16:51:49 -07:00
Evan Prodromou
2f82a3d44c
forgot some functions aren't available at status time
2009-06-15 16:43:39 -07:00
Evan Prodromou
587b7a8b2a
redirect on non-canonical server name
2009-06-15 16:40:53 -07:00
Evan Prodromou
6532f0dff6
strncmp -> strcasecmp
2009-06-15 14:29:25 -07:00
Evan Prodromou
d6ff702d7f
Return network from network setup function
...
Return the network from the network setup function. Also, special-case
for when we get a server name the same as the wildcard.
2009-06-15 13:34:52 -07:00
Zach Copley
92f095f589
Merge branch '0.8.x' into userdesign
...
* 0.8.x: (32 commits)
updates to Status_network
makeadmin action
make admins of groups
show aliases when showing a group
Link and distribute notices tagged for a group alias
Code for adding and saving group aliases
Styles for group block
add correct li for css magic for block stuff
typo in profileminilist class
return count from show
try to get the right class for profileminilist
fix perms for classes/statusnet.ini
fixup perms for classes
Added Group_alias class
add a table for group aliases
Cross-browser notice_attach
Allow users to be unblocked from a group
Some UI improvements for blocking and unblocking
The rest of the things necessary to make group block work
Make group block work
...
Conflicts:
db/laconica.sql
lib/common.php
2009-06-15 11:50:08 -07:00
Evan Prodromou
c077ad0775
Configurable avatar directory
...
Avatar directory and path are configurable.
2009-06-15 10:45:50 -07:00
Evan Prodromou
eb6a60ef88
updates to Status_network
2009-06-15 08:54:52 -07: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
ecbd7718d5
Code for adding and saving group aliases
...
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
2009-06-14 23:37:24 -07:00
Evan Prodromou
09c765f5bb
Merge branch '0.8.x' into groupalias
2009-06-14 21:53:45 -07:00
Evan Prodromou
23fd58b74c
fix perms for classes/statusnet.ini
2009-06-14 21:53:29 -07:00
Evan Prodromou
a4055fc2f9
fixup perms for classes
2009-06-14 21:53:09 -07:00
Evan Prodromou
2d63daa71c
Added Group_alias class
2009-06-14 21:52:31 -07:00
Evan Prodromou
f8da15bf41
Allow users to be unblocked from a group
...
List users who are blocked from joining a group. Add a form to let
them be unblocked. Add an action that removes the block. Includes
changes to group and groupblock classes.
2009-06-14 16:17:44 -07:00
Evan Prodromou
1c87532912
The rest of the things necessary to make group block work
...
Link to the group block form. Hide join button if the current user is
blocked.
2009-06-14 15:47:39 -07:00
Evan Prodromou
f32799699c
fix perms on Group_block classes
2009-06-14 12:07:12 -07:00
Evan Prodromou
85b74d846d
create DB_DataObject classes for group block
2009-06-14 12:06:22 -07:00
Evan Prodromou
e0bdaa787d
Merge branch '0.7.x' into 0.8.x
2009-06-14 11:27:22 -07:00
Zach Copley
d0eb2058a5
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/showfavorites.php
lib/action.php
2009-06-14 00:23:48 +00: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
4df1ea49ec
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/designsettings.php
2009-06-09 21:51:24 -07: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
Robin Millette
f8dae2bbc9
Refactored some attachment code and fixed upload bug in interface.
2009-05-31 21:03:55 -04:00
Robin Millette
ebeb5f744c
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
...
Conflicts:
js/util.js
lib/attachmentlist.php
2009-05-31 17:12:04 -04:00
Evan Prodromou
9e16b7d89b
Use mysql_set_charset for connection instead of SET NAMES
...
PHP doesn't get the info about the charset of the connection if
you use SET NAMES. So, we use the appropriate PHP function instead.
2009-05-30 13:59:57 -04:00
Evan Prodromou
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
Evan Prodromou
7656277313
remove debug code from replies
2009-05-30 03:02:26 -04:00
Evan Prodromou
78968a31a7
check for since=0 in Notice::stream()
2009-05-30 00:49:14 -04:00
Zach Copley
425f9d703c
Ticket #1567 - Change max_id to return notices <= ID instead of < ID
2009-05-29 16:54:24 -07:00
Zach Copley
eb76a3bbb3
Ticket #1567 - API: Change before_id parameter to max_id
2009-05-29 16:32:55 -07:00
Sarven Capadisli
a456ceb47c
Merge branch '0.7.x' into 0.8.x
2009-05-29 00:10:23 +00:00
Evan Prodromou
3532cd0490
Only enqueue inbox-dependent transports after inboxes have been filled
2009-05-28 18:19:22 -04:00
Zach Copley
3d13a44b66
Upgraded foreign_id column to handle new 64-bit Facebook user IDs.
...
See: http://developers.facebook.com/news.php?blog=1&story=226
2009-05-27 17:59:49 -07:00
Evan Prodromou
d068680e19
optionally use SET NAMES for utf8 to DB
2009-05-27 14:57:45 -04:00
Evan Prodromou
b3bb8943f5
Merge branch '0.7.x' into utf8
2009-05-27 14:52:35 -04:00
Robin Millette
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
Evan Prodromou
d7e3bab0b8
fix require_once in Design.php
2009-05-23 23:34:05 -04:00
Evan Prodromou
705abf31ee
add getDesign to User
2009-05-23 23:27:42 -04:00
Evan Prodromou
91fc1e36bc
update User.php with new design-related fields
2009-05-23 23:26:29 -04:00
Evan Prodromou
3f5252c168
add fields to support designs for users
2009-05-22 23:43:08 -04:00
Evan Prodromou
748c744a02
add a method to Design to show custom CSS
2009-05-22 23:13:09 -04:00
Evan Prodromou
95104f38f2
Merge branch '0.8.x' into userdesign
2009-05-22 21:11:54 -04:00
Evan Prodromou
68d90bcab0
some class files had x bit set
2009-05-22 21:11:46 -04:00
Evan Prodromou
21aad16b58
fix x bit on Design.php
2009-05-22 21:10:27 -04:00
Evan Prodromou
c63622f05e
add design classes
2009-05-22 21:10:00 -04:00
Evan Prodromou
d216e3bbbb
fix x bit on laconica.ini
2009-05-22 21:08:58 -04:00
Evan Prodromou
59340b274a
laconica.ini change after automated createTables.php
2009-05-22 21:08:22 -04:00
Robin Millette
9261e48ef0
Removed dead code.
2009-05-18 19:23:18 -04:00
Robin Millette
0271859c24
Added personal tag page: http://example.com/MY_NICK/tag/A_TAG
2009-05-18 17:18:57 -04:00
Robin Millette
5897dfa4c3
Refactored new sections code to proper classes and added notice link to links in notice sections.
2009-05-17 22:06:08 -04:00
Robin Millette
fecb8c706d
Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments.
2009-05-15 15:04:58 -04:00
Robin Millette
3b7ee5a5f9
rewrote short url stuff to handle new file/url classes (redirections, oembed, mimetypes, etc.)
2009-05-13 14:27:32 -04:00
Robin Millette
d010d811ba
db stuff for URLs: redirections, oembed, etc.
2009-05-11 13:45:00 -04:00
Zach Copley
3e7b1e69e3
Added dirty dates to Foreign_link
2009-05-07 15:55:04 -07:00
Sarven Capadisli
aaeed091d2
Merge branch '0.7.x' into 0.8.x
2009-05-05 22:54:46 +00:00
Evan Prodromou
5314d9b2cf
make faves work with ids
2009-05-01 12:01:28 -07:00
Evan Prodromou
021b520a11
Make user group stream use IDs
2009-05-01 11:38:50 -07:00
Evan Prodromou
3328ec545c
make profile notice getting use ids
2009-05-01 11:27:57 -07:00
Sarven Capadisli
d30df07908
Merge branch '0.7.x' into 0.8.x
...
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
2009-05-01 00:16:25 +00:00
Evan Prodromou
aee641ee1e
make replies use new query format
2009-04-29 20:45:33 -04:00
Evan Prodromou
1e8ea1eb46
Make the tag stream use ID mechanism
2009-04-29 16:09:03 -04:00
Evan Prodromou
a4d959b8a2
Public stream uses IDs method
...
Public stream now uses IDs method
2009-04-29 12:05:31 -04:00