Commit Graph

3412 Commits

Author SHA1 Message Date
Siebrand Mazeland d756242f64 Add translator documentation.
L10n/i18n fixes.
Whitespace updates.
2011-08-19 17:39:39 +02:00
Siebrand Mazeland edd8045375 Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK. 2011-08-18 15:11:10 +02:00
Siebrand Mazeland 30d0a1d3d9 Simplify message. 2011-08-18 14:21:43 +02:00
Siebrand Mazeland 5115aa3e4c tag -> list 2011-08-15 16:03:24 +02:00
Siebrand Mazeland 6319003a34 Change "stream" to "timeline" for consistency. 2011-08-15 15:57:36 +02:00
Evan Prodromou e274ec4900 Merge branch 'testing' into 1.0.x 2011-07-18 10:45:32 -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 9dc6dc4441 add conversation feed data 2011-07-15 12:55:43 -04:00
Evan Prodromou c579bcae7b conversation API 2011-07-15 12:49:52 -04:00
Zach Copley cd05fc6aee Remove debugging statement 2011-07-07 17:23:41 -07:00
Zach Copley 969a558339 Change a few things around for CORS header output 2011-07-07 17:19:59 -07:00
Zach Copley cb183359e2 Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157 2011-07-07 15:58:28 -07:00
Zach Copley 7150c54a3f Fix invite button for public sites 2011-07-05 17:27:11 -07:00
flyingmana 3c47d158f4 make cors header deactivatable 2011-06-29 22:39:33 +02:00
Evan Prodromou 20396ce8e1 ActivityStreamJSONDocument served as application/stream+json 2011-06-23 11:38:46 -04:00
Evan Prodromou 0755f45bf0 add activitystreams links to other actions 2011-06-22 17:19:46 -04:00
Evan Prodromou e5d8fd6857 Add Activity Streams feeds to export data 2011-06-22 17:09:04 -04:00
flyingmana 62977ad4f2 allow cross-origin requests for xrd 2011-06-21 23:43:53 +02:00
flyingmana 253a55846a allow cross-origin requests for host-meta 2011-06-21 21:59:34 +02:00
Siebrand Mazeland 46546ce985 Add translator documentation. 2011-06-19 12:12:47 +02:00
Siebrand Mazeland 36e07218e9 Remove double tag in comment. 2011-06-19 11:15:31 +02:00
Siebrand Mazeland 47d0c198e1 Fix typo in comment. 2011-06-19 11:11:12 +02:00
Siebrand Mazeland 173d20e1f9 L10n updates. 2011-06-17 22:36:24 +02:00
Siebrand Mazeland b24e4fd9fe Fix typo. Spotted by Nikerabbit. 2011-06-15 13:25:45 +02:00
Siebrand Mazeland d6fe675fbe Update translator documentation per request of Nikerabbit. 2011-06-15 13:25:41 +02:00
Siebrand Mazeland b7aacc0818 Update translator documentation and L10n. 2011-06-15 13:25:40 +02: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
Zach Copley 1f1616223a Allow changing the site logo from the site admin panel 2011-06-09 17:05:17 -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 1b0bafc6cc Move recoverpassword functionality to User 2011-06-07 11:22:19 -04:00
Evan Prodromou 9a11003c08 add oauth_token_association to core.php so it gets set up correctly 2011-06-02 10:04:00 -04:00
Evan Prodromou 412adfb587 Merge branch '1.0.x' into testing 2011-05-30 15:37:46 -04:00
Evan Prodromou d544c78276 correctly get profile for scope in apitimelinementions 2011-05-30 15:29:18 -04:00
Evan Prodromou 650af0a271 get the correct context for apitimelinementions 2011-05-30 15:09:42 -04:00
Evan Prodromou d44000077d use ReplyNoticeStream for mentions API 2011-05-30 11:22:52 -04:00
Evan Prodromou 5a9d969f22 use ReplyNoticeStream for replies page 2011-05-30 11:22:36 -04:00
Evan Prodromou 32f47004df get correct profile for friends timeline 2011-05-25 12:51:21 -04:00
Siebrand Mazeland 4aaba2d5f4 Superfluous whitespace removed. 2011-05-20 16:57:21 +02: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 d906ee1bcb Update translator documentation and L10n. 2011-05-05 12:47:26 +02:00
Evan Prodromou c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou be57e253fb 'Home' to 'Home timeline' 2011-05-04 10:49:46 -07:00
Evan Prodromou f67607d2f1 change 'You and friends' to 'Home' 2011-05-04 10:48:12 -07:00
Evan Prodromou 90eb09624c let users login with email address 2011-05-02 15:17:08 -07:00
Zach Copley 8cc5c175da Fix broken event names 2011-04-27 17:40:51 -07:00
Siebrand Mazeland a2e4a1803c Harmonize message for 'User has no profile.' and update translator documentation. 2011-04-25 22:44:19 +02:00
Siebrand Mazeland 69e1bd3a58 Fix incorrect UI message. Spotted by Nike. 2011-04-24 19:57:47 +02:00
Evan Prodromou f38a8abd34 re-enable invite button and popular notice section on home stream 2011-04-23 13:45:43 -04:00
Evan Prodromou 07d164f8bd disable fancy stuff in home sidebar 2011-04-22 09:26:42 -04:00
Evan Prodromou 0c0aabeda5 show tag cloud in public stream 2011-04-20 17:17:36 -04:00
Evan Prodromou 776c2c99ea inbox tag cloud section 2011-04-20 16:11:42 -04:00
Evan Prodromou a7a521e46a Change avatar size on single notice page 2011-04-20 15:47:44 -04:00
Evan Prodromou 5650a6e9f7 Just use avatarSize() method for SingleNoticeItem 2011-04-20 13:39:23 -04:00
Evan Prodromou 24e1491582 don't override show() in SingleNoticeItem 2011-04-20 13:38:13 -04:00
Evan Prodromou 9b65efd64d don't show notice attachments in single-notice view 2011-04-20 13:37:05 -04:00
Samantha Doherty f7ffe1df86 Restore local nav to single notice and attachment pages. 2011-04-19 13:28:27 -04:00
Evan Prodromou 138ca38b6f Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
	plugins/EmailRegistration/emailregister.php
