maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
danielvincent
|
c5affa07e8
|
tweaked reshare button
|
2010-10-08 16:19:51 -07:00 |
|
Raphael
|
a720694364
|
Make logging less verbose
|
2010-10-08 15:51:12 -07:00 |
|
Raphael
|
b7116ca413
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 15:47:43 -07:00 |
|
Raphael
|
b7bf526b91
|
Make logging message clearer
|
2010-10-08 15:47:30 -07:00 |
|
danielvincent
|
9ac13ccb3e
|
fixed reshare a bit
|
2010-10-08 15:47:06 -07:00 |
|
danielvincent
|
086df28a37
|
removed connected to facebook text under everyone publisher
|
2010-10-08 15:21:27 -07:00 |
|
maxwell
|
255901dfab
|
fixing copypasta
|
2010-10-08 15:00:04 -07:00 |
|
maxwell
|
d7521cb288
|
MS trying to not use MiniFB to post since it is barfing
|
2010-10-08 14:49:09 -07:00 |
|
Raphael
|
b613361855
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 14:47:10 -07:00 |
|
Raphael
|
3729431ccf
|
don't translate css class to mark request count
|
2010-10-08 14:46:57 -07:00 |
|
danielvincent
|
44338a9897
|
removed traces of :public
|
2010-10-08 14:44:56 -07:00 |
|
maxwell
|
b6b192da01
|
MS DG trying to move around fb url
|
2010-10-08 14:25:39 -07:00 |
|
danielvincent
|
526fbe9a90
|
fixed error where publisher would cause status_message_controller to error out
|
2010-10-08 14:19:54 -07:00 |
|
danielvincent
|
7d96c95caf
|
fixed breaking aspect show pages
|
2010-10-08 14:15:35 -07:00 |
|
danielvincent
|
48e92c2c33
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 14:07:05 -07:00 |
|
danielvincent
|
154ec95717
|
killed the public tab. made a broadcast button in everyone tab
|
2010-10-08 14:06:49 -07:00 |
|
Crimer
|
3754b519a7
|
Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'.
|
2010-10-08 21:51:59 +00:00 |
|
danielvincent
|
a3aab92212
|
fixed photo partial
|
2010-10-08 12:25:42 -07:00 |
|
danielvincent
|
3a876770f3
|
minor tweaks
|
2010-10-08 00:36:55 -07:00 |
|
danielvincent
|
5b66a191cd
|
more stream tweaks
|
2010-10-07 23:25:49 -07:00 |
|
danielvincent
|
b314ee22ec
|
intermediate misc ui polish
|
2010-10-07 22:51:08 -07:00 |
|
danielvincent
|
ed1cb5a0e7
|
DG MS; moved change password to account page; fixed the styling on password inputs
|
2010-10-07 18:52:46 -07:00 |
|
danielvincent
|
c756e1a331
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 18:17:38 -07:00 |
|
danielvincent
|
2e73104d6f
|
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
|
2010-10-07 18:17:26 -07:00 |
|
Raphael
|
399e437655
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 17:34:03 -07:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
Raphael
|
1d463d22a1
|
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
|
2010-10-07 16:50:19 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
6531a27594
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:22:14 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|
Raphael
|
6dbe429ed1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:02:37 -07:00 |
|
danielvincent
|
206e10f66a
|
dont put log behind devise
|
2010-10-07 14:57:00 -07:00 |
|
Raphael
|
9646a453a1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:34:57 -07:00 |
|
danielvincent
|
8f1973815e
|
DG MS; added route for exported xml
|
2010-10-07 14:21:53 -07:00 |
|
Raphael
|
9912769b5b
|
Merge remote branch 'guillei/s3_upload'
|
2010-10-07 14:17:43 -07:00 |
|
Raphael
|
ec9e180eab
|
Merge branch 'master' into HEAD
Conflicts:
public/stylesheets/application.css
|
2010-10-07 13:58:06 -07:00 |
|
Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -07:00 |
|
maxwell
|
0fb091ebbc
|
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
|
2010-10-06 18:38:37 -07:00 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
danielvincent
|
d519e46f4d
|
webfinger edit
|
2010-10-05 19:01:04 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|