c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
3898500ff9
Localisation updates from http://translatewiki.net .
2012-04-21 10:21:38 +00:00
b2c5b9de52
Localisation updates from http://translatewiki.net .
2012-04-15 12:11:05 +00:00
b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
b475c871a4
add displayName and targetUrl to activity JSON
2012-01-21 21:12:20 -05:00
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
053e99733f
add rel=nofollow to bookmark links if needed
2011-10-20 11:47:44 -04:00
e64ae1f03d
Don't start <p> element until we've checked for attachments
2011-10-20 10:57:58 -04:00
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
e7ef9e2117
Remove gettext wrapper from log msg
2011-09-30 18:20:22 +00:00
1d2a3be88e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 18:15:38 +00:00
fd62f6b934
Don't throw exception if bookmark has no attachments; log error and render as normal notice instead.
2011-09-30 18:13:25 +00:00
e3c010a870
try to check whether file exists over and over and over
2011-09-30 13:03:42 -04:00
4e5af7513c
50px more for bookmarklet popup
2011-09-30 10:15:40 -04:00
2e8d92dbe9
use the 'top' action for bookmarklet popup
2011-09-30 10:10:15 -04:00
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
6e480d2458
Upgrade 0.9.x bookmarks to 1.0.x
2011-09-15 17:06:05 -04:00
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
8eac5d2638
Merge branch 'testing' into 1.0.x
2011-08-22 13:20:40 -04:00
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
11f2078893
better exception handling in delicious importer
2011-08-09 13:07:36 -07:00
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
98064e6336
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-15 17:46:19 -04:00
6f0bd73e6c
Squashed commit of the following:
...
Move OMB to a plugin
commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 11:16:54 2011 -0700
Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2
* 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Fix paths
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
Some odds and ends
Remove omb stuff from queuemanager defaults
Add check to make sure we're not untagging an OMB profile to OMB plugin
Move some more subscription stuff and peopletag checks to OMB plugin
Move some OMB-specific unsubscribe stuff to OMB plugin
Finish removing libomb from core extlibs
Fix more conflicts
Fix queuing/queuehandling
Move some stuff around; fix references
Fix conflicts
Move OMB-specific files to OMB plugin
Move some stuff around; fix references
Add OMB plugin README and rm references to OMB in mail StatusNet README
Update paths
Fix define
Basic plugin finished
Move OMB-specific files to OMB plugin
Remove OMB stuff from router
commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
2011-07-15 12:13:57 -07:00
22f75cc352
Update checking notices for bookmarkness
2011-07-14 15:05:15 -04:00
eb90389a22
Localisation updates from http://translatewiki.net .
2011-07-01 13:02:21 +02:00
4eac561cf6
Fix ajax error output
2011-06-29 21:55:28 +00:00
7fb93673bc
Get rid of PHP notice
2011-06-29 21:55:00 +00:00
89aebb4ef0
Localisation updates from http://translatewiki.net .
2011-06-18 18:14:28 +02:00
c3f081c583
Localisation updates from http://translatewiki.net .
2011-06-05 21:15:31 +02:00
7c5fb37e59
Localisation updates from http://translatewiki.net .
2011-06-05 11:50:05 +02:00
d4aef7a007
Localisation updates from http://translatewiki.net .
2011-05-05 23:24:49 +02:00
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
5d72b600a1
Localisation updates from http://translatewiki.net .
2011-04-27 14:53:02 +02:00
a821ec4963
don't show empty tag links for bookmarks
2011-04-21 16:13:47 -04:00
f0ea629990
AJAX notice form setup for the expanded bookmark form.
2011-04-21 12:35:33 -07:00
9a62b7b18f
better error-handling when it's Ajax
2011-04-21 15:25:29 -04:00
963d052653
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-21 15:23:22 -04:00
2f48f0f914
Localisation updates from http://translatewiki.net .
2011-04-21 20:54:12 +02:00
8dd8b58b45
don't use thumbnail if it's not there
2011-04-21 14:53:17 -04:00
e5961efc27
Merge branch 'betterbookmarknotice' into 1.0.x
2011-04-20 06:35:14 -04:00
12723f2dc6
better output for bookmark list item
2011-04-20 06:34:27 -04:00
cb8eb4d307
Localisation updates from http://translatewiki.net .
2011-04-20 10:19:58 +02:00
6ee2adee4c
add some wrapper markup for bookmarklistitem
2011-04-19 17:56:23 -04:00
ea95f7b7b0
move long name to shorter name for bookmarklistitem
2011-04-19 17:38:56 -04:00
25a037ba9c
Revert "autoload bookmarknoticelistitemadapter"
...
This reverts commit f880e6498d
2011-04-19 17:28:24 -04:00
501ecb33cc
Revert "hard-require the adapter"
...
This reverts commit 8b0f45d0a7
2011-04-19 17:28:03 -04:00
8b0f45d0a7
hard-require the adapter
2011-04-19 16:53:34 -04:00
f880e6498d
autoload bookmarknoticelistitemadapter
2011-04-19 16:26:00 -04:00
7b397823d0
Move bookmark rendering to notice list item adapter
...
Move the tricky stuff with Bookmarks to a notice list item adapter.
2011-04-19 15:52:57 -04:00
e8e6d494d2
This util.min.js is pining for the fjords.
2011-04-18 12:42:00 -04:00
13ae3ab259
Localisation updates from http://translatewiki.net .
2011-04-18 13:41:15 +02:00
b11bfa3c06
Add class to bookmark form thumbnail image.
2011-04-18 02:29:16 -04:00
68bc240d4c
Add JS for second step of bookmark form.
2011-04-18 00:41:42 -04:00
b422a0d21a
spelling
2011-04-17 20:34:05 -07:00
f3e0cd0b30
Some special .js for the bookmark plugin, so we can control the form in the second step
2011-04-17 18:37:51 -07:00
d9cf0280d2
Give microapp form elements unique ids
2011-04-17 16:32:52 -07:00
5f81f4c701
Fix form elements in bookmark plugin
2011-04-17 15:34:50 -07:00
007d1be06d
Give bookmark form elements unique ids
2011-04-17 15:09:56 -07:00
5f3dbc3e98
Localisation updates http://translatewiki.net .
2011-04-17 20:30:47 +02:00
4c00b830bf
Localisation updates from http://translatewiki.net .
2011-04-17 01:15:30 +02:00
1c2d4de469
scale down the thumbnail image if necessary
2011-04-14 23:57:30 -04:00
2df98fc240
auto-fill bookmark data
2011-04-14 23:44:01 -04:00
3bea1b5371
initial bookmark form
2011-04-13 18:37:14 -04:00
66dee8a966
Merge branch '1.0.x' into prefillbookmark
2011-04-13 15:38:39 -04:00
1434099ed8
better versions for BookmarkPlugin
2011-04-13 15:27:30 -04:00
409550e1dc
Localisation updates from http://translatewiki.net .
2011-04-13 15:48:18 +02:00
ab52460691
Update translator documentation.
...
Number parameters.
2011-04-13 15:43:05 +02:00
820e19e197
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-11 11:20:27 -04:00
0644cdb6d0
Localisation updates from http://translatewiki.net .
2011-04-11 15:10:09 +02:00
a665d1f772
more information for bookmark without attachment
2011-04-10 19:27:09 -04:00
396a0c08b3
Localisation updates from http://translatewiki.net .
2011-04-09 20:53:29 +02:00
bf39c95795
Bookmarks more robust to missing profiles
2011-04-06 23:47:05 -04:00
553a0c8b9b
i18n/L10n updates/fixes.
...
Translator documentation added/updated.
Whitespace updates.
2011-04-06 16:36:35 +02:00
c9ca11eb64
include limited-scope class on bookmarks in output
2011-04-05 13:43:54 -04:00
c0f63c9a69
add toselector to bookmark
2011-04-05 11:18:25 -04:00
09523a19d7
Localisation updates from http://translatewiki.net .
2011-04-03 15:35:52 +02:00
d2a2575648
Localisation updates from http://translatewiki.net .
2011-04-01 22:59:31 +02:00
a84d584971
delete the Bookmark if Notice::saveNew() fails
2011-04-01 09:30:25 -04:00
4ac471f380
Localisation updates from http://translatewiki.net .
2011-03-31 23:30:07 +02:00
d5a38c62f4
Don't try to import a <dd> without a <dt> from delicious
2011-03-31 16:15:30 -04:00
2411caa000
If Router is mucked up, force URI for Bookmark
2011-03-31 11:20:24 -04:00
14456cbbb2
Fix gettext domain for messages in plugins "_()" to "_m()".
...
Some other i18n and L10n updates, too.
i18n/L10n review not complete.
2011-03-30 22:31:23 +02:00
83d1997f59
incorrect name for bookmark plugin
2011-03-30 10:58:28 -04:00
1c63ae29fe
typo fix in format string
2011-03-29 17:00:00 -07:00
20ca5027cc
Consolidate common code in micro-apps custom notice type display actions.
...
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
23436ad83d
Fix for bookmark posting: missing object was causing error output to crush ajax
2011-03-29 16:50:06 -07:00
0a19674c9f
@evan Fixed message domain for messages in plugins for recent commits.
...
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
2856982a1c
disallow access to out-of-scope bookmark
2011-03-28 22:50:45 -04:00
4e64bd4e5b
Localisation updates from http://translatewiki.net .
2011-03-24 16:08:03 +01:00
5bb6fae307
Localisation updates from http://translatewiki.net .
2011-03-18 20:59:45 +01:00
69e11bb45e
Localisation updates from http://translatewiki.net .
2011-03-11 19:33:52 +01:00
cbf16a4974
Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
...
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.
Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
b9e2c72740
Localisation updates from http://translatewiki.net .
2011-03-08 02:18:32 +01:00
Siebrand Mazeland
Evan Prodromou
Zach Copley
Brion Vibber
Samantha Doherty