2011-04-18 20:19:25 -04:00
Siebrand Mazeland 2c105e5575 Update translator documentation. 2011-04-19 01:13:28 +02:00
Evan Prodromou 98b3f5ea91 no extra nulls on home page 2011-04-18 16:28:41 -04:00
Evan Prodromou 7a333e3175 recover password uses login menu 2011-04-18 16:19:00 -04:00
Evan Prodromou 9346d50102 inviter URL corrected 2011-04-18 13:40:27 -04:00
Evan Prodromou 122b38f354 check for valid email on invite 2011-04-18 13:26:46 -04:00
Evan Prodromou d3215adfa1 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-18 12:54:23 -04:00
Evan Prodromou 17adc94df7 DocFile::fromTitle() -> DocFile::forTitle() 2011-04-18 10:10:38 -04:00
Evan Prodromou c30dcbebbc no notice form on invites 2011-04-18 10:04:57 -04:00
Evan Prodromou 4a8a424bdf Use mail templates for invite text 2011-04-18 09:04:11 -04:00
Evan Prodromou ef67262a3f Externalize document-finding code so plugins can use it 2011-04-18 06:16:32 -04:00
Siebrand Mazeland cb28496054 Update people tag related UI messages.
Update translator documentation accordingly.
2011-04-17 23:28:11 +02:00
Siebrand Mazeland 4ab995dd1e Complete "people tag" to "list" in UI messages.
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Siebrand Mazeland d68a86f019 people tag -> list 2011-04-17 02:15:17 +02:00
Siebrand Mazeland 049f23cdb3 people tag -> list 2011-04-17 02:11:46 +02:00
Siebrand Mazeland 271881d4dc Fix translator documentation. 2011-04-17 02:09:47 +02:00
Siebrand Mazeland f1316677d8 Add forgotten comment tag. 2011-04-17 02:06:17 +02:00
Siebrand Mazeland c74adb5401 Fix typo in comment. 2011-04-17 00:53:29 +02:00
Evan Prodromou d9f27fcb14 move Invite button to top 2011-04-16 16:12:04 -04:00
Evan Prodromou 3ba4258f9e use notice list instead of threaded for list view 2011-04-15 18:56:24 -04:00
Evan Prodromou 9eafc8d0ba use threadingnoticestream for groups 2011-04-15 18:54:35 -04:00
Evan Prodromou ee81f98828 use threadingnoticestream for inbox 2011-04-15 18:51:18 -04:00
Evan Prodromou 52fce18e0a use threading notice stream wrapper for public 2011-04-15 18:47:56 -04:00
Zach Copley da6822c1f0 Merge branch 'lists_fixes' into 1.0.x 2011-04-15 20:50:04 +00:00
Shashi Gowda b78e5de474 Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists. 2011-04-16 00:52:58 +05:30
Siebrand Mazeland 55b58f0f1f Update translator documentation. 2011-04-15 10:20:34 +02:00
Siebrand Mazeland 44bdc2ddaf Remove obsolete code.
Update translator documentation.
2011-04-15 10:12:49 +02:00
Zach Copley 335390f2ca Merge branch 'onboarding-remix' into 1.0.x
* onboarding-remix:
  * Show the right menus in the aside after successful registration * Events surrounding successful registration output
