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 |
|
Siebrand Mazeland
|
ab8c166d49
|
Add translator documentation.
|
2011-08-20 20:33:16 +02:00 |
|
Siebrand Mazeland
|
1fa689e913
|
tag -> list
|
2011-08-20 20:30:37 +02:00 |
|
Samantha Doherty
|
20f25912d4
|
A little style fixup for oauth applications.
|
2011-08-19 15:45:17 -04:00 |
|
Samantha Doherty
|
c8a09b051c
|
Reinstate labels for oauth application info.
|
2011-08-19 15:43:56 -04:00 |
|
Samantha Doherty
|
1b7d1d9a4a
|
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2011-08-19 13:02:32 -04:00 |
|
Samantha Doherty
|
23e5f25d8d
|
Couple quick improvements for neo-blue theme.
|
2011-08-19 13:00:22 -04:00 |
|
Siebrand Mazeland
|
5d557a2656
|
Add translator documentation.
Whitespace updates.
|
2011-08-19 18:13:25 +02:00 |
|
Siebrand Mazeland
|
b1ff67a55e
|
Add translator documentation.
L10n updates.
Whitespace updates.
|
2011-08-19 18:11:31 +02:00 |
|
Siebrand Mazeland
|
d756242f64
|
Add translator documentation.
L10n/i18n fixes.
Whitespace updates.
|
2011-08-19 17:39:39 +02:00 |
|
Siebrand Mazeland
|
73806460ce
|
Add translator documentation.
Fix incorrect i18n.
Whitespace updates.
|
2011-08-19 17:38:43 +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 |
|
Zach Copley
|
76c48a7099
|
Fix syntax err
|
2011-08-18 18:17:38 -07:00 |
|
Evan Prodromou
|
ff656a8b3a
|
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
|
2011-08-18 17:27:55 -07: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 |
|
Evan Prodromou
|
827b13a2a4
|
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
|
2011-08-16 15:59:06 -04: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
|
0a420fd7d0
|
More list...
|
2011-08-15 16:06:35 +02:00 |
|
Siebrand Mazeland
|
4239e2bb9e
|
Fix incorrect documentation.
|
2011-08-15 16:04:06 +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 |
|
Siebrand Mazeland
|
6f386b2f8b
|
Update translator documentation.
|
2011-08-15 15:50:36 +02:00 |
|
Evan Prodromou
|
11f2078893
|
better exception handling in delicious importer
|
2011-08-09 13:07:36 -07:00 |
|
Evan Prodromou
|
632ed129eb
|
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
|
2011-08-08 12:01:48 -04:00 |
|
Evan Prodromou
|
ac268773bf
|
Pass correct notice id to Memcached_DataObject::listGet() in getFaves()
|
2011-08-08 12:01:39 -04:00 |
|