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
Siebrand Mazeland
6ae673fd3f
Add i18n file.
2011-08-30 11:23:42 +02:00
Siebrand Mazeland
3e60d4cb3f
Number parameters in messages that have multiple parameters
...
Trim trailing whitespace
Leading tabs to spaces
Remove superfluous whitespace
2011-08-30 10:56:00 +02:00
Evan Prodromou
2522f888c7
Static -> static
2011-08-27 17:42:31 -04:00
Jordan Conway
9bf815be0d
fixed typo http://status.net/open-source/issues/3289
2011-08-27 12:11:00 -07:00
Evan Prodromou
ebaf5a972e
add a return to the error path for new events
2011-08-27 14:56:02 -04:00
Evan Prodromou
6132bddabc
don't use fetchAll() when you've done a query()
2011-08-27 13:14:31 -04:00
Evan Prodromou
f81c1f7554
use an array of profiles rather than a looping cursor for profile lists
2011-08-27 12:53:15 -04:00
Evan Prodromou
01fd24ce6a
Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch()
2011-08-27 12:06:34 -04:00
Evan Prodromou
817e1507ed
Catch missing profile in realtime server
2011-08-27 10:58:11 -04:00
Samantha Doherty
41f06d96d4
Quick fix to make custom site logos work better.
2011-08-26 15:35:00 -04:00
Samantha Doherty
37bb0e6d20
Style cleanup for ostatus forms.
2011-08-26 12:51:55 -04:00
Evan Prodromou
c0bae505d9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 18:03:30 -04:00
Samantha Doherty
2dd13b071c
Update DirectionDetector style for 1.0 and move to base stylesheet.
2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a
Style for Activity notices.
2011-08-25 16:24:54 -04:00
Evan Prodromou
654fdf2fa4
Don't try to read the URLs in system notices
2011-08-25 12:59:40 -04:00
Evan Prodromou
1593c97bc1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 12:34:32 -04:00
Samantha Doherty
c54b3311fd
Style cleanup for QnA.
2011-08-25 12:25:10 -04:00
Samantha Doherty
85aba15830
Style cleanup for Mobile Profile.
2011-08-25 12:24:09 -04:00
Evan Prodromou
3b4d3c6ac3
actions are directed to affected group or person
2011-08-25 12:18:51 -04:00
Samantha Doherty
ab785f612a
Make MobileProfile load its own AND theme CSS files if available.
2011-08-25 12:16:40 -04:00
Evan Prodromou
19af3e8ae9
use 'system' for activity notice source
2011-08-25 11:54:26 -04:00
Evan Prodromou
3ff0299531
more accurate activity output for system activities
2011-08-25 11:51:50 -04:00
Evan Prodromou
420e7ddf83
no class for notice content div in systemlistitem
2011-08-24 18:12:26 -04:00
Evan Prodromou
352e66d25a
show system list items for fave/unfave
2011-08-24 18:12:02 -04:00
Evan Prodromou
904101b973
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-24 17:17:32 -04:00
Evan Prodromou
3d831ebcfb
hide buttons for repeat, delete system activities
2011-08-24 17:17:03 -04:00
Zach Copley
3b1c5e5ac1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Fix blog plugin error to allow deleting a blog post
correctly show the blog content for blog entries
2011-08-24 13:57:48 -07:00
Evan Prodromou
eef89c6712
Fix blog plugin error to allow deleting a blog post
2011-08-24 15:57:45 -04:00
Evan Prodromou
b5c5d8d393
correctly show the blog content for blog entries
2011-08-24 14:57:05 -04:00
Zach Copley
f955cf6ace
Add timezone indicator to event start time label
2011-08-23 15:43:14 -07:00
Zach Copley
8e2a9bfa5b
Initialize DataTime with 'now' instead of 'today' (today doesn't give accurate results)
2011-08-23 22:25:46 +00:00
Evan Prodromou
65df78d5c8
remove Activity plugin separate ignore and copying files
2011-08-23 12:23:18 -04:00
Evan Prodromou
4cbd5b4c9f
Add custom list items for follow, unfollow, leave activities
2011-08-23 12:18:10 -04:00
Evan Prodromou
7c4dfb8480
remove debug statement from JoinListItem
2011-08-23 11:52:45 -04:00
Evan Prodromou
eed5192405
Custom list item for join events
2011-08-23 11:49:27 -04:00
Evan Prodromou
1bfbf92868
Incorrect arguments for ActivityPlugin::onEndJoin/LeaveGroup()
2011-08-23 10:23:08 -04:00
Evan Prodromou
505c64854c
correct typo in ActivityPlugin::onEndSubscribe()
2011-08-23 00:27:42 -04:00
Evan Prodromou
af12037a6f
fix errors with fave activities
2011-08-23 00:23:02 -04:00
Evan Prodromou
eb6cece8e4
update Activity plugin for 1.0.x
2011-08-22 23:48:38 -04:00
Evan Prodromou
01c2c31c1e
Merge branch '1.0.x' into activity
...
Conflicts:
db/core.php
2011-08-22 18:13:02 -04:00
Evan Prodromou
9ca3c3d1c3
move core schema to class files
2011-08-22 17:52:02 -04:00
Evan Prodromou
8884a5255f
Merge activity plugin into mainline
2011-08-22 15:44:10 -04:00
Evan Prodromou
8eac5d2638
Merge branch 'testing' into 1.0.x
2011-08-22 13:20:40 -04:00
Siebrand Mazeland
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
Siebrand Mazeland
1fa689e913
tag -> list
2011-08-20 20:30:37 +02:00
Siebrand Mazeland
083e9773f2
Add translator documentation.
...
doxygen fixes.
2011-08-19 17:13:15 +02:00
Siebrand Mazeland
d5cba33366
Add translator documentation.
2011-08-19 17:11:29 +02:00
Siebrand Mazeland
91cb7b8775
Remove i18n fix from previous commit: this is a debug log entry.
2011-08-19 17:09:44 +02:00
Siebrand Mazeland
4b0dd8384f
Whitespace updates (including leading tabs to spaces).
...
Fixed i18n.
2011-08-19 17:06:03 +02:00
Siebrand Mazeland
700b46317a
Fix broken translator documentation because "// TRANS: " is not exactly in the line above the _m() method call.
...
Whitespace updates.
2011-08-19 16:50:31 +02:00
Siebrand Mazeland
d85bfd426d
Update/add translator documentation.
...
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:46:28 +02:00
Siebrand Mazeland
c718a603f5
Fix and add translator documentation
...
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:40:45 +02:00
Siebrand Mazeland
fd4c72bf85
Fix awkward attempt at i18n.
2011-08-16 18:04:56 +02:00
Siebrand Mazeland
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
Siebrand Mazeland
bd32b69355
Fix punctuation.
2011-08-15 16:18:21 +02:00
Siebrand Mazeland
4239e2bb9e
Fix incorrect documentation.
2011-08-15 16:04:06 +02:00
Evan Prodromou
11f2078893
better exception handling in delicious importer
2011-08-09 13:07:36 -07:00
Evan Prodromou
513c54fa89
Merge branch 'master' into 1.0.x
...
Conflicts:
lib/common.php
2011-08-02 15:04:14 -04:00
Evan Prodromou
897e3c87e5
encode values when inserting into MeteorUpdater JS
2011-08-02 13:49:27 -04:00
Zach Copley
60a574ef28
Work improving the interface of the Event micro-app
...
Squashed commit of the following:
commit da50b6b0223fcbc42cf45d01a138f08930917e71
Author: Zach Copley <zach@status.net>
Date: Tue Aug 2 00:35:36 2011 -0700
If end time < start time reset the end time selection
commit 6dfc35579e8e4bd0af9d85fc46799bcc462c68b1
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:55:10 2011 -0700
Populate event dates with sensible defaults
commit 0bc8d726706cfdc0830687e7f40e941e61691191
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:29:46 2011 -0700
Recalculate times if user changes start or end date
commit 6a92a31429b4eb6f442eaf850d59dcc5b121e57f
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:03:46 2011 -0700
* Better date/time display
* Localize date and time display for user
commit 2bf344068a0eb6e3ed90efacbf33c85e7ee5edf7
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 15:56:21 2011 -0700
Reselect the end time after timelist update
commit 62fd0620eb5fcc94c240c0fc0b304aa17509de8d
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 14:40:14 2011 -0700
Fix bug in which end time was not properly in sync with start time + 30mins
commit 3c6bcfb2d962f3677082c468a29480d2a1813d73
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 12:37:00 2011 -0700
Pass exact URL of the timelist action to event.js
commit efc74841c5b588cdae686630a1b4c1448e5d742b
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 11:20:45 2011 -0700
Add Ajax error handling to new event action
commit 3085f4b3ed93bb930bff1bc475309b4d473ffc83
Author: Zach Copley <zach@status.net>
Date: Fri Jul 22 01:18:13 2011 -0700
Ajaxify event end-time selector
commit 8025c1d368d8f862b666702bfab08daf633a34ea
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 21:58:43 2011 -0700
Remove dead code
commit 5fbfff47297dea609a07d67a81d430f97f6698ef
Merge: bcd845d 3c926af
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:21:58 2011 -0700
Merge branch 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone into eventjs
* 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Populate timei selection dropdowns and better CSS (thanks Sammy!)
Event start/end as dropdowns
Nothing to see here move along
Don't allow user to set crazy start and end dates
New event dates shouldn't ever be in the past, eh?
Move event microapp JavaScript into included .js file
Conflicts:
plugins/Event/event.js
plugins/Event/eventform.php
commit bcd845dc56c147c4ba10eedd43cc7aa799bc6a9a
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:11:19 2011 -0700
Move the helper functions for filling the start/end times to their own class
commit d246d39c4afbffb1e76cd561ab61f15dafd8a988
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit 0778533fef5500db79e40664c5b56aa7d9cc8357
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit e800053fdf2cb12fc1f2eac72762d07571647aa8
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit a85949b9cc4f3b5bb387785d4b7a717e9d952752
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit 87d1301ce8aa8877e753440dd52166bf857b29f3
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit 7e05aa5fdc02bfec6107bcf8c748627216d51405
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
commit 3c926af287f80ee389b5bc8a4c1dcc5e0904a14c
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit af09c57d5132dba2a6a3e76974e38fdde6422c45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit b585215ed7deb4dc9d4bbc065d36b6e3f819d710
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit e1d30ae9b80eded4ed7ef6bdd7515da64ae344de
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit ad7c99f021980b867f369066b4413bdb1e882986
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit 4741f0a327e10e67fc04e2b816ed56351e38b4fa
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
2011-08-02 01:17:56 -07:00
Zach Copley
b925eeecde
Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed
2011-08-02 01:15:30 -07:00
Evan Prodromou
e530a0868d
Fix Bug#3260 for 1.0.x
2011-07-30 08:17:57 -04:00
Evan Prodromou
afd42611a3
Merge branch '0.9.x'
2011-07-30 07:49:05 -04:00
Evan Prodromou
5517741909
json_encode() realtime arguments (closes Bug#3260)
2011-07-30 07:45:07 -04:00
Siebrand Mazeland
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
Evan Prodromou
ebc5d6f676
fix call to Notice::saveNew() in Ostatus_profile::processShare()
2011-07-20 11:47:55 -04:00
Evan Prodromou
0ad7411343
Make process*() functions return existing or new notice
2011-07-20 11:33:28 -04:00
Evan Prodromou
0eeb175904
ID is a string
2011-07-20 11:13:25 -04:00
Evan Prodromou
17b1492690
better ID from shared activities
2011-07-20 11:11:05 -04:00
Evan Prodromou
e7ad9bf17a
ensure a shared item's author element
2011-07-19 16:47:37 -04:00
Evan Prodromou
982426a790
handle incoming SHARE verbs
2011-07-19 15:20:06 -04:00
Evan Prodromou
98064e6336
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-15 17:46:19 -04:00
Zach Copley
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
Evan Prodromou
22f75cc352
Update checking notices for bookmarkness
2011-07-14 15:05:15 -04:00
Evan Prodromou
e04ce18a93
Merge branch '1.0.x' into testing
2011-07-14 12:55:02 -04:00
Zach Copley
8ba6c8ea87
Update admin panel instructions in the TwitterBridge README
2011-07-13 23:06:29 +00:00
Zach Copley
9a51caa485
Automatically allow admins to use the Twitter admin panel if the TwitterBridge plugin is installed
2011-07-13 23:02:52 +00:00
Evan Prodromou
362e8b6603
make meteor protocol (http or https) configurable
2011-07-13 16:55:28 -04:00
Evan Prodromou
58ea000485
JavaScript and other changes to make realtime_channel management work
2011-07-13 16:10:08 -04:00
Evan Prodromou
3c3ab128b3
Actions to keep state for Realtime_channel
2011-07-13 14:47:40 -04:00
Evan Prodromou
07796250fd
add method Realtime_channel::touch()
2011-07-13 13:55:03 -04:00
Evan Prodromou
85ea41ea46
better description for Meteor plugin
2011-07-13 13:54:39 -04:00
Evan Prodromou
d283aa006e
script to garbage-collect old realtime channels
2011-07-13 13:23:09 -04:00
Evan Prodromou
7f7cfa5558
return value for always-rw in RealtimePlugin
2011-07-11 16:08:51 -04:00
Evan Prodromou
15f8beef5f
realtime_channel must always be writeable
2011-07-11 15:54:10 -04:00
Evan Prodromou
b3f8ab0beb
hand-coded fetch for Realtime_channel class
2011-07-11 15:52:05 -04:00
Evan Prodromou
235bc84e4d
correct SQL function in Realtime_channel::getAllChannels()
2011-07-11 14:14:53 -04:00
Evan Prodromou
8187ff6681
invert key -> (user, page) mapping in Realtime_channel table
2011-07-11 13:53:55 -04:00
Evan Prodromou
641749453d
XXX comments to remember to fan-out in realtime distribution
2011-07-11 11:33:39 -04:00
Evan Prodromou
a602477a1d
Index for (action, arg1, arg2) on Realtime_channel
2011-07-11 11:31:59 -04:00
Evan Prodromou
60e0e2b723
Fix the syntax for unique keys on Realtime_channel
2011-07-11 11:29:05 -04:00
Evan Prodromou
3b246d643d
use Realtime_channel to target channels to users
2011-07-11 09:16:16 -04:00
Evan Prodromou
8b957c6581
data structure for realtime channels
2011-07-08 17:52:07 -04:00
Evan Prodromou
069d976fab
SearchSubMenu is a MoreMenu
2011-07-07 12:06:56 -04:00
Evan Prodromou
baaad0dc8b
TagSubMenu is a MoreMenu
2011-07-07 10:59:00 -04:00
Evan Prodromou
af0eded741
add an URI index to blogs so they get cached
2011-07-04 15:58:56 -04:00
Evan Prodromou
44753d64ea
use Poll_response::pkeyGet() in Poll::getResponse()
2011-07-04 15:47:36 -04:00
Evan Prodromou
c468b0d7f3
explicitly name URI attribute for Poll_response
2011-07-04 15:47:09 -04:00
Evan Prodromou
6ff3149082
SearchSub respects empty set from memcache.
2011-07-04 12:49:09 -04:00
Evan Prodromou
d4b7f5d8ac
TagSub doesn't refetch empty set of tag subscriptions
2011-07-04 12:39:57 -04:00
Evan Prodromou
144755d1c9
Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
2011-07-04 12:26:59 -04:00
Evan Prodromou
15dafffb3b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-04 12:26:41 -04:00
Evan Prodromou
db85774f25
only update the avatar of an Ostatus_profile if it's a profile
2011-07-04 12:24:59 -04:00
Evan Prodromou
333876c6a9
don't force replies to empty set in Poll_response
2011-07-02 00:49:04 -04:00
Evan Prodromou
2998033816
Add FIXME comments to remember to encode/decode important data about a
...
happening in ActivityStreams format
2011-07-01 23:06:16 -04:00
Evan Prodromou
a0ed80a5d8
Correct list of parameters for Happening::saveNew()
2011-07-01 23:04:44 -04:00
Evan Prodromou
66edc023d7
Happening::saveNew() is static
2011-07-01 23:03:41 -04:00
Evan Prodromou
c37c303b14
Correct the category of the EventPlugin
2011-07-01 22:20:13 -04:00
Siebrand Mazeland
eb90389a22
Localisation updates from http://translatewiki.net .
2011-07-01 13:02:21 +02:00
Evan Prodromou
9f8d0b36a8
Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
2011-06-30 15:44:11 -04:00
Zach Copley
4eac561cf6
Fix ajax error output
2011-06-29 21:55:28 +00:00
Zach Copley
7fb93673bc
Get rid of PHP notice
2011-06-29 21:55:00 +00:00
Zach Copley
2471f2092a
Fix avatar saving for OStatus -- how did this ever work?
2011-06-29 19:03:16 +00:00
Evan Prodromou
da4ba6a5a9
reinstate lost replies code in OStatusQueueHandler
2011-06-29 13:51:19 -04:00
Evan Prodromou
7759aa51e6
extra logging for OStatus enqueuing
2011-06-29 13:20:18 -04:00
Zach Copley
fe28432a26
Merge branch '1.0.x' into testing
...
* 1.0.x:
* only send the one invitation reminder per email address, regardless of how many invitations there are * don't send invitations converted invitations * better error checking * more logging
2011-06-21 13:26:44 -07:00
Zach Copley
e7a4fee32b
* only send the one invitation reminder per email address, regardless of how many invitations there are
...
* don't send invitations converted invitations
* better error checking
* more logging
2011-06-21 13:25:05 -07:00
Evan Prodromou
f7ba2d1f8a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-06-21 14:12:24 -04:00
Evan Prodromou
718203306c
Add tags and headers to improve email summary deliverability
...
SpamAssassin doesn't like HTML email without a) a Mime-Version header
and b) an <html> tag in the body. Although not everyone uses SA, there
are probably other spam systems that implement similar rules. And it's
always nice to play nice.
2011-06-21 14:07:10 -04:00
Zach Copley
14f555fe65
Merge branch '1.0.x' into testing
...
* 1.0.x:
Move print statement
2011-06-21 10:43:18 -07:00
Zach Copley
e53dad35b8
Move print statement
2011-06-21 10:42:01 -07:00
Zach Copley
ba5dc26a76
Merge branch '1.0.x' into testing
...
* 1.0.x:
Fix output bug in email reminder script
2011-06-21 10:36:39 -07:00
Zach Copley
9051417605
Fix output bug in email reminder script
2011-06-21 10:35:20 -07:00
Zach Copley
a7b23fdb9d
Merge branch '1.0.x' into testing
...
* 1.0.x:
Update subject of one-time email reminders
2011-06-21 10:04:39 -07:00
Zach Copley
809482b5fb
Update subject of one-time email reminders
2011-06-21 10:03:39 -07:00
Evan Prodromou
67cb4c5b88
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-06-20 17:28:02 -04:00
Zach Copley
6943f00e37
Merge branch '1.0.x' into testing
...
* 1.0.x:
Add ability to send special one-time reminders
2011-06-20 14:16:30 -07:00
Evan Prodromou
aab265709a
use old-style plugin initializers as fallback for GoogleAnalytics
2011-06-20 17:07:17 -04:00
Evan Prodromou
c4fc69ad2a
use async, domain-aware GoogleAnalytics JS
2011-06-20 17:07:02 -04:00
Evan Prodromou
42f3fedd43
use old-style plugin initializers as fallback for GoogleAnalytics
2011-06-20 17:06:17 -04:00
Evan Prodromou
34a2152d0a
use async, domain-aware GoogleAnalytics JS
2011-06-20 16:38:00 -04:00
Zach Copley
29403a764c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline: (31 commits)
Enable TinyMCE for the blog form
upgrade TinyMCE to 3.4.x
correctly purify input for Blog_entry
better management of HTML input
correctly return the HTML representation of a new blog entry
Fine-tuning Blog_entry class
don't double-show summary and content
move class BlogEntry to Blog_entry for DB_DataObject compliance
get right output context for BlogEntryListItem
correct staticGet() declaration
First coded version of blog plugin
push regex pattern for UUID to that class
Localisation updates from http://translatewiki.net .
Document a few messages I missed.
Add translator documentation. Broke a few long lines. i18n/L10n updates. Whitespace updates.
Localisation updates from http://translatewiki.net .
Add missing translator documentation.
Update translator documentation. Whitespace updates.
Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced. Whitespace updates.
Add translator documentation.
...
Conflicts:
plugins/EmailReminder/EmailReminderPlugin.php
plugins/EmailReminder/lib/userinvitereminderhandler.php
2011-06-20 13:14:19 -07:00
Zach Copley
aebab2742a
Add ability to send special one-time reminders
2011-06-20 12:58:14 -07:00
Evan Prodromou
f078c19f09
Merge branch '1.0.x' into testing
2011-06-20 12:23:16 -04:00
Evan Prodromou
182a8cf377
Enable TinyMCE for the blog form
2011-06-20 12:21:04 -04:00
Evan Prodromou
12ab4629f3
Merge branch 'upgradetinymce' into newblogplugin
2011-06-20 11:34:41 -04:00
Evan Prodromou
d67b8fdae8
upgrade TinyMCE to 3.4.x
2011-06-20 11:34:24 -04:00
Evan Prodromou
acd1c6287d
correctly purify input for Blog_entry
2011-06-20 11:28:46 -04:00
Evan Prodromou
4c5d583403
better management of HTML input
2011-06-20 11:01:50 -04:00
Evan Prodromou
06ac0f9e9e
correctly return the HTML representation of a new blog entry
2011-06-20 10:49:37 -04:00
Evan Prodromou
e5126ebb77
Fine-tuning Blog_entry class
...
Gave it a different object type (Article), fine-tuned the summary process, and
made sure to return the saved Notice in saveNew().
2011-06-20 10:48:02 -04:00
Evan Prodromou
3d8b776dc7
don't double-show summary and content
2011-06-20 10:26:24 -04:00
Evan Prodromou
d51abd8830
move class BlogEntry to Blog_entry for DB_DataObject compliance
2011-06-20 10:20:01 -04:00
Evan Prodromou
4c9ae4fae6
get right output context for BlogEntryListItem
2011-06-20 10:14:37 -04:00
Evan Prodromou
a1911dc2c1
correct staticGet() declaration
2011-06-20 10:14:24 -04:00
Evan Prodromou
01996b1a46
Merge remote-tracking branch 'evan/blogplugin' into newblogplugin
2011-06-20 09:34:32 -04:00
Evan Prodromou
8104b1f766
Merge branch '1.0.x' into testing
2011-06-20 09:13:42 -04:00
Evan Prodromou
cd7d0eae4a
First coded version of blog plugin
...
A basic blog plugin. Allows posting open-ended HTML with a title. Not yet
tested (even run).
2011-06-20 01:11:35 -04:00
Siebrand Mazeland
0ed9000fd3
Localisation updates from http://translatewiki.net .
2011-06-19 15:19:14 +02:00
Siebrand Mazeland
6917d6c7de
Document a few messages I missed.
...
This should actually bring 1.0.x to 100% translator documention, but of course new messages will appear and I'll probably have overseen a few...
2011-06-19 15:14:45 +02:00
Siebrand Mazeland
0155198ffa
Add translator documentation.
...
Broke a few long lines.
i18n/L10n updates.
Whitespace updates.
2011-06-19 15:02:31 +02:00
Siebrand Mazeland
42b28547d5
Localisation updates from http://translatewiki.net .
2011-06-19 13:20:34 +02:00
Siebrand Mazeland
d750a943ed
Add missing translator documentation.
2011-06-19 12:31:36 +02:00
Siebrand Mazeland
10600579e0
Update translator documentation.
...
Whitespace updates.
2011-06-19 12:23:14 +02:00
Siebrand Mazeland
2f3bec5a43
Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced.
...
Whitespace updates.
2011-06-19 12:21:12 +02:00
Siebrand Mazeland
46d9df2f8a
Update translator documentation.
...
Remove superfluous whitespace.
2011-06-19 12:07:59 +02:00
Siebrand Mazeland
9272fcd3ab
Add translator documentation.
2011-06-19 11:54:10 +02:00
Siebrand Mazeland
89aebb4ef0
Localisation updates from http://translatewiki.net .
2011-06-18 18:14:28 +02:00
Siebrand Mazeland
33ce46f074
Add new POT files.
2011-06-18 17:58:54 +02:00
Siebrand Mazeland
199404c74a
Update translator documentation.
...
Update whitespace.
i18n/L10n fixes.
2011-06-18 17:20:36 +02:00
Siebrand Mazeland
3891697222
Fix FIXME: removed patchwork message. Using Markdown now.
...
Update translator documentation.
Update whitespace.
i18n fixes.
2011-06-18 17:19:36 +02:00
Siebrand Mazeland
96b9ecaf07
Update translator documentation.
...
L10n/i18n updates.
Whitespace updates.
2011-06-17 22:36:40 +02:00
Siebrand Mazeland
dc3cdfc0f8
Update translator documentation.
...
Whitespace updates.
Correction to fix syntax highlighting in my editor. Didn't complete it, though.
2011-06-17 22:36:39 +02:00
Siebrand Mazeland
acb215d550
Update translator documentation.
...
i18n/L10n updates.
Whitespace updates.
2011-06-17 22:36:37 +02:00
Siebrand Mazeland
0b81532cbc
Fix a todo wrt plural support.
...
Update translator documentation.
Whitespace updates.
2011-06-17 22:36:35 +02:00
Siebrand Mazeland
9f4a9a13cd
i18n fixes.
...
Translator documentation updated.
Whitespace updates.
2011-06-17 22:36:33 +02:00
Siebrand Mazeland
037a905929
Update translator documentation.
2011-06-17 22:36:31 +02:00
Siebrand Mazeland
59ee7e0f5b
Translator documentation updated.
...
Whitespace updates.
2011-06-17 22:36:29 +02:00
Siebrand Mazeland
dbde94fc34
Whitespace updates.
2011-06-17 22:36:28 +02:00
Siebrand Mazeland
2906f97dd9
Fix i18n for some very visible UI messages.
2011-06-17 22:36:26 +02:00
Evan Prodromou
4989fc72d2
Merge branch '1.0.x' into testing
2011-06-17 09:29:53 -04:00
Zach Copley
a35392da2f
EmailReminder plugin to send reminders about various things
...
* Needs some cleanup and testing
* Email templates need work
* More documentation
Squashed commit of the following:
commit 1c7b418dad5ec1b7713d61b6a42d6d7a394d500f
Author: Zach Copley <zach@status.net>
Date: Fri Jun 17 02:17:31 2011 -0700
* Set the reminder interval correctly
commit ae0ded8cf95210f54b4cd58dac0eeeedf2d99c67
Author: Zach Copley <zach@status.net>
Date: Fri Jun 17 02:15:01 2011 -0700
Send email reminders for invitations
commit 1b596d08f5dbe765a16fbdfbd21e2ad68e8b0058
Author: Zach Copley <zach@status.net>
Date: Thu Jun 16 23:53:48 2011 -0700
Handle multiple confirmation types
commit 25d83351d878f39498cd6a14fddde27f1afef2ca
Author: Zach Copley <zach@status.net>
Date: Thu Jun 16 18:04:57 2011 -0700
Actually send reminders and record a record of doing so
commit 9ffc2dbee15cacc7e7f9feab492185ee9964a17e
Author: Zach Copley <zach@status.net>
Date: Thu Jun 16 14:20:16 2011 -0700
Make the queue handling actually work
commit 2a6ce3c17c045bdb0a3ddf36f2c290c9c48eb003
Author: Zach Copley <zach@status.net>
Date: Thu Jun 16 13:27:56 2011 -0700
Fix syntax errors
commit 054b54847dfadc490aa7d7dff12d473af31c99bb
Author: Zach Copley <zach@status.net>
Date: Thu Jun 16 00:36:37 2011 -0700
Registration reminders should work now, but code is untested
commit b44117017b64635aae340c260167cf1efab9b2ae
Merge: 9d1441d f74de88
Author: Zach Copley <zach@status.net>
Date: Tue Jun 14 09:43:19 2011 -0700
Merge branch 'email-reminder' of gitorious.org:~zcopley/statusnet/zcopleys-clone into email-reminder
* 'email-reminder' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Stubby EmailReminderPlugin and data class
Remove bogus data class
Conflicts:
plugins/EmailReminder/EmailReminderPlugin.php
plugins/EmailReminder/classes/Email_reminder.php
commit 9d1441d7366df57e38cdfaf96e006f7d2f29d889
Author: Zach Copley <zach@status.net>
Date: Tue Jun 14 09:23:23 2011 -0700
Most of the other classes needed to send email reminders
commit 4e9bb11dbb23556bf5c1847e7a127084b5cc217c
Author: Zach Copley <zach@status.net>
Date: Mon Jun 13 12:10:55 2011 -0700
size -> length
commit a9ea80ef8abae1e64d5713091baedd931b7184e2
Author: Zach Copley <zach@status.net>
Date: Fri Jun 10 16:38:06 2011 -0400
Stubby EmailReminderPlugin and data class
commit 5d893f982209b245cb9113a59e49721dd6e191b6
Author: Zach Copley <zach@status.net>
Date: Fri Jun 10 14:01:48 2011 -0400
Remove bogus data class
commit f74de8841a98add73536fd8a4d3cee76035b491c
Author: Zach Copley <zach@status.net>
Date: Fri Jun 10 16:38:06 2011 -0400
Stubby EmailReminderPlugin and data class
commit 5b14370918233e5112a95da94567c4ed83429bc9
Author: Zach Copley <zach@status.net>
Date: Fri Jun 10 14:01:48 2011 -0400
Remove bogus data class
2011-06-17 02:24:34 -07:00
Siebrand Mazeland
bbb240e47e
Update translator documentation.
...
Whitespace updates.
Line break changes in README.
i18n updates.
2011-06-15 13:25:43 +02:00
Evan Prodromou
820e7586ec
suppress free email
2011-06-10 19:56:26 -04:00
Evan Prodromou
527ed62f3f
Merge branch '1.0.x' into testing
2011-06-10 17:46:44 -04:00
Evan Prodromou
f294ed0091
remember to send confirmation email for registration
2011-06-10 17:46:35 -04:00
Evan Prodromou
8b47400183
Merge branch '1.0.x' into testing
2011-06-10 16:51:07 -04:00
Evan Prodromou
c227045975
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-06-10 16:50:33 -04:00
Evan Prodromou
331d8a99ba
Merge branch 'statusnetworkapi' into 1.0.x
2011-06-10 16:50:15 -04:00
Evan Prodromou
625e63a303
Make errors work correctly
2011-06-10 16:50:06 -04:00
Evan Prodromou
2d72a64841
First pass at complete global API
2011-06-10 15:51:30 -04:00
Zach Copley
36d619480a
Rip out user, group and site design customization code
...
Squashed commit of the following:
commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:51:47 2011 -0400
Remove design-related stuff from the API
commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:40:16 2011 -0400
Mop up misc design related code
commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:21:00 2011 -0400
Remove Design DB_DataObject class and references to it in schema
commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:15:54 2011 -0400
Remove design-related actions and widgets
commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:10:57 2011 -0400
Remove navigation / routing to design settings actions
commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:03:09 2011 -0400
CurrentUserDesignAction -> Action
commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:54:22 2011 -0400
* GroupDesignAction -> GroupAction (new base class for group actions)
commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:36:40 2011 -0400
OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
Evan Prodromou
fdee419051
Merge branch '1.0.x' into testing
2011-06-09 10:33:36 -04:00
Evan Prodromou
ed61a217a2
clear up whitespace in sendemailsummary
2011-06-08 16:33:06 -04:00
Samantha Doherty
c6d6749d6f
Only unbind privacy checkbox when actually on mobile profile, oops.
2011-06-08 15:59:05 -04:00
Evan Prodromou
c9756872bc
Wrap email summary and better subject line
2011-06-08 15:23:41 -04:00
Evan Prodromou
ba219fa805
include a dummy non-empty value for sitesum queue items
2011-06-08 08:46:44 -04:00
Evan Prodromou
65005d35ce
correct transport for usersum
2011-06-08 08:46:21 -04:00