2011-04-14 15:46:40 -07:00
Zach Copley 951ee1faff * Show the right menus in the aside after successful registration
* Events surrounding successful registration output
2011-04-14 15:45:05 -07:00
Evan Prodromou 3df69fe5ba show invite button in public 2011-04-14 18:19:59 -04:00
Evan Prodromou 0cc73b3b2a show invite button section on home page 2011-04-14 18:19:18 -04:00
Evan Prodromou 93bfacad3b no object nav for invite 2011-04-14 18:15:47 -04:00
Evan Prodromou 9ef13976fc Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 16:09:18 -04:00
Evan Prodromou 4bda1b2a36 groups show same aside as profile 2011-04-14 15:53:18 -04:00
Evan Prodromou b8a057bc2d hide subscription tag sections 2011-04-14 15:51:07 -04:00
Evan Prodromou f1da1a24d1 hide subscriber tag sections 2011-04-14 15:51:00 -04:00
Shashi Gowda 53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Evan Prodromou 8def44bc57 no object nav for showstream 2011-04-14 15:47:01 -04:00
Shashi Gowda 22f6151a10 Annihilate profile_tag_inbox. 2011-04-14 19:45:31 +00:00
Evan Prodromou 4b5cbea16a no popular notice section for tags 2011-04-14 15:33:59 -04:00
Evan Prodromou c7a4aaddfc show correct preview URL and hide delete button if avatar is not local 2011-04-14 11:47:55 -04:00
Zach Copley 03de85ed46 Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them. 2011-04-12 14:20:19 -07:00
Zach Copley 5454d22b79 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Show both empty and full notice search results inside event wrapper
  More interesting test notices in createsim.php
2011-04-12 11:55:01 -07:00
Zach Copley fcd863bba9 Theming - add some new markup to DM and new notice pages 2011-04-12 11:54:12 -07:00
Evan Prodromou 606884385c Show both empty and full notice search results inside event wrapper 2011-04-12 14:29:12 -04:00
Evan Prodromou 4331b8b4f1 make search results privacy-aware 2011-04-11 18:59:58 -04:00
Evan Prodromou 9c424cb7e6 events for validating outgoing invites 2011-04-11 16:49:28 -04:00
Evan Prodromou 25c5a1f0ef hooks for adding email addresses 2011-04-11 16:38:57 -04:00
Evan Prodromou d197c86a61 show full threaded notice list in conversation view 2011-04-11 12:39:06 -04:00
Evan Prodromou 1b00eb2599 Fix undefined variable in showgroup 2011-04-11 11:54:42 -04:00
Evan Prodromou 820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Evan Prodromou 19bd6fded4 pass user profile to ThreadedNoticeList in PublicAction 2011-04-11 11:18:12 -04:00
Siebrand Mazeland abbe0cf4ab Add space between two sentences. 2011-04-11 15:25:43 +02:00
Evan Prodromou 70faf76001 threadednoticelist takes a profile param 2011-04-10 20:16:51 -04:00
Evan Prodromou 5304373b0b Merge branch '1.0.x' into testing 2011-04-10 14:20:46 -04:00
Siebrand Mazeland f0d762f196 Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.

Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
Zach Copley e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Evan Prodromou cfff80a730 If you search for a tag, redirect to tag page 2011-04-09 17:30:59 -04:00
Siebrand Mazeland 5a377a24c9 Fix incorrect translator documentation. Spotted by OsamaK. 2011-04-09 21:08:41 +02:00
Shashi Gowda f47027abbe Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Evan Prodromou 9a86e64b46 use conversationnoticestream in conversationrepliesaction 2011-04-08 18:03:42 -04:00
Evan Prodromou 79f3c0939b use conversationnoticestream in conversationaction 2011-04-08 18:03:34 -04:00
Shashi Gowda 4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Sam Nicholls 4bf5158d43 Modified actions/login.php to redirect logged in users who hit login/ to
the site index.

Removed the throwing of a clientError in favour of a common_redirect to
index to fix Issue 2990: "If logged in, just redirect to home page on
/login"
2011-04-08 12:06:55 +01:00
Shashi Gowda c44a94e8f5 Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS. 2011-04-08 14:51:05 +05:30
Evan Prodromou fbc18a3c67 change apitimelinehome to use InboxNoticeStream 2011-04-07 15:35:00 -04:00
Evan Prodromou 831eaa039b use inboxnoticestream in RSS 1.0 2011-04-07 15:28:25 -04:00
Evan Prodromou 328373e29c use inboxnoticestream in API 2011-04-07 15:28:09 -04:00
Evan Prodromou 5dfb8e2bc4 Use InboxNoticeStream class for inbox
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
Shashi Gowda ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	js/util.min.js
	lib/default.php
