Commit Graph

16023 Commits

Author SHA1 Message Date
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
Zach Copley
95032a39bb Initialize DataTime with 'now' instead of 'today' (today doesn't give accurate results) 2011-08-23 22:25:36 +00:00
Evan Prodromou
fbed85e868 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-23 13:32:24 -04:00
Evan Prodromou
eaf32b7728 remove obsolete sitemap script 2011-08-23 13:31:47 -04:00
Zach Copley
307a75e3a7 Fix deprecated call-time pass by references 2011-08-23 09:52:48 -07:00
Zach Copley
9535f0d0e3 Rename plugins README so it doesn't conflict with plugins directory on case insensitive files systems (Mac/Windows) 2011-08-23 09:49:32 -07:00
Zach Copley
1507c32454 Fix warnings - function arguments should expect values instead of references 2011-08-23 09:49:32 -07: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
b73eaa44de emit fewer notices for group joins 2011-08-23 11:49:45 -04:00
Evan Prodromou
eed5192405 Custom list item for join events 2011-08-23 11:49:27 -04:00
Evan Prodromou
5c3bc19968 Re-add lost verb column for Notice 2011-08-23 11:42:18 -04:00
Evan Prodromou
1bfbf92868 Incorrect arguments for ActivityPlugin::onEndJoin/LeaveGroup() 2011-08-23 10:23:08 -04:00
Evan Prodromou
4f05205fbe log an exception when we can't join a group 2011-08-23 10:22:03 -04:00
Evan Prodromou
be4d9082f9 Merge branch '1.0.x' into activity 2011-08-23 00:41:03 -04:00
Evan Prodromou
2ea17b0749 use references for Notice::_setFaves() and Notice::_setRepeats() 2011-08-23 00:40:54 -04:00
Evan Prodromou
cd3a53e01f Merge branch '1.0.x' into activity 2011-08-23 00:33:34 -04:00
Evan Prodromou
a053d96bf2 Better list-unwrapping in MoreMenu 2011-08-23 00:32:46 -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
c712eefe14 Merge branch '1.0.x' into activity 2011-08-23 00:17:39 -04:00
Evan Prodromou
ce5b44158e Get primary key for default value in Memcached_DataObject::staticGet() 2011-08-23 00:14:20 -04:00
Evan Prodromou
5e61ec5e01 avoid producing notices for last element in MoreMenu 2011-08-22 23:53:34 -04:00
Evan Prodromou
eb6cece8e4 update Activity plugin for 1.0.x 2011-08-22 23:48:38 -04:00
Evan Prodromou
6c7880c5c5 Merge branch '1.0.x' into activity 2011-08-22 19:02:16 -04:00
Evan Prodromou
2b55641a9f split gigantic README into separate files 2011-08-22 18:28:50 -04:00
Evan Prodromou
f2387d9ad8 remove old and dangerous rebuild scripts 2011-08-22 18:23:28 -04:00
Evan Prodromou
55d5c9566b remove obsolete .sql files 2011-08-22 18:22:27 -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
0022bb8110 fix calls to staticGet() to avoid problems with default args 2011-08-22 18:06:06 -04:00
Evan Prodromou
feb9030fb9 Remove sequenceKey() since we now use Managed_DataObject 2011-08-22 18:05:37 -04:00
Evan Prodromou
7c6399a51a Remove now-unused statusnet.ini 2011-08-22 18:03:05 -04:00
Evan Prodromou
6ed88dee94 forgot Group_member::schemaDef() 2011-08-22 18:02:29 -04:00
Evan Prodromou
9ca3c3d1c3 move core schema to class files 2011-08-22 17:52:02 -04:00
Evan Prodromou
34d0e1088d add URI members to social activity classes 2011-08-22 16:36:23 -04:00
Evan Prodromou
48bb784400 add a verb column to the notice table 2011-08-22 16:02:14 -04:00
Evan Prodromou
8884a5255f Merge activity plugin into mainline 2011-08-22 15:44:10 -04:00
Evan Prodromou
46cc83addb Merge commit 'refs/merge-requests/2' of git://gitorious.org/statusnet-activity/statusnet-activity into merge-requests/2 2011-08-22 15:28:29 -04:00
Evan Prodromou
19b4572e99 trim trailing ?> from Notice_activity 2011-08-22 15:25:58 -04:00
Evan Prodromou
8eac5d2638 Merge branch 'testing' into 1.0.x 2011-08-22 13:20:40 -04:00
Evan Prodromou
2f1751568a pre-fill repeats of notices 2011-08-22 12:39:37 -04:00
Evan Prodromou
d3399e93e8 use listGet() for ConversationNoticeStream 2011-08-22 12:25:04 -04:00
Evan Prodromou
0a17e7cf9f Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
	classes/Memcached_DataObject.php
2011-08-22 11:25:13 -04:00
Siebrand Mazeland
83c988e1e7 Fix incorrect translator documentation. 2011-08-21 12:41:03 +02:00
Siebrand Mazeland
ed13c9a098 Localisation updates from http://translatewiki.net. 2011-08-20 21:30:04 +02:00