danielgrippi
5c90b0d5e7
comment out a jasmine spec for now to make travis happy
2012-03-14 17:33:08 -07:00
danielgrippi
5e75c6d675
fix jasmine around contact-list.js
2012-03-14 16:26:30 -07:00
Maxwell Salzberg
1d5bc6be70
Merge branch 'fix-comment-jasmine' of https://github.com/Raven24/diaspora into Raven24-fix-comment-jasmine
2012-03-14 11:09:32 -07:00
Maxwell Salzberg
36f9ca6b1a
resolve merge in notifications controller
2012-03-14 10:46:59 -07:00
Florian Staudacher
cd965e32fa
fix comment stream jasmine - bind function after spy has been defined
2012-03-14 18:43:06 +01:00
Diaspora Europe
05f2be40e1
added test for notification dropdown #2998
2012-03-14 17:02:18 +01:00
Diaspora Europe
7fd39b2896
mobile: added index and read all tests to notification spec #2997
2012-03-14 15:58:07 +01:00
Maxwell Salzberg
56a7da530f
small js test fixes
2012-03-13 19:30:34 -07:00
Maxwell Salzberg
b8b6557379
adding an ajax loader, and pull out the js from the middle of the view
2012-03-13 17:10:23 -07:00
Maxwell Salzberg
2a30e60fe0
Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly
2012-03-13 16:41:16 -07:00
Diaspora Europe
97d6b8dab8
notifications update spec and cleanup json response
2012-03-13 11:46:14 +01:00
Steven Fuchs
73fd96d439
this file should have never been added...
2012-03-10 14:21:13 -05:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Steven Fuchs
9de477cf5a
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f
jasmine spec for stimulating deferred searches
2012-03-07 23:19:51 -05:00
Steven Fuchs
7d3a6a061c
add spec to ake sure background query is only set when a full diaspora id is given.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ac8cd8368e
fixing conflicts in merge
2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e
run second search ajaxily when no results are found from remote pod.
2012-03-07 23:19:50 -05:00
Maxwell Salzberg
db0859a83c
bug fix: you can now mention and post a photo at the same time
2012-03-07 14:42:46 -08:00
Maxwell Salzberg
f81a6ced01
Merge pull request #2886 from diasp/2823-fix-unlike-unfollow
...
#2823 fix unlike and unfollow update
2012-03-06 12:22:20 -08:00
Maxwell Salzberg
5a7c8d8ea4
make the hash in oembed cache dynamic as to try to fix travis
2012-03-05 11:09:51 -08:00
Joe Bivins
7b47edff14
Move date parsing to a helper.
2012-03-04 13:36:35 -05:00
Maxwell Salzberg
9e249bb7ef
small refactor of helper method [ci skip]
2012-03-03 17:53:50 -08:00
Maxwell Salzberg
e6b1111fd1
AHHHH refactor attack_vectors_spec; hopefully it now borders on understandiablity. this deffy needs another pass from another human, as I had to make tons of spec helper methods to make the crazy setup make sense, but I think we are bordering on something that would let us write new tests in a sane way. whether all of these tests now make sense to test in the first place, that is another question all togther, as it was outside the scope of this refactor
2012-03-03 17:50:51 -08:00
Maxwell Salzberg
bd021bbd91
Correct our general exception handling.
...
thanks @mperham! see: http://t.co/Jyt7vV4I
2012-03-03 16:26:06 -08:00
Maxwell Salzberg
67e4f9e159
remove puts and fix a conversationscontroller spec to be a bit more predictable
2012-03-03 16:25:10 -08:00
Joe Bivins
e26fcf836a
Correct JS error in app_spec.js
2012-03-03 12:20:31 -05:00
Joe Bivins
4769a25d59
Add ISO 8601 timestamp parsing for legacy browsers.
...
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
2012-03-03 12:14:43 -05:00
Daniel Grippi
7a774661bb
Merge pull request #2777 from stwf/tweak-twitter-truncation
...
take url shortening into effect before truncating twitter posts
2012-02-29 22:49:46 -08:00
Diaspora Europe
e2776420bc
added likes specs to post view
2012-02-29 12:12:32 +01:00
Maxwell Salzberg
0d93227f07
hopefully make travis happy:
2012-02-28 17:52:13 -08:00
danielgrippi
61b4e77bde
Merge branch 'profiles'
2012-02-28 10:29:17 -08:00
danielgrippi
74cdc91bb1
fix likes and comment loading in the stream
2012-02-27 20:38:59 -08:00
Maxwell Salzberg
22cda15aa8
presenter now has a title
2012-02-27 18:11:41 -08:00
danielgrippi
0df179c514
fix specs
2012-02-27 17:56:52 -08:00
Dennis Collective
7abbe4a642
Merge pull request #2925 from diasp/2833-conversations-should-return-json
...
Conversations should return json #2833
2012-02-27 17:34:10 -08:00
Dennis Collective
f5ef1e8c14
Merge pull request #2814 from stwf/aspects-javascript-fixes
...
update aspect name in aspects listing after editing.
2012-02-27 17:19:05 -08:00
danielgrippi
0112285985
Merge branch 'master' into profiles
...
Conflicts:
lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Steven Fuchs
66afb7baff
use a stub instead of creating a post to simpy supply text
2012-02-25 23:59:02 -05:00
Maxwell Salzberg
42a93f9490
remove weird monkey patch in sessions controller #wtf
2012-02-25 17:41:46 -08:00
Maxwell Salzberg
27a4c1bf2d
introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor
2012-02-25 16:57:14 -08:00
Maxwell Salzberg
49b0a44738
removing estates builder, as we are now using a template
2012-02-25 16:55:26 -08:00
Maxwell Salzberg
a1f39398be
Merge pull request #2902 from JMSilla/master
...
Fix atom feed bug (bug mash 7) [ci skip]
2012-02-25 16:47:13 -08:00
JMSilla
8178e0712c
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
2012-02-25 22:24:43 +00:00
danielgrippi
73f224e690
don't render page-viewer twice; last_post should actually get the last post posted, not the first one
2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc
MS DC show last post and show page works unauthenticated
...
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
danielgrippi
2c0cfa53dc
don't show left-right nav when idle
2012-02-24 13:31:17 -08:00