2011-04-07 23:13:45 +05:30
Evan Prodromou 36b331d469 Merge branch '1.0.x' into testing
Conflicts:
	plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou 7533c7cfe1 Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
This reverts commit 880661de4e.
2011-04-05 12:53:49 -04:00
Shashi Gowda ced00cf0bd Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-05 10:28:05 +05:30
Evan Prodromou b41c62a27c single flag for private groups 2011-04-04 16:58:52 -04:00
Shashi Gowda 57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
Siebrand Mazeland 2dbdb0f185 Translator documentation updated/added.
i18n tweaks.
Superfluous whitespace removed.

YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
Siebrand Mazeland 84a2fb44b9 Add/update translator documentation. 2011-04-04 00:12:52 +02:00
Siebrand Mazeland 9a6ee5e859 Update translator documentation. 2011-04-03 23:47:46 +02:00
Siebrand Mazeland 436a02959c Tabs to spaces. 2011-04-03 22:44:41 +02:00
Siebrand Mazeland c17d8e0f5f Update translator documentation.
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
Siebrand Mazeland f64c312942 Update translator documentation. 2011-03-31 22:48:03 +02:00
Siebrand Mazeland 4292fa1fc4 Tweak page titles. Thanks @evan for thinking with me. 2011-03-31 22:43:57 +02:00
Evan Prodromou f70bcbdb6b save private stream values 2011-03-30 16:23:13 -04:00
Shashi Gowda 5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
2011-03-30 15:47:42 +05:30
Brion Vibber 20ca5027cc Consolidate common code in micro-apps custom notice type display actions.
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
Brion Vibber 674e3c2a0e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/apistatusesretweet.php
	actions/repeat.php
	classes/Notice.php
	lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber 9adbb49fc9 Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)

These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Siebrand Mazeland 0a19674c9f @evan Fixed message domain for messages in plugins for recent commits.
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber 880661de4e Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view. 2011-03-29 15:40:07 -07:00
Evan Prodromou 9f1603462d Merge branch 'limitdist2' into 1.0.x 2011-03-29 17:32:17 -04:00
Siebrand Mazeland ede8fabb55 Fix incorrect translator documentation. Spotted by AVRS. 2011-03-29 23:14:40 +02:00
Siebrand Mazeland 700018fd09 L10n/i18n updated.
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Siebrand Mazeland a8af04feea Update translator documentation.
Superfluous whitespace removed.
L10n consistency updates.
2011-03-29 21:30:36 +02:00
Siebrand Mazeland f2d7c33ad3 Update translator documentation.
Remove superfluous whitespace.
Various L10n/i18n updates.
2011-03-29 21:30:35 +02:00
Evan Prodromou 32145484c2 Disallow repeats (retweets) of private notices
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.

Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou 7b8fc701e0 don't show notices to out-of-scope viewers 2011-03-28 22:21:41 -04:00
Evan Prodromou e862dcdb8a Merge branch '1.0.x' into limitdist2 2011-03-28 21:56:34 -04:00
Brion Vibber e5b5c256a3 Working subscription approval! 2011-03-28 17:08:04 -07:00
Brion Vibber df5def8ce4 Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet. 2011-03-28 15:13:59 -07:00
Brion Vibber 11b40ddb1b work in progress... 2011-03-28 13:59:48 -07:00
Evan Prodromou 798b03fb5f set default address for showstream 2011-03-28 16:24:28 -04:00
Evan Prodromou a7380d5933 set default address for showgroup 2011-03-28 16:24:17 -04:00
Evan Prodromou 5147404ea2 ToSelector widget to send private notices
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
Siebrand Mazeland 52d29a17a0 Fix incorrect translator documentation. Spotted by AVRS. 2011-03-28 01:43:01 +02:00
Evan Prodromou 889b35be9c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-27 11:26:57 -04:00
Evan Prodromou c7defb32f9 NoticeForm constructor takes array of optional parameters
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
Siebrand Mazeland 1adaa6a2ab Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way. 2011-03-27 13:05:24 +02:00
Siebrand Mazeland 074be0d51e i18n fixes.
Translator documentation updates.
2011-03-25 17:12:53 +01:00
Siebrand Mazeland e0cccfc40d Translator documentation updated.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.
2011-03-24 12:09:50 +01:00
Siebrand Mazeland 78edb4bf56 Update translator documentation.
Remove superfluous whitespace.
L10n/I18n updates.
FIXMEs added for missing documentation or headers.
2011-03-24 11:48:53 +01:00
Siebrand Mazeland 3be26565fb Update translator documentation.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
Brion Vibber 265f9af6f7 Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons... 2011-03-23 15:21:12 -07:00
Evan Prodromou 83fb5e6023 Mass replacement of #-comments with //-comments
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Shashi Gowda 13e9e41d2f Blend in with some new code. New menus, etc. 2011-03-22 08:30:16 +05:30
Shashi Gowda bf121a695a Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda 31c1177970 Merge branch '1.0.x' into people_tags_rebase
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber 942887ca8c Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working. 2011-03-21 17:17:18 -07:00
Brion Vibber 6bdb1053ad Pending members queue list -- doesn't yet allow approval. 2011-03-21 16:40:10 -07:00
Brion Vibber 471a480587 Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests. 2011-03-21 16:26:41 -07:00
Brion Vibber 541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber 0bec9cfdbc Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
Siebrand Mazeland 84e5ca6158 Translator documentation added/updated.
Superfluous whitespace removed.
L10n update.
2011-03-18 20:37:04 +01:00
Siebrand Mazeland 902990bb72 Add myself to contributors array. 2011-03-18 20:15:57 +01:00
Siebrand Mazeland 7ef8bd9275 i18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 20:12:59 +01:00
Siebrand Mazeland 8a2002afe7 Translator documentation added/updates.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 17:04:38 +01:00
Siebrand Mazeland b7178d2197 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x 2011-03-18 16:09:27 +01:00
Siebrand Mazeland 0de0ae2f48 Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 13:48:47 +01:00
Siebrand Mazeland 6f9c277494 * Add FIXME: $profile appears to be undefined.
* Update translator documentation.
2011-03-18 13:10:55 +01:00
Brion Vibber 4afa3caae3 ajax load for additional inline replies; /replies variant of conversationview 2011-03-17 16:27:42 -07:00
Evan Prodromou 7cf12f093e Merge branch '1.0.x' into testing
Conflicts:
	lib/common.php
