Commit Graph

3357 Commits

Author SHA1 Message Date
Evan Prodromou c0bae505d9 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-25 18:03:30 -04:00
Samantha Doherty 2dd13b071c Update DirectionDetector style for 1.0 and move to base stylesheet. 2011-08-25 17:14:13 -04:00
Samantha Doherty f0443aff1a Style for Activity notices. 2011-08-25 16:24:54 -04:00
Evan Prodromou 654fdf2fa4 Don't try to read the URLs in system notices 2011-08-25 12:59:40 -04:00
Evan Prodromou 1593c97bc1 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-25 12:34:32 -04:00
Samantha Doherty c54b3311fd Style cleanup for QnA. 2011-08-25 12:25:10 -04:00
Samantha Doherty 85aba15830 Style cleanup for Mobile Profile. 2011-08-25 12:24:09 -04:00
Evan Prodromou 3b4d3c6ac3 actions are directed to affected group or person 2011-08-25 12:18:51 -04:00
Samantha Doherty ab785f612a Make MobileProfile load its own AND theme CSS files if available. 2011-08-25 12:16:40 -04:00
Evan Prodromou 19af3e8ae9 use 'system' for activity notice source 2011-08-25 11:54:26 -04:00
Evan Prodromou 3ff0299531 more accurate activity output for system activities 2011-08-25 11:51:50 -04:00
Evan Prodromou 420e7ddf83 no class for notice content div in systemlistitem 2011-08-24 18:12:26 -04:00
Evan Prodromou 352e66d25a show system list items for fave/unfave 2011-08-24 18:12:02 -04:00
Evan Prodromou 904101b973 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-24 17:17:32 -04:00
Evan Prodromou 3d831ebcfb hide buttons for repeat, delete system activities 2011-08-24 17:17:03 -04:00
Zach Copley 3b1c5e5ac1 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Fix blog plugin error to allow deleting a blog post
  correctly show the blog content for blog entries
