Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Evan Prodromou
59043dca7f
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
...
Conflicts:
classes/Avatar.php
I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou
1014e295ee
bad sprintf format for new follow activity notices
2011-09-21 10:18:16 -04:00
Evan Prodromou
838c3988ee
Change defaults for ActivityPlugin to only log joins and follows
2011-09-21 10:15:34 -04:00
Zach Copley
58b9f83a02
Allow repeats to flow through the Twitter bridge
2011-09-21 05:23:47 +00:00
Zach Copley
c9cbc31481
Don't send notices from the ActivityPlugin to Twitter
2011-09-21 02:31:51 +00:00
Evan Prodromou
ac1ea3e8cf
Remove template plugin
...
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Evan Prodromou
0ee660af23
fix problem with using wrong arg to EndLeaveGroup event
2011-09-18 19:28:17 -04:00
Evan Prodromou
822cb1482a
right URLs for search subs
2011-09-18 19:20:28 -04:00
Evan Prodromou
e2914189f3
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-18 17:33:38 -04:00
Evan Prodromou
bba39c4aaf
reorder routes for ostatus for better matches
2011-09-18 17:32:59 -04:00
Evan Prodromou
52ed4678f3
correct link for searchsubs
2011-09-18 17:32:13 -04:00
Zach Copley
116840a80e
Reorder directory router connections / fix regex
2011-09-18 13:35:09 -07:00
Evan Prodromou
dbb7324b25
test for missing profile in ostatus queue handler
2011-09-18 14:36:49 -04:00
Evan Prodromou
2f1953ca25
Correct args for join event
2011-09-18 14:06:35 -04:00
Evan Prodromou
75bdc37b61
Correct args for join event
2011-09-18 14:06:27 -04:00
Evan Prodromou
e43ea4c9f5
fix RealtimePlugin root hack hack
2011-09-18 13:03:12 -04:00
Evan Prodromou
06f19d523a
inverted if() in RealtimePlugin check for tag
2011-09-18 12:52:00 -04:00
Evan Prodromou
915dd9c9b5
Copy-and-paste error in OStatus button output
2011-09-18 12:44:16 -04:00
Evan Prodromou
01ea6a18f9
make activity plugin use its own notice source
2011-09-18 12:40:17 -04:00
Evan Prodromou
3d4ea0a71f
Correct the routes for notice and user sitemaps
2011-09-18 12:14:43 -04:00
Evan Prodromou
7c1d73ed3d
Sitemap plugin no longer forces an index on user.created
2011-09-18 12:07:59 -04:00
Zach Copley
670288e68f
Merge branch 'twitter-bridge-fixes'
...
* twitter-bridge-fixes:
Make sure the session token gets output no matter what (whoops)
Move submit (connect) button to the very bottom
Move license checkbox to the end of the form
Don't allow Twitter registration if site is invite only
2011-09-17 16:33:28 -07:00
Zach Copley
d4ed6db1d8
Make sure the session token gets output no matter what (whoops)
2011-09-17 15:50:13 -07:00
Zach Copley
2df2d4fd1d
Move submit (connect) button to the very bottom
2011-09-17 15:45:55 -07:00
Zach Copley
be95dcf008
Move license checkbox to the end of the form
2011-09-17 15:43:21 -07:00
Evan Prodromou
1040f1346c
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 18:27:37 -04:00
Evan Prodromou
5c0e8d2a2f
fix link for mobile profile when in singleuser mode
2011-09-17 18:20:08 -04:00
Zach Copley
6c43967e8c
Don't allow Twitter registration if site is invite only
2011-09-17 14:47:35 -07:00
Zach Copley
985f52ce60
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
problem with remote subscription on groups in OStatus
show correct favorites link
2011-09-17 14:39:26 -07:00
Zach Copley
4467615021
Fix reference to constant
2011-09-17 14:38:47 -07:00
Evan Prodromou
f52d33753e
problem with remote subscription on groups in OStatus
2011-09-17 17:28:01 -04:00
Zach Copley
b34812152d
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:36:05 -07:00
Zach Copley
baa17381c0
Change time format to work with older PHP (before 5.3)
2011-09-17 13:29:45 -07:00
Evan Prodromou
467b840c44
move OMB-specific remote login button to OMB Plugin
2011-09-17 15:08:38 -04:00
Evan Prodromou
9f6adb3f52
Merge branch '1.0.x' into testing
2011-09-15 17:06:27 -04:00
Evan Prodromou
6e480d2458
Upgrade 0.9.x bookmarks to 1.0.x
2011-09-15 17:06:05 -04:00
Evan Prodromou
0b1d8762c6
include q as param, not arg for search sub menu
2011-09-15 11:00:27 -04:00
Evan Prodromou
fa18e6365e
add default groupdirectory route
2011-09-14 12:18:22 -04:00
Siebrand Mazeland
16c24b66bb
Remove two incorrect strings for now.
2011-09-11 16:56:33 +02:00
Siebrand Mazeland
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
Evan Prodromou
5eba1030ae
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-09-08 08:59:16 -04:00
Zach Copley
449451b8e7
* Validate event URL
...
* Remove more debugging statements
2011-09-08 01:14:24 -07:00
Zach Copley
a910d28132
Remove debugging statement
2011-09-08 00:49:58 -07:00
Zach Copley
b991ded816
Re-do the logic for the event micro-app's dropdowns (way trickier than it seems at first blush).
2011-09-08 00:45:56 -07:00
Evan Prodromou
c5d332f40a
move yet-another-rediscover-script to OStatus plugin
2011-09-07 16:56:38 -04:00
Jean Baptiste Favre
e25400b4f2
Fix BitlyUrl plugin.
...
Since Bit.ly changed its API from v2 to v3, BitlyURL plugin doesn't work anymore.
This fix API version issue and also imporve a little plugin performance in removing useless code.
2011-09-03 22:41:46 +02:00
Zach Copley
5f441842be
Fix warning / send current user in to Notice::asActivity
2011-08-31 13:10:12 -07:00
Siebrand Mazeland
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
Siebrand Mazeland
c9139cc6e0
Add translator documentation.
...
Update punctuation for a few messages.
Leading tabs to spaces.
2011-08-30 11:37:20 +02:00
