danielvincent
61122b83d0
make profile button on photo show page. (removed clean hash on usercontroller)
2010-10-20 12:19:06 -07:00
danielvincent
98a8fbcfb6
request badge text color fix
2010-10-20 10:37:00 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c99 , reversing
changes made to 53fef63a9a .
Conflicts:
pkg/fedora/diaspora-setup
pkg/ubuntu/diaspora-setup
public/stylesheets/sass/application.sass
spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
danielvincent
d2945c83dc
status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.
2010-10-20 00:02:15 -07:00
danielvincent
f6303b8fff
reshare dropdown looks nicer. fixed user menu to drop down on click
2010-10-19 16:16:46 -07:00
danielvincent
b218a53bf7
fancyboxes have title bars now, kind of.
2010-10-19 14:06:44 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
danielvincent
d18757b5c1
pushed stream up
2010-10-18 11:00:52 -07:00
danielvincent
4b1516542d
various. fixed publisher in new layout.
2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb
add new aspect back on manage page. changed badges
2010-10-18 11:00:52 -07:00
danielvincent
15104cf920
somewhat there
2010-10-18 11:00:52 -07:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -07:00
danielvincent
1139299f42
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
2010-10-17 20:47:51 -07:00
danielvincent
060767e794
comments submit on enter. design touchup
2010-10-17 19:36:43 -07:00
danielvincent
5ca3570667
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
2010-10-16 02:06:46 -07:00
danielvincent
7611bc1c8f
user dropdown
2010-10-15 17:37:32 -07:00
danielvincent
47be7b1f0a
correct html5 search box
2010-10-15 15:29:57 -07:00
danielvincent
12bdd1712d
share on facebook checkbox instead of broadcast button
2010-10-15 13:56:49 -07:00
Raphael
51c5b73256
Merge branch 'empty-page'
...
Conflicts:
public/stylesheets/application.css
2010-10-14 17:00:19 -07:00
danielvincent
45d7d54c66
added an empty message for the case of an aspect with no friends
2010-10-14 16:23:29 -07:00
danielvincent
cf2a4c25ae
DG RS; remove empty message from stream upon adding something
2010-10-14 15:19:37 -07:00
danielvincent
5722f85c85
message in aspect if stream is empty
2010-10-14 15:00:47 -07:00
danielvincent
32a0f60a2f
moved photos link to the side bar for now
2010-10-14 14:38:19 -07:00
Raphael
1ab34ab07a
Removing generated CSS from git
2010-10-14 14:05:51 -07:00
Raphael
be8cacdc79
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-14 13:15:38 -07:00
danielvincent
58d5fbfb3e
moved invite link to account#edit on settings page. changed text on person partial.
2010-10-14 10:26:06 -07:00
Shawn McGuire
eaef6bdf04
Issue #272 Fixed color contrast
2010-10-13 11:12:27 -05:00
Raphael
3b82001a42
Step down font size 1px in info
2010-10-12 18:19:31 -07:00
Raphael
900a085124
Merging in bigbash's fixes
2010-10-12 15:09:32 -07:00
Shawn McGuire
b548520591
Changed div.info color and font size to be larger and darker
...
Issue #285
2010-10-12 16:42:03 -05:00
danielvincent
884d7b7dd7
flash message should slide in
2010-10-10 23:13:03 -07:00
danielvincent
b313272ff3
flash messages look nicer
2010-10-09 22:32:39 -07:00
danielvincent
c5affa07e8
tweaked reshare button
2010-10-08 16:19:51 -07:00
danielvincent
9ac13ccb3e
fixed reshare a bit
2010-10-08 15:47:06 -07:00
danielvincent
edd8f0ba6d
links now have active state
2010-10-08 15:35:22 -07:00
danielvincent
154ec95717
killed the public tab. made a broadcast button in everyone tab
2010-10-08 14:06:49 -07: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
894d6654b2
only selected nav element should be a tab on aspect_nav, preventing tab overload.
2010-10-07 23:35:55 -07:00
danielvincent
8f741795fb
aspect manage margin fix
2010-10-07 23:27:31 -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
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Alec Leamas
e9252e8aec
After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png
2010-10-07 14:59:13 +02:00
Alec Leamas
a9806ddad0
Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.
2010-10-06 04:59:46 +08:00
danielvincent
e145cbab5b
tar the app's source and throw it in the public folder on server boot.
2010-09-29 17:42:56 -04:00
danielvincent
fa8cc5b876
moz box shadow does not like negative blur
2010-09-28 23:24:04 -04:00