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
|
834c75894c
|
jasmine is green again
|
2011-08-19 14:42:28 -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 |
|
Andrej Kacian
|
bddd7c717b
|
Write jasmine test for the tag unfollow icon visibility
|
2011-08-09 22:54:31 +02:00 |
|
Sarah Mei
|
a62325be23
|
Fix references to facebox in jasmine specs.
|
2011-08-06 14:36:12 -07:00 |
|
Dan Hansen
|
864233eb63
|
fix status message show page and break out Post to it's own javascript widget
|
2011-06-02 17:45:45 -05:00 |
|
Sarah Mei
|
5676fdc73e
|
fix jasmine specs
|
2011-05-28 20:18:40 -07:00 |
|
Raphael Sofaer
|
503de3efe1
|
Fix facebox close button and loading gif
|
2011-05-28 18:18:22 -07:00 |
|
Evan Tatarka
|
5f406b18d5
|
Updated code to work with lastest master. Tests should now pass.
|
2011-05-12 20:38:05 -04:00 |
|
Sarah Mei
|
a904204f46
|
Content updater refactor complete for posts
|
2011-05-08 14:22:40 -07:00 |
|
Dan Hansen
|
50e67524c1
|
content update wip
|
2011-05-08 15:18:02 -05:00 |
|
Dan Hansen
|
fc25c9bedb
|
Flash message handling is now a widget
|
2011-05-08 10:53:09 -05:00 |
|
Dan Hansen
|
4a101f25d9
|
Notifications.js refactor, add specs
|
2011-04-27 16:22:56 -05:00 |
|
Dan Hansen
|
efd9e61f45
|
Add new infinite scroll location to jasmine config
|
2011-04-22 20:35:15 -05:00 |
|
Raphael Sofaer
|
9969dbd109
|
Start refactoring aspect-filters.js
|
2011-04-13 15:55:10 -07:00 |
|
MrZYX
|
8b4c8e77cb
|
added direction detector widget to jasmine.yml
|
2011-04-11 22:23:21 +02:00 |
|
Raphael Sofaer
|
0b9575af5d
|
JS cleanup
|
2011-04-08 16:11:13 -07:00 |
|
Raphael Sofaer
|
c7dc6ce817
|
Fix jasmine specs
|
2011-04-07 18:30:29 -07:00 |
|
maxwell
|
f3a62bf76b
|
update jquery to latest
|
2011-04-02 15:03:41 -07:00 |
|
zhitomirskiyi
|
bb4c2ee85d
|
added a character count to the publisher
|
2011-03-30 19:11:24 -07:00 |
|
Sarah Mei
|
87fb4b0552
|
alert is not the way to indicate a pending jasmine spec. >.< Try xit and xdescribe instead!
|
2011-03-22 21:03:33 -07:00 |
|
danielvincent
|
164fe1c1b5
|
adjust column width, leading, serifs, etc. in stream for better readability.
|
2011-02-13 15:27:14 -08:00 |
|
zhitomirskiyi
|
1da965616b
|
added an option to remove a contact from the last aspect, after a prompt
|
2011-02-09 17:47:27 -08:00 |
|
Raphael Sofaer
|
acd55cf7d6
|
Put keycodes.js in jasmine
|
2011-02-09 17:42:53 -08:00 |
|
danielvincent
|
77403596aa
|
mentions in publisher autocomplete within context
|
2011-02-09 16:07:24 -08:00 |
|
zhitomirskiyi
|
59f0dca7c7
|
Revert "publisher is now a hot widget"
This reverts commit 8039ab312a.
|
2011-02-05 15:24:20 -08:00 |
|
Dan Hansen
|
8039ab312a
|
publisher is now a hot widget
|
2011-02-05 16:47:43 -06:00 |
|
Raphael
|
cd8d9989cf
|
Refactor publisher JS, use hidden field for submitting
|
2011-02-02 14:27:14 -08:00 |
|
Dan Hansen
|
be2413b9a8
|
load timeago widget
|
2011-01-29 16:02:04 -06:00 |
|
Dan Hansen
|
9046273ebd
|
some specs for the i18n widget
|
2011-01-29 13:31:45 -08:00 |
|
Dan Hansen
|
d03119f7e9
|
Embedder is now a widget, show videos before comments
|
2011-01-29 13:22:34 -06:00 |
|
Dan Hansen
|
bdf559bb2b
|
remove video embedding from stream.js, use embedder.js
|
2011-01-22 23:40:08 -06:00 |
|
Dan Hansen
|
d4f30ded1b
|
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
|
2011-01-14 14:54:44 -06:00 |
|
maxwell
|
27162e59b8
|
adding new js file to jasmine
|
2011-01-13 17:00:08 -08:00 |
|
Sarah Mei
|
545fbe4679
|
Fix jasmine specs by replacing fancybox with facebox, and changing expectation to match new view.
|
2011-01-09 19:41:18 -08:00 |
|
Thomas R. Koll
|
5e1f5ff5b1
|
Starting spec for rails.js
|
2010-12-29 17:43:50 +01:00 |
|
Sarah Mei
|
7cd8e0f16b
|
Fix jasmine specs so that they fail when they're supposed to.
|
2010-12-12 12:57:11 -08:00 |
|
OhaiBBQ
|
ba23bd7a0a
|
Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs
|
2010-12-04 11:54:59 +03:00 |
|
root
|
5cd0a60073
|
Moved to it's own file, added specs
|
2010-12-02 02:22:05 +03:00 |
|
Dan Hansen & Sarah Mei
|
b2f4e064fc
|
stream.js now semi-split into functions (still needs work); specs for toggling comments
|
2010-11-30 16:24:11 -08:00 |
|
Raphael
|
57485e7093
|
Move aspect contacts pane js to public
|
2010-11-30 13:55:37 -08:00 |
|
Dan Hansen & Sarah Mei
|
257d6f414a
|
Top-level Diaspora object for js widget management
|
2010-11-25 22:24:25 -08:00 |
|
Sarah Mei
|
218aa1c0d6
|
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
|
2010-11-21 19:56:35 -08:00 |
|
Raphael
|
b991df9d3a
|
WSR spec working
|
2010-11-21 16:19:25 -05:00 |
|
maxwell
|
2c627cdb2b
|
updating jas
|
2010-11-17 00:16:11 -08:00 |
|
maxwell
|
f81bb1d7e7
|
i broke the jasmine tests. this is me fixin them
|
2010-11-16 22:02:18 -08:00 |
|
Sarah Mei
|
1a4fa2713a
|
More specs for aspect-edit.js. Initialize now fully covered.
Also, bundler upgraded our cucumber and rspec.
|
2010-11-07 16:58:51 -08:00 |
|
Sarah Mei
|
32d953f457
|
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
|
2010-11-06 16:50:07 -07:00 |
|
Sarah Mei
|
fad9c09212
|
refactor aspect-edit.js in prep for jasmine testing
|
2010-11-02 13:37:27 -07:00 |
|
Sarah Mei
|
3bd3a63c5d
|
Enough jasmine specs to get us started.
|
2010-10-30 11:48:17 -07:00 |
|