Maxwell Salzberg
|
b70f684efc
|
fix css for hovercards in notifications, and people with long names
|
2011-08-25 12:16:03 -07:00 |
|
Gonzalo Rodriguez
|
43d6acd868
|
Support green login page flash message for password change success
|
2011-08-23 00:51:00 -03:00 |
|
Dan Hansen
|
6b040c7b4a
|
clean up websocket receiver, add specs to content updater
|
2011-08-22 20:03:38 -05:00 |
|
Dan Hansen
|
3ed50cab94
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
app/views/status_messages/bookmarklet.html.haml
config/assets.yml
db/schema.rb
public/javascripts/contact-edit.js
public/javascripts/publisher.js
public/javascripts/view.js
|
2011-08-20 14:40:56 -05:00 |
|
Maxwell Salzberg
|
e4062bf5fd
|
now functionally correct
|
2011-08-19 15:56:32 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c3bcb9c962
|
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
|
2011-08-18 16:48:20 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a407f12463
|
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
|
2011-08-18 16:16:14 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2777f16f4f
|
Merge branch 'issue1586-aspectdropdown-when-posting'
|
2011-08-18 16:02:09 -07:00 |
|
Maxwell Salzberg
|
947dfaacf7
|
make profile photo auto so it does not get smooshed
|
2011-08-18 14:09:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
b1e95def4a
|
Merge branch 'master' into issue1586-aspectdropdown-when-posting
|
2011-08-18 12:59:00 -07:00 |
|
danielgrippi
|
fca2be5c5d
|
facebox overlay dark again, with a faint spotlight
|
2011-08-17 22:43:58 -07:00 |
|
Raphael Sofaer
|
cc3eeac98e
|
Merge the aspect dropdown in the publisher with master, some things are still broken
|
2011-08-16 14:59:53 -07:00 |
|
Raphael Sofaer
|
d228f50557
|
Acceptable ajax loader for the aspect dropdown.
|
2011-08-13 12:45:17 -07:00 |
|
danielgrippi
|
1c5f61fb78
|
dropdown images as embedded assets and not 2 separate image tags
|
2011-08-12 18:18:58 -07:00 |
|
danielgrippi
|
75f3accd37
|
moved facebook friend inviter/finder into contacts layout & re-added search
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
a8d37fb3fc
|
Move Facebook inviter view into the contacts layout, rather than a facebox
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
190332308b
|
started on the real stats page
|
2011-08-11 17:15:33 -07:00 |
|
Andrej Kacian
|
8296b8ca1a
|
Tag unfollow and aspect edit icons are now made more opaque on mouseover
|
2011-08-12 00:51:29 +02:00 |
|
Dan Hansen
|
2e9040e227
|
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
|
2011-08-10 23:57:33 -07:00 |
|
danielgrippi
|
db645e8da8
|
merged publics/show and posts/show
|
2011-08-10 18:07:38 -07:00 |
|
Raphael Sofaer
|
091cdd6f94
|
Basic contacts index page on the mobile site
|
2011-08-10 16:23:33 -07:00 |
|
Sarah Mei
|
0b02653f44
|
Merge pull request #1694 from ticho/tag-list-has-unfollow-icon
Add a "unfollow" icon to each tag in followed tags listing
|
2011-08-09 21:44:21 -07:00 |
|
Maxwell Salzberg
|
6406c59bc7
|
move back to top to bottom
|
2011-08-09 18:36:49 -07:00 |
|
Andrej Kacian
|
2a970145c8
|
Added icon to directly unfollow a tag to listing of followed tags.
|
2011-08-09 22:45:06 +02:00 |
|
Maxwell Salzberg
|
a4e6a019a7
|
make the scroll to top a bit more subtle
|
2011-08-09 11:33:47 -07:00 |
|
Maxwell Salzberg
|
72b734e3e8
|
scroll to top like a boss
|
2011-08-09 01:04:54 -07:00 |
|
Manuel Schölling
|
fead6032f7
|
Issue 1586: added a aspect drop down next to the submit button in the publisher
|
2011-08-07 12:51:32 +02:00 |
|
Andrej Kacian
|
6b64d7f55a
|
Correctly space unread and total message counts in conversations list
|
2011-08-07 04:06:26 +02:00 |
|
danielgrippi
|
3655ea22a6
|
missing 'important' flag
|
2011-08-05 17:39:58 -07:00 |
|
danielgrippi
|
ff1882387d
|
wrong margin
|
2011-08-05 17:35:22 -07:00 |
|
danielgrippi
|
5e1d1428d0
|
fix styles
|
2011-08-05 17:29:57 -07:00 |
|
danielgrippi
|
afe2bc37cc
|
fix stylesheet for remote friend
|
2011-08-05 17:26:50 -07:00 |
|
danielgrippi
|
cd62064846
|
touched up aspect/edit and friend finder popups
|
2011-08-05 17:14:07 -07:00 |
|
danielgrippi
|
0cceb4fdd3
|
fixed people/contacts layout; pulled person sub-header into its own partial
|
2011-08-05 15:51:18 -07:00 |
|
danielgrippi
|
75c3107035
|
made signing up and accepting an invitation look a little nicer
|
2011-08-05 12:36:53 -07:00 |
|
Maxwell Salzberg
|
001d4ceaff
|
fix friend finder styling
|
2011-08-03 18:55:26 -07:00 |
|
danielgrippi
|
9b24af717f
|
fix styling on featured users on getting started; added hovercards
|
2011-08-03 18:22:52 -07:00 |
|
danielgrippi
|
23c2eaf1c5
|
added a real profile description on the welcome tab
|
2011-08-03 18:02:58 -07:00 |
|
danielgrippi
|
b8b4ad3d84
|
added helpers for each of the getting started steps; make step sections dull if completed
|
2011-08-03 18:02:56 -07:00 |
|
danielgrippi
|
303b23883d
|
added featured users, left nav, and search boxes into getting started
|
2011-08-03 18:02:56 -07:00 |
|
danielgrippi
|
c9eeeb6150
|
ms dg; profile (step 1) finished
|
2011-08-03 18:02:56 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c2dc5fde08
|
dg iz reworked the getting started into a tab, need to remove the getting started steps
|
2011-08-03 18:02:56 -07:00 |
|
Maxwell Salzberg
|
1ae7b80c56
|
some tweaks for friend finder styling
|
2011-08-03 18:00:38 -07:00 |
|
Raphael Sofaer
|
5885d18a39
|
Expand the comment box on post show pages
|
2011-08-02 11:10:43 -07:00 |
|
Jakob Kramer
|
f1cee54e6a
|
fix sass, so hidden fields don't show up in old fx versions
|
2011-08-02 13:02:25 +02:00 |
|
danielgrippi
|
6daf7f5ad9
|
add prompt to add more contacts if user has less than 2 contacts on aspect index
|
2011-08-01 15:31:13 -07:00 |
|
Maxwell Salzberg
|
aede25fd11
|
make overflow of status messages scrollable
|
2011-07-31 22:19:02 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
e42d7273a8
|
featured users section
|
2011-07-29 19:00:15 -07:00 |
|
Maxwell Salzberg
|
b2bce9e1b2
|
update jquery mobile to beta1
|
2011-07-28 23:32:41 -07:00 |
|
danielgrippi
|
ee95def580
|
removed js from the view. added grabbing hand while moving aspects
|
2011-07-28 15:34:01 -07:00 |
|