Commit Graph

3515 Commits

Author SHA1 Message Date
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
Evan Prodromou 40cfc5490a fix the streams for email summary 2011-06-07 17:38:24 -04:00
Evan Prodromou a10edb3183 Merge branch 'testing' into 1.0.x
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Evan Prodromou 59c980cea8 first pass at actions for initializing a network 2011-06-07 12:06:02 -04:00
Evan Prodromou 17294a4627 move email registration code to DomainStatusNetworkPlugin 2011-06-06 12:25:26 -04:00
Siebrand Mazeland 31a92ede44 Update translator documentation.
i18n/L10n updates.
Whitespace update.
2011-06-06 00:38:38 +02:00
Siebrand Mazeland f007bcee16 Add translator documentation. 2011-06-06 00:37:10 +02:00
Siebrand Mazeland 9358a34384 Add translator documentation. 2011-06-06 00:36:50 +02:00
Siebrand Mazeland ff33d0ff35 Add onPluginVersion().
Add translator documentation.
Whitespace update.
Add FIXME for global functions.
2011-06-06 00:36:31 +02:00
Siebrand Mazeland 9a59d44208 Add translator documentation.
L10n update.
Whitespace update.
2011-06-06 00:35:40 +02:00
Siebrand Mazeland c11a549071 Add translator documentation. 2011-06-06 00:35:12 +02:00
Siebrand Mazeland 2b3b11fca6 Add translator documentation. 2011-06-06 00:34:57 +02:00
Siebrand Mazeland c3f081c583 Localisation updates from http://translatewiki.net. 2011-06-05 21:15:31 +02:00
Siebrand Mazeland acc4d8b1c3 Use language specific truncation symbol.
Add translator documentation.
2011-06-05 20:51:50 +02:00
Siebrand Mazeland 49eb66c57e Update translator documentation.
Whitespace updates.
i18n/L10n updates.
2011-06-05 20:42:11 +02:00
Siebrand Mazeland 8807705bb4 Update translator documentation and whitespace. 2011-06-05 20:23:13 +02:00
Siebrand Mazeland 4110266b68 Update translator documentation.
i18n/L10n fixes.
Whitespace updates.
2011-06-05 20:15:01 +02:00
Siebrand Mazeland 8ce0acca33 Add translator documentation. 2011-06-05 19:59:50 +02:00
Siebrand Mazeland 158140a118 Add translator documentation.
Whitespace updates.
i18n fixes.
2011-06-05 19:58:11 +02:00
Siebrand Mazeland fdca686298 Update translator documentation.
Update whitespace.
2011-06-05 19:46:45 +02:00
Siebrand Mazeland 59006ffee1 Update translator documentation. 2011-06-05 19:40:25 +02:00
Siebrand Mazeland eb0fb9c2b7 Add todo. URLs are outdated. 2011-06-05 19:39:59 +02:00
Siebrand Mazeland 0cca861ea7 Update translator documentation.
L10n fixes.
Whitespace updates.
2011-06-05 19:33:41 +02:00
Siebrand Mazeland b4efd97c62 Add translator documentation. 2011-06-05 19:30:04 +02:00
Siebrand Mazeland b0e80d1e28 Fix xgettext translator comment. 2011-06-05 19:27:42 +02:00
Siebrand Mazeland 9e78c631fb Fix plural issue.
Fix translator documentation.
2011-06-05 19:23:35 +02:00
Siebrand Mazeland 7c5fb37e59 Localisation updates from http://translatewiki.net. 2011-06-05 11:50:05 +02:00
Siebrand Mazeland 834ed4365d Fix i18n.
Update translator documentation.
2011-06-05 11:44:01 +02:00
Siebrand Mazeland a4e807ea46 Add translator documentation. 2011-06-05 11:35:11 +02:00
Siebrand Mazeland 9f9f940833 Add translator documentation.
Change a few double quotes to single quotes.
2011-06-05 11:30:46 +02:00
Siebrand Mazeland 9baa02fc7c Add translator documentation. 2011-06-05 11:22:56 +02:00
Siebrand Mazeland 3dcdf2ef03 Update translator documentation. 2011-06-05 11:12:34 +02:00
Siebrand Mazeland 9758134d1a Update translator documentation.
Update whitespace.
L10n/i18n updates.
2011-06-05 11:06:47 +02:00
Evan Prodromou e1791525e8 initialize schema_version table after install 2011-06-02 13:58:53 -04:00
Evan Prodromou 7f1a30dc40 allow setting some initial tags on a new network 2011-06-01 10:53:46 -04:00
Evan Prodromou f4e17c1bdf Merge branch '1.0.x' into testing 2011-05-31 17:16:45 -04:00
Brion Vibber 712ba64fa6 Apply upstream fix to MSN library for darkip
Upstream fix
http://code.google.com/p/phpmsnclass/source/diff?spec=svn52&old=47&r=52&format=unidiff&path=%2Ftrunk%2Fphpmsnclassv2%2Fmsn.class.php
2011-05-31 11:46:50 -07:00
Samantha Doherty a026608953 Only use mobile doctype on actual mobile devices. 2011-05-31 12:14:26 -04:00
Evan Prodromou 412adfb587 Merge branch '1.0.x' into testing 2011-05-30 15:37:46 -04:00
Samantha Doherty 70f01b2b34 Remove privacy checkbox replacement from Mobile Profile. 2011-05-27 11:50:49 -04:00
Evan Prodromou b34e267e53 Merge branch '1.0.x' into testing
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou fd847c29c5 Make emailregistration more invitation-friendly 2011-05-23 17:45:41 -04:00
Evan Prodromou 86a7889012 render question description in QnA plugin 2011-05-23 12:33:16 -04:00
Evan Prodromou f1772b75d5 render question description in QnA plugin 2011-05-23 12:30:34 -04:00
Evan Prodromou 3f3babbcf2 Merge remote-tracking branch 'origin/1.0.x' into 1.0.x 2011-05-23 12:29:08 -04:00
Siebrand Mazeland def0483c5e Small change to kick syntax highlighter into shape. 2011-05-20 16:58:02 +02:00
Siebrand Mazeland e48c26e156 Update translator documentation, i18n and L10n. 2011-05-20 16:57:05 +02:00
Siebrand Mazeland 3501ad6c77 Add FIXME for missing i18n. 2011-05-20 16:56:12 +02:00
Siebrand Mazeland 1d1a929718 Update translator documentation and L10n. 2011-05-20 16:03:53 +02:00
Evan Prodromou 9c4c2c710f remove stray newlines that were causing problems with the build 2011-05-20 06:08:42 -07:00
Evan Prodromou b9f8e6e8cc fail quickly if we can't find a for DomainStatusNetwork 2011-05-19 15:30:38 -04:00
Samantha Doherty 2a0dc2291d Toggle to show and hide local nav. 2011-05-18 11:08:31 -04:00
Samantha Doherty e3acf5b72b Remove primary nav and notice form overrides, and extra notice forms, from MobileProfile. 2011-05-18 10:13:06 -04:00
Zach Copley 73251c7629 Script to cancel an email registration 2011-05-16 13:37:55 -07:00
Zach Copley 4718063a78 Script to cancel an email registration 2011-05-16 13:25:26 -07:00
Zach Copley 125141a0c6 Make the effects for adding/removing invites less jerky 2011-05-11 17:20:24 -07:00
Zach Copley 4a04291c16 Make add/remove item buttons work the same way they do on the extended profile form 2011-05-11 16:29:35 -07:00
Zach Copley 607fa56449 Don't add the user's domain to invitee domains unless it's on the whitelist 2011-05-11 16:19:51 -07:00
Zach Copley 84c8ffc28a Show confirm dialog when deleting an invite (if the user has already entered an email address) 2011-05-11 16:00:35 -07:00
Zach Copley 04a593487a Change whitelist invite form's add new item control to be consistent with similar controls elsewhere 2011-05-11 14:33:22 -07:00
Samantha Doherty d0c850f380 Quick fix for extended profile js buttons 2011-05-11 16:57:42 -04:00
Zach Copley 368b25fb34 When showing the email invite dropdowns, pre-select the user's own domain as the first option 2011-05-10 14:47:05 -07:00
Zach Copley 8597856b56 Fancier invitation form for whitelisted domains
Squashed commit of the following:

commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date:   Mon May 9 17:00:51 2011 -0700

    Make the invites from the fancier invite form save

commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date:   Fri May 6 16:14:40 2011 -0700

    .js to let the user add (and remove) additional invitees from their domain

commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date:   Thu May 5 15:44:49 2011 -0700

    Load special whitelist invite .js when loading the invite page

commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:35:49 2011 -0700

    Remove settings class from whitelist inviter form

commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:21:18 2011 -0700

    Make a fancier form for whitelist domain invites

commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:34:09 2011 -0700

    Add some more events to the invitation page

commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:12:36 2011 -0700

    Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland bd7f74f0a5 Fix i18n issues.
Update translator documentation.
Whitespace updates.
2011-05-08 10:12:05 +02:00
Zach Copley fc62a8f980 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 15:00:16 -07:00
Zach Copley 94c858d1e1 * Show group descriptions in group directory
* Truncate descriptions and bios in directory list when > 140c
2011-05-05 14:57:38 -07:00
Evan Prodromou e863903263 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 14:45:50 -07:00
Evan Prodromou 78a9d4966e set the permissions properly for installer 2011-05-05 14:38:19 -07:00
Siebrand Mazeland d4aef7a007 Localisation updates from http://translatewiki.net. 2011-05-05 23:24:49 +02:00
Evan Prodromou 763229aede Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-05-05 12:09:10 -07:00
Siebrand Mazeland 30bb740642 Hardcode newline outside of message to avoid issues with translations as fixed by Evan in Commit:6868bf461a5186be3eac619b73cc6550c6048f93. 2011-05-05 12:41:10 +02:00
Evan Prodromou c7511094db Merge branch '1.0.x' into testing 2011-05-04 18:45:23 -07:00
Zach Copley c4aef15a15 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-04 16:13:42 -07:00
Zach Copley f4a06719b1 Fix WSOD with EmailRegistration plugin's confirmation form 2011-05-04 16:12:49 -07:00
Evan Prodromou 67690b44c5 Merge branch '1.0.x' into testing 2011-05-04 15:00:50 -07:00
Evan Prodromou c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou 900b9ab498 Merge branch '1.0.x' into testing 2011-05-04 13:05:06 -07:00
Evan Prodromou 7e1ae44fad source for registration email confirmation 2011-05-04 12:25:34 -07:00
Evan Prodromou aef62ccbcc Option for custom template for confirmation email 2011-05-04 11:37:32 -07:00
Evan Prodromou 1b5bd8991b use a template for confirmation email 2011-05-04 11:37:03 -07:00
Evan Prodromou b432cc72c9 optionally send welcome email in installforemail.php 2011-05-04 11:10:21 -07:00
Evan Prodromou 914de296a1 send a confirmation email when registering by script 2011-05-04 11:05:38 -07:00
Evan Prodromou 784da5d231 Make EmailRegistration respect registration flags
The email registration code wasn't respecting site-closed or
site-inviteonly flags. This is fixed.
2011-05-02 19:12:29 -07:00
Evan Prodromou fde6e672cf Fix error in domainstatusnetworkinstaller that cleared tags table
An error in the domainstatusnetworkinstaller cleared the tags table,
losing any information about sites on the service. (We discovered this
in production on StatusNet OnDemand). Conjunction of these factors: 1)
the installer code was using an insert()'ed object with an
auto-incrementing key, which because the statusnet.ini was incorrect,
wasn't getting updated. 2) It then called setTag() on that object,
which deletes all tags matching the id, then adds in the new ones. 3)
Because the ID was null, DB_DataObject deleted all rows in the table.