2011-03-17 09:20:32 -04:00
Siebrand Mazeland b74a7d7a75 Change email to SMS. Spotted by Nikerabbit. 2011-03-17 13:59:22 +01:00
Siebrand Mazeland 9785140da5 Update translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-17 11:46:49 +01:00
Brion Vibber 0bf40bd748 Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view.
Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
2011-03-16 14:54:14 -07:00
Brion Vibber 5ec018ca19 Fix tag nesting bug on group page 2011-03-16 10:58:18 -07:00
Evan Prodromou 9b4533058c no profileblock on login actions 2011-03-16 10:05:07 -04:00
Evan Prodromou bbba1f6e16 Show group actions in profile block 2011-03-16 09:57:10 -04:00
Evan Prodromou 2d4554ea03 Remove UserProfile class 2011-03-16 09:57:10 -04:00
Evan Prodromou 561458650f profile group uses account profile block 2011-03-16 09:57:09 -04:00
Brion Vibber 08b430a247 Event hook for notice search pages 2011-03-15 15:33:37 -07:00
Brion Vibber e985a41a7e Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input.
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
2011-03-15 10:11:13 -07:00
Brion Vibber 9e9cbdf505 Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input.
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
2011-03-15 10:09:20 -07:00
Brion Vibber 34e7d8ddf2 For good measure; trip short error mode in earlier on ajax shownotice 2011-03-14 13:44:39 -07:00
Brion Vibber c7e7cc79da 'ajax' param on shownotice action so we can pull items in full html version for realtime 2011-03-14 13:05:30 -07:00
Siebrand Mazeland eaef01233a Fix incorrect parameter documentation. Spotted by Nikerabbit. 2011-03-14 18:01:22 +01:00
Siebrand Mazeland e2defc1f7c * update/add translator documentation.
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
Zach Copley a984aae564 Show a reasonable error message when an image is bad, instead of
letting the exception continue bubbling up.
2011-03-10 15:18:14 -08:00
Zach Copley b7548fb9e2 Show a reasonable error message when an image is bad, instead of
letting the exception continue bubbling up.
2011-03-10 18:14:22 +00:00
Brion Vibber 4d5f8e7876 Ticket #3076: fix regression in password recovery when email address given that doesn't match
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:48:46 -08:00
Brion Vibber e74590d414 Ticket #3076: fix regression in password recovery when email address given that doesn't match
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:46:24 -08:00
Evan Prodromou a4b3edaf40 Login actions don't show the notice form 2011-03-09 10:11:59 -05:00
Brion Vibber 5b0ca315b4 'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D 2011-03-08 10:58:14 -08:00
Evan Prodromou 55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Shashi Gowda 382e4d2cdb people tag actions 2011-03-07 00:43:31 +05:30
Shashi Gowda 371e923c37 Twitter lists compatible people tags api 2011-03-07 00:36:06 +05:30
Siebrand Mazeland e9933871e5 * fix i18n and L10n issues.
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01:00
Siebrand Mazeland a127ba78a8 * translator documentation updated.
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
2011-03-05 00:24:19 +01:00
Siebrand Mazeland b37e12ed34 * translator documntation updated
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
Brion Vibber 9689bda21c Loading the original form instead of faking up our own. Sorta works but not pretty :D 2011-03-04 14:11:11 -08:00
Siebrand Mazeland d55a831d97 Update translator documentation. 2011-03-03 01:42:54 +01:00
Siebrand Mazeland 399c83db87 Fix typo in documentation. Spotted by Nikerabbit. 2011-03-02 23:06:45 +01:00
Brion Vibber 8cacecb6dc Use threaded replies in group inbox view 2011-03-01 16:29:11 -08:00
Zach Copley 5bf0c9f610 Fix mising require_once (now required here because of rearranging) 2011-03-01 15:31:06 -08:00
Zach Copley 243b396660 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-01 15:26:02 -08:00
Zach Copley 2fb8148788 Fix missing variable initialization 2011-03-01 15:25:06 -08:00
Brion Vibber a7005f3975 Alternate Inbox streaming function optimized for threaded paging (for /all stream, while things using the existing API inbox methods won't be affected) 2011-03-01 15:16:39 -08:00
Evan Prodromou 64a1c9e376 object menu for user profile 2011-03-01 16:23:19 -05:00
Evan Prodromou a1a0382d26 object menu on showgroup 2011-03-01 16:22:19 -05:00
Evan Prodromou 374253f0f7 defaultlocalnav for favorites 2011-03-01 16:21:22 -05:00
Evan Prodromou 55fa14baec object menu in inviteaction 2011-03-01 16:20:14 -05:00
Evan Prodromou 6ee77f1302 defaultlocalnav in groups 2011-03-01 16:18:33 -05:00
Evan Prodromou f29274cd0d show defaultlocalnav in groupmembers 2011-03-01 16:17:42 -05:00
Evan Prodromou 0c877860b5 show defaultlocalnav in grouplogo 2011-03-01 16:17:01 -05:00
Evan Prodromou 4903c92dce show defaultlocalnav in groupdesignsettings 2011-03-01 16:15:03 -05:00
Evan Prodromou 0850c66a21 default local nav in featured user list 2011-03-01 16:11:59 -05:00
Evan Prodromou 3c683ad7b5 default local nav in popular notices 2011-03-01 16:11:19 -05:00
Evan Prodromou 4561caec10 show default local nav in group edit 2011-03-01 16:10:40 -05:00
Evan Prodromou 737eb371f8 show full local nav in public tag cloud 2011-03-01 16:09:35 -05:00
Evan Prodromou 85320a7561 show object nav for blocked users in a group 2011-03-01 16:08:49 -05:00
Evan Prodromou efdc85224a user groups show subgroupnav in object menu area 2011-03-01 16:07:27 -05:00
Evan Prodromou 3377bc2ccf RepliesAction uses default local nav 2011-03-01 16:06:29 -05:00
Evan Prodromou 64ab7b7d07 use default local nav for public action 2011-03-01 16:00:07 -05:00
Evan Prodromou 8c03e8b0b3 use default local nav for allaction 2011-03-01 15:59:01 -05:00
Brion Vibber b351fad43a Merge branch '1.0.x' into inline-comments 2011-02-28 16:48:05 -08:00
Zach Copley e109b2592f Merge branch '0.9.x' into 1.0.x 2011-02-28 16:41:24 -08:00
Brion Vibber 59a0b2a82d Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments
Conflicts:
	js/util.min.js
2011-02-28 16:18:38 -08:00
Zach Copley f3ffc8bc46 Missed a couple of conflicts 2011-02-28 15:51:46 -08:00
Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Brion Vibber d806907b81 Initial test threaded convo view inline on public, all timelines 2011-02-28 11:53:48 -08:00
macno dc41e3dc2d API group actions join/leave now handle same events of web UI action 2011-02-28 11:56:02 +01:00
macno c246c17d3e If there's a DB error, script returns after catching the exception 2011-02-28 11:53:11 +01:00
Brion Vibber 880b1b666e Merge branch 'master' into 0.9.x 2011-02-25 12:24:18 -08:00
Brion Vibber 55b1f3d84c Scalability work on user backup stream generation.
UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.

Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.

There should be a better way to do this, swapping out the stringer output for raw output more consitently.
2011-02-25 12:15:38 -08:00
Brion Vibber 59a413cf5e Merge branch 'master' into 0.9.x 2011-02-25 10:16:00 -08:00
Brion Vibber f3c822cc15 Ticket #3011: Add attachments/uploads and attachments/file_quota to api/statusnet/config.(xml|json)
file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled.
This can be used by client apps to determine maximum size for an attachment.
2011-02-21 15:52:12 -08:00
Brion Vibber 8e7c279c9e Fix issue #3035: search highlighting broke URLs in some imported messages (Twitter)
Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values.
This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex.
I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.
2011-02-21 14:14:32 -08:00
Zach Copley 68017392ff Make other timeline API endpoints output Activity Streams JSON 2011-02-18 15:43:40 -08:00
Zach Copley e98e443605 Merge branch '0.9.x' into json-activities
* 0.9.x:
  * update translator documentation. * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.
  * update translator documentation. * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms
  Localisation updates from http://translatewiki.net.
  Double quotes to single quotes.
  * improve L10n consistency for English. For example proper punctuation for all button and label titles. * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace.
  add path separators for Plugin::path()
  argument to send email summary to all users on all sites
  fix indentation in siteemailsummaryhandler
  fix indentation in sendemailsummary.php
  fix indentation in Email_summary_status.php
  fix indentation in EmailSummaryPlugin.php
  fix indentation in usermailsummaryhandler.php
2011-02-17 19:11:29 -08:00
Siebrand Mazeland 6a1b0e2375 * update translator documentation.
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.
2011-02-17 21:10:48 +01:00
Siebrand Mazeland 65045a26f3 * update translator documentation.
* remove superfluous whitespace.
* L10n updates.
* small refactoring in publicrss.php.
* remove PHP4-isms
2011-02-17 20:58:22 +01:00
Siebrand Mazeland db4213a9e0 Double quotes to single quotes. 2011-02-17 09:58:07 +01:00
Zach Copley e4d5c47ebf Add image to JSON ActivityObject and title + links to the JSON document 2011-02-16 16:21:46 -08:00
Siebrand Mazeland a159352b65 * improve L10n consistency for English. For example proper punctuation for all button and label titles.
* fix some i18n bugs (in-message variables).
* update/add translator documentation.
* remove superfluous whitespace.
2011-02-17 00:40:47 +01:00
Zach Copley a1b436a8c6 First cut at some JSON Activity Streams output 2011-02-15 20:25:39 -08:00
Evan Prodromou 2b869fa23f Merge remote branch 'origin/master' 2011-02-14 12:41:52 -05:00
Evan Prodromou 40533ee851 backup action is read-only 2011-02-14 12:41:20 -05:00
Brion Vibber 30eddaf168 Update translator comment for the url shortener "free service" marker: free as in open 2011-02-11 14:11:37 -08:00
Evan Prodromou e903ff0525 Make ShowmessageAction not be a subclass of MailboxAction
The ShowmessageAction was using the MailboxAction to do its display of
a single direct message. Since we redid the nickname management, this
was breaking (MailboxAction requires a nickname argument,
ShowmessageAction does not, and nickname validation that used to
quietly fail now throws an exception).

I've moved the message list processing to its own widget class, so the
need to subclass MailboxAction has disappeared. I've rewritten this
action to use the MessageListItem widget, and it works fine now.
2011-02-08 11:33:36 -05:00
Evan Prodromou f500d4ea5b Create and use MessageList widget
Our mailbox actions (inbox and outbox) were doing their own display of
messages. This was causing issues with especially showmessage, which
since the more rigourous nickname checks were added, no longer works as
a mailbox subclass.

I've taken the time to rip out the message listing code from MailboxAction
and moved it to a MessageList widget. The different mailboxes now have their
own subclasses that show the correct profile in the list.
2011-02-08 11:11:21 -05:00
Evan Prodromou b41816fdc1 add hooks for Group profile information 2011-02-07 14:04:58 -05:00
Evan Prodromou 8b20399932 Add a hook for group action list 2011-02-07 10:23:56 -05:00
Evan Prodromou 2cdba23df4 hook for new group through a form, same as editing 2011-02-03 16:19:41 -05:00
Evan Prodromou 99db745f9d Merge branch 'testing' into privategroup
Conflicts:
	lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Brion Vibber b46ce3b67d Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switch to single-quote to fix. 2011-01-31 14:00:22 -08:00
Brion Vibber 9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00
Siebrand Mazeland f41dcb644c Update translator documentation, remove FIXME and add comment. 2011-01-31 18:43:39 +01:00
Siebrand Mazeland 13991f7eb9 * add/update translator documentation.
* remove superfluous whitespace.
* update punctuation on form validation messages.
* L10n tweaks.
* add fixme for missing class documentation.
2011-01-31 18:16:55 +01:00
Siebrand Mazeland dd5721848f * tag i18n issue.
* add translator documentation.
* remove superfluous whitespace.
2011-01-31 17:12:39 +01:00
Siebrand Mazeland 8f776ec12d * update/add translator documentation.
* fix L10n issues.
* update comments and tag missing documentation on some classes.
* remove superfluous whitespace
*
2011-01-31 16:39:54 +01:00
Siebrand Mazeland 691f374a52 * Add/update translator documentation.
* Update punctuation in form validation message for consistency.
* Remove superfluous whitespace.
2011-01-30 19:01:55 +01:00
Siebrand Mazeland 7db24c32d6 * fix some i18n and L10n issues
* update/add translator documentation
* remove superfluous whitespace
2011-01-29 00:33:13 +01:00
Evan Prodromou 5fee38b025 events for modifying group edit form 2011-01-26 18:21:43 -07:00
Brion Vibber 54e98ffe22 Fix ticket #3013: MAX_FILE_SIZE hidden fields were incorrectly placed
In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.
2011-01-26 15:49:57 -08:00
Brion Vibber 621a7cb36d Merge branch '0.9.x' into testing 2011-01-25 12:57:49 -08:00
Brion Vibber 0a3c05feb0 Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures. 2011-01-24 12:41:30 -08:00
Brion Vibber 820dd293c9 Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases
Part of the reported issue was previuosly fixed by dc497ed0 (smaller size images being blanked).
This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively)

Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file.
Copying instead of using move_uploaded_file() is fine here since:
a) the files are cleaned up on script completion anyway (vs moving to remove it)
b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing)

ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.)

