danielgrippi
547d7e4f8c
bootstrapped getting started page
2011-10-24 14:11:35 -07:00
Maxwell Salzberg
aa2fd8abcf
make stream link to home icon
2011-10-24 11:34:17 -07:00
Daniel Grippi
eb19bc9a78
Merge pull request #2111 from vcuculo/fix-mobile-select
...
Fix #2091 - Aspects selection on mobile
2011-10-11 09:29:45 -07:00
danielgrippi
a2b79d0338
touch up header
2011-10-11 08:00:36 -07:00
Vittorio Cuculo
c47579cfd8
Fix #2091 - Mobile select aspect
2011-10-05 09:30:45 +02:00
Gonzalo Rodriguez
80a494f9ba
Use haml instead of content_tag
2011-10-04 00:22:33 -02:00
Gonzalo Rodriguez
97e1775938
Adding alt text for header icons. Related to #2089 .
2011-10-03 23:33:32 -02:00
Gonzalo Rodriguez
ae1fedc73b
Preserve search term on search input. Related to #1983 .
2011-10-02 23:02:48 -02:00
Dan Hansen
d0fe59af69
add cucumber feature for photo lightbox
...
change step to reflect element visibility
2011-10-01 15:52:48 -05:00
danielgrippi
eaa191515e
remove logging statement in a before filter that performed a query
2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a
Revert "header data as helper methods"
...
This reverts commit 607013bc83
2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83
header data as helper methods
2011-09-30 13:22:12 -07:00
danielgrippi
70b175479c
format all on including stylesheet for WP7
2011-09-29 00:39:12 -07:00
danielgrippi
7d662fcc92
move share button to top right corner
2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb
expand/collapse comments with animation; added collapse link on bottom
2011-09-27 21:09:27 -07:00
danielgrippi
2b2443b6b9
aspect dropdown takes public and all aspects option
2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406
wip
2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef
expand&collapse comments; added comment form (wip)
2011-09-27 21:09:27 -07:00
danielgrippi
f2f14c2894
fixed ajax for likes
2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32
fixed header; compose message on top right
2011-09-27 21:09:26 -07:00
danielgrippi
645af37358
more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset
2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e
ditch unused css rules; move js to body bottom
2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567
added html5 boilerplate meta tags to mobile; stripped functionality to add back
2011-09-27 21:09:25 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Sarah Mei
b60101b9ad
Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.
...
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
2011-08-28 16:08:57 -07: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
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4
added a visible style for missing translations in development and production modes
2011-08-19 11:05:48 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3f1e8f0b6e
added the check for open invitations
2011-08-14 16:06:25 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89
you are now able to invite friends from the mobile site
2011-08-14 15:40:07 -07:00
danielgrippi
7e901d0220
remove shapado
2011-08-12 11:12:30 -07: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
Raphael Sofaer
902edb6745
Make the tag autocomplete on the getting started page less broken
2011-08-09 18:55:34 -07:00
Maxwell Salzberg
7b1ff4cd7b
more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form
2011-08-09 18:02:50 -07:00
Raphael Sofaer
3c4f6527ec
Don't render the back-to-top link on the landing page
2011-08-09 16:55:22 -07:00
Maxwell Salzberg
72b734e3e8
scroll to top like a boss
2011-08-09 01:04:54 -07:00
danielgrippi
134e8a1b20
limit RSS rel link in layout to person pages
2011-08-03 18:30:25 -07:00
danielgrippi
987d334764
fixed tests, translations, initalizer
2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193
fix cucumber; temporarily remove fetch featured users initilizer
2011-08-03 18:02:57 -07:00
danielgrippi
756a20ecd4
link a user to featured users if user has zero contacts
2011-08-01 15:19:51 -07:00
Maxwell Salzberg
773f207b17
fix the viewport for real this time. sorry about all of the emails
2011-07-31 21:57:26 -07:00
Maxwell Salzberg
2fb2cd0a80
fix mobile viewport for mobile site
2011-07-31 21:33:43 -07:00
Maxwell Salzberg
b2bce9e1b2
update jquery mobile to beta1
2011-07-28 23:32:41 -07:00
Raphael Sofaer
caf26a5c64
Upgrade rails.js, add CSRF token manually in the photo uploader.
2011-07-21 17:49:33 -07:00
Andrej Kacian
713f4dcc9d
Fix for issue #1600 : Missing string for translation ("Recent notifications")
2011-07-17 17:04:51 +02:00
danielgrippi
c4b715f3ff
fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews
2011-07-15 21:22:29 -07:00
danielgrippi
e09ddef361
DH DG; lightboxin wip
2011-07-10 21:08:34 -07:00
danielgrippi
fd015129c4
final touchups to hovercard
2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0
made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses
2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485
wip. Person#as_json is breaking right now
2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382
HOVERCARD
2011-07-06 12:45:16 -07:00
danielgrippi
9ec905560c
visual touchups, show loading gif right away
2011-07-02 17:53:07 -07:00
Dan Hansen & Daniel Grippi
b48b182c73
STYLIN'
2011-07-02 00:04:14 -07:00
Dan Hansen
05688c2f43
notifications wip
2011-07-01 22:46:54 -07:00
danielgrippi
f90dc0996a
More visual cleanup; top nav; edit aspects
2011-07-01 16:12:14 -07:00
danielgrippi
60077bd70a
minor visual changes, more or less. facebox headers are now white.
2011-07-01 10:51:45 -07:00
danielgrippi
ca76db4550
DG RS left nav almost there. touched up publisher, among other things
2011-07-01 10:49:19 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d
reset the notifications helper to master's version and monkey patch header
2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c
proof of concept for notifications overlay
2011-06-27 19:51:35 -07:00
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254
nicer auth prompt. wip.
2011-06-23 12:40:47 -07:00
Maxwell Salzberg
41e8a32b28
tests for data methods
2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6
move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz
2011-06-16 11:17:14 -07:00
Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07:00
danielgrippi
b8a6bf9f51
trying something different on app show page. worth a shot.
2011-06-06 22:59:31 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
=
2a11bb208e
Add message inbox link to mobile menu
2011-05-10 12:08:05 -05:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
Dan Hansen
4a101f25d9
Notifications.js refactor, add specs
2011-04-27 16:22:56 -05:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
MrZYX
440fd26c14
hopefully finally fix #946
2011-04-11 19:15:14 +02:00
MrZYX
ffbe94f75c
revert moved add aspect button to the left for rtl languages, this is already done by CSS
2011-04-11 18:04:50 +02:00
MrZYX
2413b3c4bd
Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl
2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d
added dir attribute to html element; made tipsy gravity dependant on that
2011-04-11 18:00:28 +02:00
MrZYX
e7d48a16ee
moved + to the left for rtl languages
2011-04-05 19:33:51 +02:00
MrZYX
e4db8c7a36
fixed #589 , no CSS!
2011-04-03 02:10:41 +02:00
MrZYX
f98a4ee42c
correct links to atom feed
2011-04-02 17:35:23 +02:00
MrZYX
b086142b16
fixed #991
2011-04-02 15:09:41 +02:00
danielgrippi
8b8ea03582
high res logo on mobile site
2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
maxwell
569fb66e9e
bunch of small mobile ui fixes
2011-03-31 23:38:38 -07:00
maxwell
69befc059d
ms iz fixed a bit of the mobile site
2011-03-31 18:32:19 -07:00
maxwell
bb59df46f9
updating jquery mobile, fix the menu page a bit
2011-03-31 18:19:51 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
zhitomirskiyi
18c7c467c7
made the manage email prefs work
2011-03-23 16:36:16 -07:00
danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -07:00
maxwell
a036a8035f
add a plaintext layout for emails, and include a link to change your email settings in the emails
2011-03-22 12:26:38 -07:00
Sarah Mei
0b1fa4d014
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
2011-03-19 20:53:55 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
danielgrippi
d38e3a6b29
added translations to all conversation/message views. tweaked css
2011-03-08 15:51:46 -08:00
MrZYX
7b5b980095
link to public feed of the person on the profile person show page instead of to the one of current_user
...
fixed #700
fixed #864
fixed #774
2011-03-08 20:30:48 +01:00
danielgrippi
fca5310c77
dispatch the conversation in ConversationsController
2011-03-07 17:54:25 -08:00