I've made a work-around that re-fetches the status_network object
based on its (unique) nickname, which gets the correct ID, which
should work for tags. Confirmed that it works. Still need to fix the
underlying problems, however.
2011-05-02 18:51:09 -07:00
Evan Prodromou 1e2d317b9c remove action-specific from RequireValidatedEmail 2011-05-02 11:21:37 -07:00
Evan Prodromou 6464c77505 fix warning for logs 2011-04-29 12:48:41 -07:00
Evan Prodromou 6868bf461a whitespace problems in directory translations 2011-04-29 11:11:04 -07:00
Siebrand Mazeland e573d4b3a4 Simplify message. 2011-04-29 19:23:13 +02:00
Siebrand Mazeland 558a512ac7 Update translator documentation.
Update L10n.
Update whitespace.
2011-04-29 19:22:44 +02:00
Siebrand Mazeland 4651c9d94a Fix L10n/i18n.
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
2011-04-29 18:59:47 +02:00
Siebrand Mazeland c13fbfb2d2 Update i18n,
Add onPluginVersion().
Add translator documentation.
Update whitespace.
2011-04-29 17:11:22 +02:00
Siebrand Mazeland 1ec1f9378a Whitespace updates.
Translator documentation.
2011-04-29 12:30:30 +02:00
Zach Copley cb6b5b2cc6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  more verbose, better checks for installforemail
  Check for unavailable site nicknames in DomainStatusNetwork
  Status_network::setupDB() sets up related tables too
  Class to store unavailable status network names
  First version of installer for domain-based status networks
  Ignore empty email whitelist string
  Don't redefine 'STATUSNET' in installer
  move registeremailuser.php back to email registration
  Move common domain-to-network mapping to the plugin module
  move external libs for domains here
  move domain status network scripts
  Revert "Add DomainStatusNetwork plugin"
  add DomainStatusNetwork plugin
  Add DomainStatusNetwork plugin
  utility functions for setting config options in memory
  get a free site nickname by email or domain
  TLD utilities
  script to determine site nickname by domain
  lookup a statusnetwork by tag
