Zach Copley
be95dcf008
Move license checkbox to the end of the form
2011-09-17 15:43:21 -07:00
Evan Prodromou
1040f1346c
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 18:27:37 -04:00
Samantha Doherty
95e76bf21a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-17 18:27:30 -04:00
Samantha Doherty
edbe03b193
Minor layout fix for shownotice page.
2011-09-17 18:26:54 -04:00
Evan Prodromou
5c0e8d2a2f
fix link for mobile profile when in singleuser mode
2011-09-17 18:20:08 -04:00
Zach Copley
6c43967e8c
Don't allow Twitter registration if site is invite only
2011-09-17 14:47:35 -07:00
Zach Copley
985f52ce60
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
problem with remote subscription on groups in OStatus
show correct favorites link
2011-09-17 14:39:26 -07:00
Zach Copley
4467615021
Fix reference to constant
2011-09-17 14:38:47 -07:00
Evan Prodromou
f52d33753e
problem with remote subscription on groups in OStatus
2011-09-17 17:28:01 -04:00
Evan Prodromou
4d09d3c680
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 17:00:49 -04:00
Evan Prodromou
945bdf649b
show correct favorites link
2011-09-17 17:00:30 -04:00
Zach Copley
5aeb48fcb2
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:38:09 -07:00
Zach Copley
a4593f9cd3
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:37:38 -07:00
Zach Copley
b34812152d
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:36:05 -07:00
Zach Copley
2d6b4497a4
Fix undefined variable
2011-09-17 13:34:08 -07:00
Zach Copley
c5b731883b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline: (24 commits)
Change time format to work with older PHP (before 5.3)
move OMB-specific remote login button to OMB Plugin
use correct redirect on logout of single-user site
disable routes that aren't available in single-user mode
upgrade to beta4
Better error handling when the email subsystem isn't working. The installer was dying trying to send a confirmation email to the initial user.
Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)
Upgrade 0.9.x bookmarks to 1.0.x
add hooks for upgrades
include q as param, not arg for search sub menu
exact match for paths
change category on urlmapper.php
Fix undefined variable
don't forget to add qstring to static paths
with new URLMapper, cached router takes more memory, time than re-generating
Deal with default param patterns more effectively
two useful functions for profiling
Remove unused xrds stuff from profile (replace in OMB please)
add default groupdirectory route
new URLMapper without Net_URL_Mapper
...
2011-09-17 13:30:40 -07:00
Evan Prodromou
e1129f34d5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-17 16:29:58 -04:00
Zach Copley
baa17381c0
Change time format to work with older PHP (before 5.3)
2011-09-17 13:29:45 -07:00
Zach Copley
70fbdb6f94
Change time format to work with older PHP (before 5.3)
2011-09-17 13:27:14 -07:00
Zach Copley
b83012878f
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
disable routes that aren't available in single-user mode
upgrade to beta4
Better error handling when the email subsystem isn't working. The installer was dying trying to send a confirmation email to the initial user.
Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)
Upgrade 0.9.x bookmarks to 1.0.x
add hooks for upgrades
2011-09-17 13:06:12 -07:00
Evan Prodromou
467b840c44
move OMB-specific remote login button to OMB Plugin
2011-09-17 15:08:38 -04:00
Evan Prodromou
b80b0d6520
use correct redirect on logout of single-user site
2011-09-17 15:08:04 -04:00
Evan Prodromou
fc3d52c120
disable routes that aren't available in single-user mode
2011-09-17 14:37:19 -04:00
Evan Prodromou
ce84555a50
upgrade to beta4
2011-09-16 15:28:11 -04:00
Evan Prodromou
0573c268d0
Merge branch '1.0.x' into testing
2011-09-16 15:27:00 -04:00
Zach Copley
dcbf2f6871
Better error handling when the email subsystem isn't working. The
...
installer was dying trying to send a confirmation email to the initial
user.
2011-09-15 16:58:28 -07:00
Zach Copley
0bd26ed3f0
Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)
2011-09-15 16:58:12 -07:00
Evan Prodromou
9f6adb3f52
Merge branch '1.0.x' into testing
2011-09-15 17:06:27 -04:00
Evan Prodromou
6e480d2458
Upgrade 0.9.x bookmarks to 1.0.x
2011-09-15 17:06:05 -04:00
Evan Prodromou
73afcad34c
add hooks for upgrades
2011-09-15 17:05:32 -04:00
Zach Copley
1f87e77701
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
include q as param, not arg for search sub menu
exact match for paths
change category on urlmapper.php
2011-09-15 09:30:52 -07:00
Evan Prodromou
0b1d8762c6
include q as param, not arg for search sub menu
2011-09-15 11:00:27 -04:00
Evan Prodromou
7c03a50947
exact match for paths
2011-09-15 09:54:25 -04:00
Evan Prodromou
7c57aab44e
change category on urlmapper.php
2011-09-15 09:51:33 -04:00
Zach Copley
5eb6c0d731
Fix undefined variable
2011-09-14 16:35:18 -07:00
Zach Copley
de21d66157
Fix undefined variable
2011-09-14 16:25:50 -07:00
Evan Prodromou
384a093639
Merge branch 'nummedout' into testing
2011-09-14 16:41:19 -04:00
Evan Prodromou
601573a8a9
don't forget to add qstring to static paths
2011-09-14 16:13:54 -04:00
Evan Prodromou
f6f147c0db
with new URLMapper, cached router takes more memory, time than re-generating
2011-09-14 12:41:54 -04:00
Evan Prodromou
a4240db48f
Deal with default param patterns more effectively
2011-09-14 12:27:20 -04:00
Evan Prodromou
11f2a3d551
Merge branch '1.0.x' into nummedout
2011-09-14 12:20:37 -04:00
Evan Prodromou
15ae1cddfe
two useful functions for profiling
2011-09-14 12:19:29 -04:00
Evan Prodromou
927eae908a
Remove unused xrds stuff from profile (replace in OMB please)
2011-09-14 12:18:46 -04:00
Evan Prodromou
fa18e6365e
add default groupdirectory route
2011-09-14 12:18:22 -04:00
Evan Prodromou
40924842f4
new URLMapper without Net_URL_Mapper
2011-09-14 12:15:56 -04:00
Evan Prodromou
8bb4eb5393
Remove NUM
2011-09-14 09:08:46 -04:00
Evan Prodromou
b2ed258e42
Avoid resetting modified for Faves in upgrade script
2011-09-12 15:24:47 -04:00
Evan Prodromou
8f78743198
correct the URI-generation for group memberships
2011-09-12 13:36:12 -04:00
Evan Prodromou
14f03a237e
initialize fave, sub, and membership URIs
2011-09-12 12:13:04 -04:00
Siebrand Mazeland
16c24b66bb
Remove two incorrect strings for now.
2011-09-11 16:56:33 +02:00
