danielvincent
|
b3d9884e0d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:38:26 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
Raphael
|
09c6af28a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:09:35 -07:00 |
|
Raphael
|
73e4d2b25b
|
Pull in search improvement, remove cruft
|
2010-10-11 11:08:54 -07:00 |
|
danielvincent
|
c630d3db6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 10:53:18 -07:00 |
|
danielvincent
|
82f526ea23
|
DG MS; added tooltip
|
2010-10-11 10:53:00 -07:00 |
|
Raphael
|
fe360e386a
|
Merge remote branch 'rmaskey/master' into search
|
2010-10-11 10:47:24 -07:00 |
|
Raphael
|
8cf72441b4
|
Make intended behavior on hcard action clearer, return 404 on nonexistent person
|
2010-10-11 10:13:52 -07:00 |
|
Raphael
|
04d5271530
|
Merge remote branch 'crimer/master'
|
2010-10-11 10:03:09 -07:00 |
|
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 |
|
rmaskey
|
94f20ba684
|
resolution for issue #151 - search with multiple words
|
2010-10-10 08:43:43 -07:00 |
|
Crimer
|
4163ce4544
|
Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page"
|
2010-10-09 11:51:42 +00: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 |
|