Recommended for future:
* additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes)
* consolidate type checks and file naming into Avatar class
2011-01-24 12:22:47 -08:00
Evan Prodromou 570c7b63a2 Add internal URL shortener 2011-01-23 16:49:12 -05:00
Evan Prodromou 592e2be5e1 Make new menu the default menu
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.

This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.

Let's put that episode behind us.

The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Siebrand Mazeland 6c0e43be9e L10n consistency updates in wording and punctuation.
Translator documentation added/updated.
Superfluous whitespace removed.
2011-01-21 22:45:37 +01:00
Siebrand Mazeland 08cb576b52 Add translator documentation
Fix L10n issues
Remove superfluous whitespace
2011-01-21 16:35:00 +01:00
Siebrand Mazeland bcd34a7f3c Add correct punctuation for client exceptions. 2011-01-21 10:55:10 +01:00
Siebrand Mazeland ee5479b902 Add correct punctuation for client exception. 2011-01-21 10:55:08 +01:00
Siebrand Mazeland 31895ba33a Add correct punctuation for client exception. 2011-01-21 10:55:07 +01:00
Brion Vibber 6fa0bea76d Merge branch '0.9.x' into testing 2011-01-20 15:12:57 -08:00
Siebrand Mazeland 91ee2ea3b1 Translator comments added
L10n updates
Remove superfluous whitespace
Number parameters in message when two or more are used
ClientException and ServerException should end with a period
2011-01-20 20:00:45 +01:00
Siebrand Mazeland 6658bd1893 Update translator documentation
Remove unneeded i18n for debug message
Remove superfluous whitespace
2011-01-20 18:45:13 +01:00
Siebrand Mazeland 26652d9be6 Update translator documentation
Update L10n
Remove superfluous whitespace
2011-01-20 18:40:20 +01:00
Zach Copley 882b6862a3 OAuth: Fix rare problem in which request tokens were sometimes being
returned as access tokens.
2011-01-19 23:00:24 -08:00
Zach Copley 28f10ac528 Fix syntax error in error msg 2011-01-19 23:00:10 -08:00
Zach Copley 1543af748c Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: (63 commits)
  Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
  fix wrong datatypes (saving string instead of array) in AtomPub notice processing
  Account moving is a background activity
  return a 409 Conflict when subscription already exists
  OStatusPlugin does discovery in Profile::fromURI()
  considerably more logging and error checking in AccountMover
  add a log method to AccountMover
  normalize accounts and check for return in HTTP for moving
  move account-moving classes to their own libraries
  execution protection on discovery.php
  PHPCS discovery.php
  Move discovery library from OStatus plugin to core
  Revert "Revert "0.9.7alpha1""
  first example of moving a user
  Parse properties of links in XRD files
  Add the Atom username to the XRD output
  preserve activities in object
  let callers pass in an XMLOutputter to output to
  execution protection on discovery.php
  PHPCS linkheader.php
  ...
2011-01-19 22:58:07 -08:00
Zach Copley e475bdfe77 OAuth: Fix rare problem in which request tokens were sometimes being
returned as access tokens.
2011-01-19 22:55:00 -08:00
Zach Copley a79427d86f Fix syntax error in error msg 2011-01-19 16:13:42 -08:00
Brion Vibber 4026e208c2 Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
As with deleteuser.php, can pass -y to bypass the prompt if you're sure.
2011-01-19 15:13:46 -08:00
Brion Vibber 64844473f8 fix wrong datatypes (saving string instead of array) in AtomPub notice processing 2011-01-19 14:26:31 -08:00