2011-04-28 15:54:13 -07:00
Zach Copley cd0d7be251 Add registration events to EmailregisterAction 2011-04-28 15:53:17 -07:00
Evan Prodromou 83819737d7 more verbose, better checks for installforemail 2011-04-28 15:30:59 -07:00
Evan Prodromou ddead1e611 Check for unavailable site nicknames in DomainStatusNetwork 2011-04-28 15:30:23 -07:00
Evan Prodromou 02c5d68bed Merge branch 'emailsitesetup' into 1.0.x 2011-04-28 12:44:21 -07:00
Evan Prodromou f24af19b79 First version of installer for domain-based status networks
New installer class for domain-based status networks. (XXX: this should
probably be generalized for all multi-home systems). New script to run that
installer.
2011-04-28 12:39:59 -07:00
Evan Prodromou b63c0c3c72 Ignore empty email whitelist string 2011-04-28 12:39:23 -07:00
Craig Andrews d9d9a10b6f Fix infinite scroll to work on 1.0.x
add on_next_only configuration option
2011-04-28 13:26:15 -04:00
Evan Prodromou 1946eba7f4 move registeremailuser.php back to email registration 2011-04-27 14:54:21 -07:00
Evan Prodromou b6bad0232e Move common domain-to-network mapping to the plugin module 2011-04-27 14:48:26 -07:00
Zach Copley bfc3cc9461 Fix URLs to reflect change in reCAPTCHA API 2011-04-27 19:48:25 +00:00
Zach Copley 2d420b4661 Fix URLs to reflect change in reCAPTCHA API 2011-04-27 19:40:43 +00:00
Evan Prodromou 20e588d212 move external libs for domains here 2011-04-27 14:38:47 -04:00
Siebrand Mazeland 0df111025f Update translator documentation.
L10n/i18n fixes.
Update whitespace.
2011-04-27 20:37:44 +02:00
Siebrand Mazeland 940af215b4 Remove locale files. Plugin no longer has a UI.
Whitespace update.
2011-04-27 19:31:02 +02:00
Siebrand Mazeland 5d72b600a1 Localisation updates from http://translatewiki.net. 2011-04-27 14:53:02 +02:00
Siebrand Mazeland 1bc62a8545 Fix typo. Spotted by Peter17. 2011-04-27 14:13:49 +02:00
Evan Prodromou 32cb8b1304 move domain status network scripts 2011-04-26 17:48:01 -04:00
Evan Prodromou 6576dbdf43 Revert "Add DomainStatusNetwork plugin"
This reverts commit 4479e7efc7.
2011-04-26 16:52:04 -04:00
Evan Prodromou 74e8409fad add DomainStatusNetwork plugin 2011-04-26 16:51:49 -04:00
Evan Prodromou 4479e7efc7 Add DomainStatusNetwork plugin 2011-04-26 16:51:05 -04:00
Evan Prodromou 57d1a3dcc0 get a free site nickname by email or domain 2011-04-26 16:17:24 -04:00
Evan Prodromou c79a53f341 TLD utilities 2011-04-26 16:16:25 -04:00
Evan Prodromou 260f6ccdf2 script to determine site nickname by domain 2011-04-26 16:16:10 -04:00