31b29fde50
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
fbc5de3268
Add missing li tags in settings and admin menus.
2011-05-18 12:13:34 -04:00
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04:00
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
3b3bf74176
Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan).
2011-05-05 12:36:56 +02:00
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
c46406b209
low-level hook for loading templates
2011-05-04 11:28:49 -07:00
6b1732d9a2
remove object nav for search
2011-05-04 10:43:47 -07:00
90eb09624c
let users login with email address
2011-05-02 15:17:08 -07:00
02c5d68bed
Merge branch 'emailsitesetup' into 1.0.x
2011-04-28 12:44:21 -07:00
fad0c875ca
Don't redefine 'STATUSNET' in installer
2011-04-28 12:38:07 -07:00
7c3818c00e
Update translator documentation.
2011-04-27 14:30:58 +02:00
d09df28040
utility functions for setting config options in memory
2011-04-26 16:50:42 -04:00
a2e4a1803c
Harmonize message for 'User has no profile.' and update translator documentation.
2011-04-25 22:44:19 +02:00
413d9e2fd0
Whitespace updates.
2011-04-24 18:50:55 +02:00
8afda686d2
@evan Please check. Doesn't look correct/complete.
2011-04-24 18:50:03 +02:00
f79d59a081
Merge branch '1.0.x' into testing
2011-04-21 16:16:07 -04:00
5fd08b798f
show thumbnails even for links that arent enclosures
2011-04-21 16:13:32 -04:00
963d052653
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-21 15:23:22 -04:00
5e97047f8f
Update translator documentation.
...
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
98cc1da7b5
Update indentation.
2011-04-21 20:19:51 +02:00
63009f1e1b
Merge branch '1.0.x' into testing
2011-04-21 13:37:15 -04:00
36d56232c6
a little better notice hiding
2011-04-21 13:37:05 -04:00
9fcda5b2da
show the full name for likes
2011-04-21 12:00:10 -04:00
34e26b53d5
show list of people who like something in threadednoticelist
2011-04-21 11:58:24 -04:00
5899a3f5ee
fail gracefully when no IDs for tag cloud
2011-04-20 19:07:07 -04:00
0c0aabeda5
show tag cloud in public stream
2011-04-20 17:17:36 -04:00
4fa7f147b0
Make tag-per-group optional, default false
2011-04-20 16:19:07 -04:00
e686199616
accidentally stored wrong personaltagcloudsection
2011-04-20 16:12:49 -04:00
776c2c99ea
inbox tag cloud section
2011-04-20 16:11:42 -04:00
3904ab9983
only 10 tags per section
2011-04-20 16:11:04 -04:00
cacf627ce3
remove hidden <h2> in notice list
2011-04-20 13:41:50 -04:00
1e2bd48c30
correctly output notice data for nli in microapp
2011-04-19 17:55:57 -04:00
7c31462f86
Let showNotice() go unimplemented
...
Default implementation of showNotice().
2011-04-19 16:00:31 -04:00
efabb002e4
use an adapter pattern to customize notice list item output
2011-04-19 15:43:06 -04:00
1619578818
fix bad variable, show frame length
2011-04-18 19:33:00 -04:00
3fd6b9d474
capture some info if serialization fails on stomp frame
2011-04-18 17:55:38 -04:00
2757bd8428
Revert "put some debugging code into the home and public timelines"
...
This reverts commit aa7b6447a1
2011-04-18 16:43:54 -04:00
aa7b6447a1
put some debugging code into the home and public timelines
2011-04-18 16:20:51 -04:00
b81ddc70df
correct category on inboxnoticestream
2011-04-18 16:19:15 -04:00
d3215adfa1
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-18 12:54:23 -04:00
9e7b880df7
Revert "disable showing tags; it throws a notice for me"
...
This reverts commit 7d6efbf29e
2011-04-18 10:08:26 -04:00
7d6efbf29e
disable showing tags; it throws a notice for me
2011-04-18 10:03:38 -04:00
28d0d9caad
loop through args in common_markup_to_html
2011-04-18 09:51:26 -04:00
b72788d9ce
pass args from Docfile to renderer
2011-04-18 09:47:08 -04:00
99d538af58
docfiles can take arguments
2011-04-18 09:03:43 -04:00
551a4e8324
mail paths for docfile
2011-04-18 09:03:28 -04:00
4784e3fe36
correctly parse help files
2011-04-18 06:30:33 -04:00
Ian Denhardt
Siebrand Mazeland
Samantha Doherty
Zach Copley
Evan Prodromou