2011-08-24 13:57:48 -07:00
Evan Prodromou eef89c6712 Fix blog plugin error to allow deleting a blog post 2011-08-24 15:57:45 -04:00
Evan Prodromou b5c5d8d393 correctly show the blog content for blog entries 2011-08-24 14:57:05 -04:00
Zach Copley f955cf6ace Add timezone indicator to event start time label 2011-08-23 15:43:14 -07:00
Zach Copley 8e2a9bfa5b Initialize DataTime with 'now' instead of 'today' (today doesn't give accurate results) 2011-08-23 22:25:46 +00:00
Evan Prodromou 65df78d5c8 remove Activity plugin separate ignore and copying files 2011-08-23 12:23:18 -04:00
Evan Prodromou 4cbd5b4c9f Add custom list items for follow, unfollow, leave activities 2011-08-23 12:18:10 -04:00
Evan Prodromou 7c4dfb8480 remove debug statement from JoinListItem 2011-08-23 11:52:45 -04:00
Evan Prodromou eed5192405 Custom list item for join events 2011-08-23 11:49:27 -04:00
Evan Prodromou 1bfbf92868 Incorrect arguments for ActivityPlugin::onEndJoin/LeaveGroup() 2011-08-23 10:23:08 -04:00
Evan Prodromou 505c64854c correct typo in ActivityPlugin::onEndSubscribe() 2011-08-23 00:27:42 -04:00
Evan Prodromou af12037a6f fix errors with fave activities 2011-08-23 00:23:02 -04:00
Evan Prodromou eb6cece8e4 update Activity plugin for 1.0.x 2011-08-22 23:48:38 -04:00
Evan Prodromou 01c2c31c1e Merge branch '1.0.x' into activity
Conflicts:
	db/core.php
2011-08-22 18:13:02 -04:00
Evan Prodromou 9ca3c3d1c3 move core schema to class files 2011-08-22 17:52:02 -04:00
Evan Prodromou 8884a5255f Merge activity plugin into mainline 2011-08-22 15:44:10 -04:00
Evan Prodromou 8eac5d2638 Merge branch 'testing' into 1.0.x 2011-08-22 13:20:40 -04:00
Siebrand Mazeland ed13c9a098 Localisation updates from http://translatewiki.net. 2011-08-20 21:30:04 +02:00
Siebrand Mazeland 1fa689e913 tag -> list 2011-08-20 20:30:37 +02:00
Siebrand Mazeland 083e9773f2 Add translator documentation.
doxygen fixes.
2011-08-19 17:13:15 +02:00
Siebrand Mazeland d5cba33366 Add translator documentation. 2011-08-19 17:11:29 +02:00
Siebrand Mazeland 91cb7b8775 Remove i18n fix from previous commit: this is a debug log entry. 2011-08-19 17:09:44 +02:00
Siebrand Mazeland 4b0dd8384f Whitespace updates (including leading tabs to spaces).
Fixed i18n.
2011-08-19 17:06:03 +02:00
Siebrand Mazeland 700b46317a Fix broken translator documentation because "// TRANS: " is not exactly in the line above the _m() method call.
Whitespace updates.
2011-08-19 16:50:31 +02:00
Siebrand Mazeland d85bfd426d Update/add translator documentation.
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:46:28 +02:00
Siebrand Mazeland c718a603f5 Fix and add translator documentation
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:40:45 +02:00
Siebrand Mazeland fd4c72bf85 Fix awkward attempt at i18n. 2011-08-16 18:04:56 +02:00
Siebrand Mazeland 31556e3c00 Localisation updates from http://translatewiki.net. 2011-08-15 16:32:26 +02:00
Siebrand Mazeland bd32b69355 Fix punctuation. 2011-08-15 16:18:21 +02:00
Siebrand Mazeland 4239e2bb9e Fix incorrect documentation. 2011-08-15 16:04:06 +02:00
Evan Prodromou 11f2078893 better exception handling in delicious importer 2011-08-09 13:07:36 -07:00
Evan Prodromou 513c54fa89 Merge branch 'master' into 1.0.x
Conflicts:
	lib/common.php
2011-08-02 15:04:14 -04:00
Evan Prodromou 897e3c87e5 encode values when inserting into MeteorUpdater JS 2011-08-02 13:49:27 -04:00
Zach Copley 60a574ef28 Work improving the interface of the Event micro-app
Squashed commit of the following:

commit da50b6b0223fcbc42cf45d01a138f08930917e71
Author: Zach Copley <zach@status.net>
Date:   Tue Aug 2 00:35:36 2011 -0700

    If end time < start time reset the end time selection

commit 6dfc35579e8e4bd0af9d85fc46799bcc462c68b1
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:55:10 2011 -0700

    Populate event dates with sensible defaults

commit 0bc8d726706cfdc0830687e7f40e941e61691191
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:29:46 2011 -0700

    Recalculate times if user changes start or end date

commit 6a92a31429b4eb6f442eaf850d59dcc5b121e57f
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:03:46 2011 -0700

    * Better date/time display
    * Localize date and time display for user

commit 2bf344068a0eb6e3ed90efacbf33c85e7ee5edf7
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 15:56:21 2011 -0700

    Reselect the end time after timelist update

commit 62fd0620eb5fcc94c240c0fc0b304aa17509de8d
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 14:40:14 2011 -0700

    Fix bug in which end time was not properly in sync with start time + 30mins

commit 3c6bcfb2d962f3677082c468a29480d2a1813d73
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 12:37:00 2011 -0700

    Pass exact URL of the timelist action to event.js

commit efc74841c5b588cdae686630a1b4c1448e5d742b
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 11:20:45 2011 -0700

    Add Ajax error handling to new event action

commit 3085f4b3ed93bb930bff1bc475309b4d473ffc83
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 22 01:18:13 2011 -0700

    Ajaxify event end-time selector

commit 8025c1d368d8f862b666702bfab08daf633a34ea
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 21:58:43 2011 -0700

    Remove dead code

commit 5fbfff47297dea609a07d67a81d430f97f6698ef
Merge: bcd845d 3c926af
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 15:21:58 2011 -0700

    Merge branch 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone into eventjs

    * 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Populate timei selection dropdowns and better CSS (thanks Sammy!)
      Event start/end as dropdowns
      Nothing to see here move along
      Don't allow user to set crazy start and end dates
      New event dates shouldn't ever be in the past, eh?
      Move event microapp JavaScript into included .js file

    Conflicts:
    	plugins/Event/event.js
    	plugins/Event/eventform.php

commit bcd845dc56c147c4ba10eedd43cc7aa799bc6a9a
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 15:11:19 2011 -0700

    Move the helper functions for filling the start/end times to their own class

commit d246d39c4afbffb1e76cd561ab61f15dafd8a988
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 18:50:38 2011 -0700

    Populate time selection dropdowns and better CSS (thanks Sammy!)

commit 0778533fef5500db79e40664c5b56aa7d9cc8357
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 15:54:27 2011 -0700

    Event start/end as dropdowns

commit e800053fdf2cb12fc1f2eac72762d07571647aa8
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 19 14:12:01 2011 -0700

    Nothing to see here move along

commit a85949b9cc4f3b5bb387785d4b7a717e9d952752
Author: Zach Copley <zach@status.net>
Date:   Mon Jul 18 17:48:30 2011 -0700

    Don't allow user to set crazy start and end dates

commit 87d1301ce8aa8877e753440dd52166bf857b29f3
Author: Zach Copley <zach@status.net>
Date:   Sun Jul 17 22:31:24 2011 -0700

    New event dates shouldn't ever be in the past, eh?

commit 7e05aa5fdc02bfec6107bcf8c748627216d51405
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 15:36:17 2011 -0700

    Move event microapp JavaScript into included .js file

commit 3c926af287f80ee389b5bc8a4c1dcc5e0904a14c
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 18:50:38 2011 -0700

    Populate time selection dropdowns and better CSS (thanks Sammy!)

commit af09c57d5132dba2a6a3e76974e38fdde6422c45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 15:54:27 2011 -0700

    Event start/end as dropdowns

commit b585215ed7deb4dc9d4bbc065d36b6e3f819d710
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 19 14:12:01 2011 -0700

    Nothing to see here move along

commit e1d30ae9b80eded4ed7ef6bdd7515da64ae344de
Author: Zach Copley <zach@status.net>
Date:   Mon Jul 18 17:48:30 2011 -0700

    Don't allow user to set crazy start and end dates

commit ad7c99f021980b867f369066b4413bdb1e882986
Author: Zach Copley <zach@status.net>
Date:   Sun Jul 17 22:31:24 2011 -0700

    New event dates shouldn't ever be in the past, eh?

commit 4741f0a327e10e67fc04e2b816ed56351e38b4fa
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 15:36:17 2011 -0700

    Move event microapp JavaScript into included .js file
2011-08-02 01:17:56 -07:00
Zach Copley b925eeecde Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed 2011-08-02 01:15:30 -07:00