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
Evan Prodromou
01795bd615
Merge branch 'testing' into 0.8.x
2009-11-02 18:10:37 -05:00
Evan Prodromou
f757ba3ca2
notes about registeruser and makegroupadmin scripts
2009-11-02 18:10:01 -05:00
Evan Prodromou
85d5585fc4
script to make someone a group admin
2009-11-02 18:07:38 -05:00
Evan Prodromou
8e4bc78204
correct name in registeruser
2009-11-02 18:07:20 -05:00
Evan Prodromou
97b4576c11
script to register a user
2009-11-02 18:07:04 -05:00
Evan Prodromou
f0fc12b0a7
script to make someone a group admin
2009-11-02 18:06:27 -05:00
Evan Prodromou
edb2713026
correct name in registeruser
2009-11-02 18:06:09 -05:00
Evan Prodromou
eee033ae7c
script to register a user
2009-11-02 17:28:03 -05:00
Craig Andrews
15d0055c6f
allowed_nickname blocks top level url router names
2009-11-02 15:18:56 -05:00
Brion Vibber
12eec0fea2
Update Russian localization from apaskal's branch
...
Updated from version in merge request 1762 - http://www.gitorious.org/statusnet/mainline/merge_requests/1762
2009-11-02 11:56:44 -08:00
Brion Vibber
b62e473087
Update master .po template & merge updates to all localizations
2009-11-02 11:29:13 -08:00
Brion Vibber
86560eeb3d
Merge commit 'refs/merge-requests/1900' of git://gitorious.org/statusnet/mainline into integration
2009-11-02 10:16:06 -08:00
Craig Andrews
1cf67f4f71
allow <> to surround the url (like () or [])
2009-11-02 12:59:11 -05:00
Sarven Capadisli
8b7bce12f8
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 17:57:43 +00:00
Sarven Capadisli
1b00cdf124
Binding keyup/keydown only once for .form_notice
2009-11-02 17:56:55 +00:00
Craig Andrews
87484424a5
fix the [] unit tests
2009-11-02 12:53:02 -05:00
Craig Andrews
8782f5fedf
do not allow " in URLs - they are not legal URL characters
2009-11-02 12:53:02 -05:00
Craig Andrews
b179ab650a
do not allow [ and ] - they are not legal URL characters
2009-11-02 12:53:02 -05:00
Sarven Capadisli
eaae5a4c90
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 17:21:23 +00:00
Sarven Capadisli
4aa6deb8ab
Make sure to call FormNoticeEnhancements with a new copy of the form
...
object
2009-11-02 17:19:08 +00: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
73b9e531bf
Detect "no file" upload error and, for now at least, ignore it gracefully.
...
This was triggering on non-AJAX form submissions for new notices, preventing them from being posted when they contained no attachments.
2009-11-02 09:10:06 -08:00
Sarven Capadisli
b579a306c7
Ran through JSLint
2009-11-02 17:06:52 +00:00
Sarven Capadisli
c3cac436e2
Fixed object string name and order for submitonreturn actions
2009-11-02 16:55:47 +00:00
Sarven Capadisli
eeed7f5437
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 16:44:12 +00:00
Sarven Capadisli
8d35831b54
Fixed object string name
2009-11-02 16:42:50 +00:00
Evan Prodromou
c991047fc4
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 11:23:41 -05:00
Evan Prodromou
3c4ac05cde
remove <dl> stuff from profile list
2009-11-02 11:23:31 -05: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
Sarven Capadisli
d8e2d76ba9
Typo: z-index should be 2 instead of 1
2009-11-02 14:54:31 +00:00
Sarven Capadisli
8a07c7d7c0
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 14:53:31 +00: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
Brion Vibber
8e64723813
Make unit tests work again by forcing a 'global' on $_have_a_config...
...
Fix a typo in the error message when no config file found.
2009-11-02 06:14:08 -08:00
Sarven Capadisli
ebd604cf6b
Minor
2009-11-02 13:28:14 +00:00
Sarven Capadisli
412052cd7e
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-02 10:28:57 +00:00
Sarven Capadisli
c9f6c09af0
Updated button.close style
2009-11-02 10:28:22 +00:00
Evan Prodromou
f2b642ce82
insert profile flags more or less correctly
2009-11-01 23:25:30 -05:00
Zach Copley
4abbf44068
Remove stale references to old apiaction parameter
2009-11-01 16:32:45 -08:00
Sarven Capadisli
01dd745a9c
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-11-01 21:19:11 +01:00
Evan Prodromou
70e4580c3f
move action files to the right place
2009-11-01 15:16:53 -05:00
Evan Prodromou
f72857d73e
show profile flag form when showing profile list or profile page
2009-11-01 15:13:11 -05:00
Evan Prodromou
7701bc2e56
profile flag form
2009-11-01 15:12:49 -05:00
Sarven Capadisli
b1367ae8da
Updated button.close styles
2009-11-01 20:53:25 +01:00
Evan Prodromou
e42967fe3e
add data definitions to user flag classes
2009-11-01 14:24:40 -05:00
Evan Prodromou
644263f989
update autogenerated data objects to match our classes
2009-11-01 14:16:50 -05:00
Evan Prodromou
fa661664dd
remove exe flags on UserFlag data objects
2009-11-01 14:12:19 -05:00
Evan Prodromou
9cb74c439a
autogenerated files for UserFlag data objects
2009-11-01 14:11:52 -05:00
Sarven Capadisli
1793cec8a5
Removed unneessary styles
2009-11-01 20:11:51 +01:00
