danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
vcuculo
|
8919d0c0ce
|
fixed bookmarklet
|
2011-09-02 10:28:32 +02:00 |
|
danielgrippi
|
af569204b8
|
Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet"
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
|
2011-09-01 16:31:49 -07:00 |
|
vcuculo
|
6518a89302
|
fixed bookmarlet
|
2011-09-02 00:44:56 +02: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
|
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 |
|
Raphael Sofaer
|
140268365c
|
Simplify aspect dropdown views
|
2011-08-16 12:43:08 -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
|
757c9169fc
|
updated gemfile
|
2011-07-21 14:32:10 -07:00 |
|
MrZYX
|
53bdb2cade
|
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
|
2011-03-30 17:17:36 +02:00 |
|
maxwell
|
bbe5f56292
|
you can now mention in the bookmarklet
|
2011-03-29 13:55:14 -07:00 |
|
maxwell
|
8b7dc0a2cc
|
translated bookmarklet, added post to main page
|
2011-03-28 19:57:06 -07:00 |
|
maxwell
|
9e5890288c
|
more bookmarklet improvements
|
2011-03-28 18:34:52 -07:00 |
|
maxwell
|
f08b5dfafe
|
basic functionality done, fixing rough edges
|
2011-03-28 18:11:59 -07:00 |
|