Florian Staudacher
|
363ca8c07e
|
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
|
2012-01-22 14:42:45 +01:00 |
|
danielgrippi
|
25d0f0d87f
|
updated jquery autoResize; comment boxes now expand
|
2012-01-20 21:45:55 -08:00 |
|
Maxwell Salzberg
|
aa449f3a2d
|
a couple of additions to the branch
|
2012-01-19 13:33:05 +01:00 |
|
Florian Staudacher
|
81ae0c644c
|
start using new placeholders on login page
|
2012-01-18 01:17:20 +01:00 |
|
danielgrippi
|
2024716c2c
|
remove unusued javascript files; GC clearing from application/vanna controller
|
2012-01-07 14:24:27 -08:00 |
|
danielgrippi
|
1e20ca0cf5
|
remove old js files, specs; remove stream references in page js initializers
|
2012-01-07 14:23:27 -08:00 |
|
danielgrippi
|
0def71d74f
|
add some feedback text & animation; added spec for collapsing tags
|
2011-10-27 19:57:00 -07:00 |
|
danielgrippi
|
e8169ee581
|
follow tag from sidebar
|
2011-10-27 18:42:20 -07:00 |
|
danielgrippi
|
07a4fb8e96
|
download photo unavailable prompt
|
2011-10-27 17:22:33 -07:00 |
|
danielgrippi
|
b879070744
|
avatars for likes
|
2011-10-26 23:50:01 -07:00 |
|
Maxwell Salzberg
|
302ef968bc
|
move it to the right
|
2011-10-26 17:50:17 -07:00 |
|
Maxwell Salzberg
|
94ebc8b37a
|
update title
|
2011-10-26 17:40:24 -07:00 |
|
danielgrippi
|
aec8ca5c5e
|
remove diapsora ids from titles on small avatars; add twispys to contact sidebar
|
2011-10-24 15:04:58 -07:00 |
|
danielgrippi
|
1bc637d83f
|
new getting started works, needs more love
|
2011-10-24 14:11:35 -07:00 |
|
Gonzalo Rodriguez
|
178b7af946
|
When browser hits 404 for avatar image, fallback to default one. Fixes #2014.
|
2011-10-23 20:06:22 -02:00 |
|
danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
Dan Hansen
|
07beb3c1fb
|
add a basepage that is instantiated on all pages. remove meaningless pages
|
2011-08-26 12:30:28 -05:00 |
|
Dan Hansen
|
d75ef8d020
|
made backtotop a widget, added jquery-debounce
|
2011-08-26 12:30:28 -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
|
0981f04c77
|
smooth scroll like a smooth criminal
|
2011-08-11 15:19:16 -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 |
|
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 |
|
danielgrippi
|
5cea922cb8
|
fixed & updated facebox (1.3)
|
2011-08-05 14:32:58 -07:00 |
|
Isaac Sanders
|
a1dab2546d
|
Issue #1483 fix
|
2011-08-03 17:47:52 -07:00 |
|
Raphael Sofaer
|
0b1ef41838
|
Scope stream scrolled events to new elements
|
2011-08-03 12:36:07 -07:00 |
|
Raphael Sofaer
|
f74bf04798
|
Fix infieldLabels selector
|
2011-07-22 16:44:24 -07:00 |
|
Raphael Sofaer
|
caf26a5c64
|
Upgrade rails.js, add CSRF token manually in the photo uploader.
|
2011-07-21 17:49:33 -07:00 |
|
danielgrippi
|
797a6f5ca9
|
like comments js response wip
|
2011-07-11 15:02:46 -07:00 |
|
danielgrippi
|
60077bd70a
|
minor visual changes, more or less. facebox headers are now white.
|
2011-07-01 10:51:45 -07:00 |
|
danielgrippi
|
238e859dbe
|
add contact images to aspect index, removed comment background color, add vertical rule to people pages
|
2011-07-01 10:49:20 -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
|
137181e07f
|
Fix autoresizing after infscroll and aspect change, inflabels after aspect change
|
2011-06-26 20:09:21 -07:00 |
|
Raphael Sofaer
|
503de3efe1
|
Fix facebox close button and loading gif
|
2011-05-28 18:18:22 -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 |
|
danielgrippi
|
47cf614996
|
sneaky fixed header
|
2011-05-11 18:53:59 -07:00 |
|
danielgrippi
|
4280417e41
|
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
|
2011-05-11 18:33:17 -07:00 |
|
danielgrippi
|
9f3044838d
|
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
|
2011-05-11 14:53:43 -07:00 |
|
Raphael Sofaer
|
ab1f29c339
|
Working on styling the ContactsController#sharing
|
2011-05-10 14:17:43 -07:00 |
|
Dan Hansen
|
fc25c9bedb
|
Flash message handling is now a widget
|
2011-05-08 10:53:09 -05:00 |
|
Dan Hansen
|
3d11b402e0
|
Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks
|
2011-04-22 20:33:21 -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
|
cf61bb756d
|
added dir attribute to html element; made tipsy gravity dependant on that
|
2011-04-11 18:00:28 +02:00 |
|
Raphael Sofaer
|
ea932c8706
|
Fix infieldLabels in infiniteScrolled comment forms. We were initing every widget twice?
|
2011-04-07 18:21:28 -07:00 |
|
Raphael Sofaer
|
75d514c448
|
Fix infieldLabels on new aspect box
|
2011-04-07 17:53:07 -07:00 |
|
MrZYX
|
a7a8da2f75
|
added detection of rtl languages on every user based input
|
2011-04-03 02:14:35 +02:00 |
|
danielgrippi
|
b6d5165f2d
|
scroll to post on page if you can see it (via notification popup)
|
2011-03-23 17:16:30 -07:00 |
|
maxwell
|
5570182e69
|
use autoresize extraSpace to kill the bug where the comment box is not big engough for the comment, still could use some love
|
2011-03-22 11:59:10 -07:00 |
|
MrZYX
|
25aadebf46
|
fixed #946 with a solution that doesn't break the links
|
2011-03-19 21:50:40 +01:00 |
|