nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16024 commits 4 branches 0 tags 121 MiB
Commit graph

676 commits

Author SHA1 Message Date
danielgrippi
c9d0879d3d fav by clicking on something yeahhhh 2012-04-26 18:39:43 -07:00
Dennis Collinson
c3c3d57d69 huge basketball shorts 2012-04-25 16:59:06 -07:00
Dennis Collinson
7346921473 MS DC; you can now kill a post on your profile. 2012-04-24 20:46:09 -07:00
danielgrippi
9853197063 only show edit and new post controls if you're on your profile page 2012-04-24 19:24:45 -07:00
danielgrippi
570de98365 animate isotope! and inject image height in relation to ratio for quicker organization. [ci skip] 2012-04-24 16:38:17 -07:00
Dennis Collinson
8149648e5b MS DC; youtube videos now display thumbnail, and sound cloud embeds are not total train wrecks; 2012-04-24 16:18:00 -07:00
Dennis Collinson
8cca2f028b extract oembed view to seperate view 2012-04-24 15:38:38 -07:00
danielgrippi
91ebff75dd added tests and stuff for own profile checking... for some reason something isn't getting triggered properly in the presenter call, though :( 2012-04-24 01:04:49 -07:00
danielgrippi
84bd1fb1fc return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection 2012-04-23 23:31:39 -07:00
danielgrippi
dbe3b48aee now you can click on an entire post to favorite / unfav it. yay. [ci skip] 2012-04-23 23:04:53 -07:00
Dennis Collinson
e8cfe01c8a reLayouts when something is favorited, whoa 2012-04-23 12:35:13 -07:00
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
danielgrippi
ab7ac667d8 only focus on photos for now with ratios. one thing at a time, yo. 
i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later)
also moved photo dimensions into a dimensions hash in photo.rb.
 2012-04-21 20:42:50 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
aa4c554177 DG MS; added photos and more styling to the canvas view. 2012-04-21 13:12:57 -07:00
danielgrippi
32d8cfd48d MS DG; basic style enumeration for profile 2012-04-21 13:12:57 -07:00
Dennis Collinson
f46dd08cb5 canvas view is infinite stream 2012-04-21 13:12:57 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
danielgrippi
f62b9f9698 wip. 2012-04-21 13:12:56 -07:00
Dennis Collinson
f7d320b622 MS DG; checkboxes are togglable, with tested css magick 2012-04-19 14:05:55 -07:00
danielgrippi
e379a6df0f Merge branch 'master' into stream-for-photos 
Conflicts:
	app/assets/javascripts/app/views/stream_view.js
 2012-04-18 18:30:54 -07:00
danielgrippi
a307b60dd2 DC DG extract infininte scroll to a mixin 2012-04-18 12:34:43 -07:00
Florian Staudacher
8eb70c8a80 use app.models.Stream instead of app.models.Photos, 
change naming a bit to be more general since its posts+photos now
(re #3158)
 2012-04-18 20:20:56 +02:00
danielgrippi
3621576717 add/remove hidden class for pagination instead of manipulating HTML contents on every page load. 2012-04-18 10:27:22 -07:00
danielgrippi
3479cb7bdd refactored stream and Stream View 
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
 2012-04-17 21:06:34 -07:00
danielgrippi
37cd6f616e refactor stream fetching logic 2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Florian Staudacher
fe130caf10 moved non-ascii url markdown tests to text_formatter_spec, added test case + fix 2012-04-16 23:41:05 +02:00
Maxwell Salzberg
9f6ad65d73 update schema, views spec 2012-04-13 18:32:35 -07:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Dennis Collinson
9e50d0efb6 Newspaper theme selected by default, template picker object 2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88 Wallpaper frame selected when post has one photo 2012-04-12 11:56:27 -07:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout 
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
 2012-04-10 11:38:35 -07:00
Florian Staudacher
0bd4d63640 fix jasmine test for publisher textarea "resets height on close" 2012-04-06 22:24:13 +02:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Maxwell Salzberg
f5754d2b71 small fix for jasmie that works in chrome and ff 2012-04-03 17:26:13 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests 
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
 2012-04-03 16:31:52 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Florian Staudacher
1709036764 fix jasmine unhappiness I introduced with #3088 2012-04-02 21:25:01 +02:00
Daniel Grippi
a45eed13d5 Merge pull request #3086 from Raven24/fix-publisher-height 
reset publisher css height when "cleared" [ci skip]
 2012-04-01 18:24:00 -07:00
Florian Staudacher
2a4bc32eb5 make wallpaper-post spec pass 2012-04-01 17:43:33 +02:00
Florian Staudacher
0629f4fd9c added tests for resetting height on close 2012-03-30 16:40:08 +02:00
Maxwell Salzberg
fe1c0d34d5 Merge pull request #3084 from Raven24/non-ascii-begone 
finally (hopefully) fix non-ascii urls + new & old tests
 2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Steven Hancock
731446e078 Stylesheet naming issue (new-templates.css) 
Replace all references to new_templates.css with the correct filename,
new-templates.css
 2012-03-29 01:29:07 -07:00
Dennis Collinson
875ce68556 fixes for jasmine 2012-03-28 16:32:24 -07:00
Dennis Collinson
78a2ed28b9 User can select Night and Day Moods 
headline method on post

extract headline and body from post, at first newline

Night Mood
 2012-03-28 16:22:05 -07:00
Dennis Collinson
f25effcafe move handlebars templates for asset pipeline 2012-03-28 16:21:30 -07:00
Maxwell Salzberg
e1bf6441fe update new js files 2012-03-27 18:26:46 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass 
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
 2012-03-27 18:08:27 -07:00
Dennis Collinson
6288eff599 day mood for a post responds to content 
extract creating a post with templates to a static post view method.

Legacy templates extracted, day view

day mood shows photos and has variable text size
 2012-03-27 14:54:27 -07:00
Dennis Collinson
663abcb0aa MS DC Pull out stream post logic into own class 2012-03-27 14:54:27 -07:00
Dennis Collinson
775eca0026 MS DC You can has choose a template 2012-03-27 14:52:53 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
e0b18f5d6c MS DC template picker override 2012-03-27 14:52:52 -07:00
Dennis Collinson
358414371e MS DC framer shows rudimentary version of post 2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2 MS DC Post framer process init 2012-03-27 14:52:52 -07:00
Dennis Collinson
60420f1061 DG DC form autosubmits on file field change 2012-03-27 14:52:51 -07:00
Dennis Collinson
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1 Select multiple aspects 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
danielgrippi
fd0065598c DG MS; posting to services now works, updated form serializer to handle array attributes. 2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8 DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services 2012-03-27 14:52:50 -07:00
Dennis Collinson
680e7f6637 select one aspect 2012-03-27 14:52:50 -07:00
Dennis Collinson
a3ecd32264 DG DC Change dropdown text on select 2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd DC DGtoggle between public an private 2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06 DG DC OMG FORMZ 2012-03-27 14:52:50 -07:00
Dennis Collinson
bf4dabc4f4 MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Florian Staudacher
49801644cc also handle images and links without sub-domain 2012-03-24 02:57:32 +01:00
Florian Staudacher
c5139c9a71 improve behaviour, add more tests 2012-03-24 01:51:41 +01:00
Florian Staudacher
b7b8a11551 fix #2665 - allow umlauts and other non-ascii characters in url 2012-03-24 00:10:36 +01:00
Maxwell Salzberg
2e1f353ac4 Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more 
Conflicts:
	public/javascripts/app/views/content_view.js
 2012-03-19 19:11:57 -07:00
Florian Staudacher
5dae27c170 finally some working tests for "show more" 2012-03-16 02:00:50 +01:00
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
Florian Staudacher
cd965e32fa fix comment stream jasmine - bind function after spy has been defined 2012-03-14 18:43:06 +01:00
Maxwell Salzberg
56a7da530f small js test fixes 2012-03-13 19:30:34 -07:00
Florian Staudacher
9aa0a7ed58 extracted "show more" part from #2941, tests still WIP 2012-03-14 02:09:27 +01: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
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
ac8cd8368e fixing conflicts in merge 2012-03-07 23:19:51 -05:00
Joe Bivins
7b47edff14 Move date parsing to a helper. 2012-03-04 13:36:35 -05: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
Diaspora Europe
e2776420bc added likes specs to post view 2012-02-29 12:12:32 +01:00
danielgrippi
74cdc91bb1 fix likes and comment loading in the stream 2012-02-27 20:38:59 -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
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
danielgrippi
8f4fed8c0e add participants to info pane on post viewer 2012-02-22 13:15:54 -08:00
Florian Staudacher
412853bfcc make lightbox work for photos page (+tests) 2012-02-22 14:45:43 +01:00
danielgrippi
b1cbd0f4a9 fix all but 2 jasmine specs 2012-02-21 15:23:30 -08:00
danielgrippi
3db133a3a7 be less agressive when re-rendering on feedback actions 2012-02-21 15:23:30 -08:00
Maxwell Salzberg
0a49cfd866 Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3 
Go to root page if deleting post from the show page
 2012-02-18 17:14:42 -08:00
Maxwell Salzberg
7aba1ce1f7 Merge branch 'Raven24-user-photos' 
Conflicts:
	public/javascripts/app/router.js
	public/stylesheets/sass/application.sass
 2012-02-18 17:12:14 -08:00
Joe Bivins
76c11b8d37 Add test case for when a user removes their own post from the show page. 
Adjust redirection logic.
 2012-02-18 19:47:25 -05:00
Dennis Collinson
32d58e8a9b toggle all nsfw posts 2012-02-18 16:26:17 -08:00
danielgrippi
debdd6cb6b change routes to properly reflect page names (activity/stream). 2012-02-18 16:26:16 -08:00
danielgrippi
2f7465450e you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-18 16:26:15 -08:00
danielgrippi
431a04b0a8 made nsfw shield nicer and more condensed [ci skip] 2012-02-18 16:26:14 -08:00
danielgrippi
a1df9fe8db fix jasmine 2012-02-18 16:26:11 -08:00
danielgrippi
173894d926 stubbornella media and img dom structure FTW! major css deletion <3 2012-02-18 16:26:10 -08:00
Florian Staudacher
0222e4b2ee added intentionally failing specs, because dirty input breaks bookmarklet 
see also #2741 #2751 #2800
 2012-02-18 16:26:09 -08:00
Maxwell Salzberg
4f2783487d Merge pull request #2881 from beardedninja/master 
Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792
 2012-02-18 16:12:39 -08:00
Florian Staudacher
dc01515aac a little too much copy&paste... 2012-02-18 18:59:52 +01:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Daniel Grippi
1638f32042 Merge pull request #2841 from Raven24/bookmarklet-specs 
intentionally failing specs - dirty input breaks bookmarklet (+fix)
 2012-02-13 21:14:56 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
Alex Harrison
763f8465eb Added test for adding target=_blank to autolinks 2012-02-12 22:43:52 +01:00
danielgrippi
535c39ae7b fix jasmine 2012-02-09 18:21:51 -08:00
danielgrippi
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
Florian Staudacher
cab953848f added tests for photos page 2012-02-09 23:12:39 +01:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
danielgrippi
8fb3ad710f fix jasmine 2012-02-08 10:34:21 -08:00
Maxwell Salzberg
cb23b2d5b7 make jasmine happy, by just refrencing the template package we already create 2012-02-07 15:35:42 -08:00
Maxwell Salzberg
f141537d0d jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch 2012-02-07 14:07:50 -08:00
Florian Staudacher
d965016cf6 added intentionally failing specs, because dirty input breaks bookmarklet 
see also #2741 #2751 #2800
 2012-02-07 21:47:53 +01:00
danielgrippi
7d60d96132 set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip] 2012-02-05 21:18:34 -08:00
danielgrippi
39ff47150b allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing. 2012-02-04 15:50:36 -08:00
Dennis Collective
6dbd644b01 Merge pull request #2719 from stwf/return-contact-popup-to-notify 
aspects popup menu missing from 'started sharing' notifications
 2012-02-03 00:42:10 -08:00
Steven Fuchs
882853415b commit test for new code that keeps count from going negative. 2012-02-02 11:26:58 -05:00
Sarah Mei
7389b895d6 Fix #2799 - bullet points in a post that has 'read more' 2012-02-01 14:31:07 -08:00
Steven Fuchs
77fc4b6cab moved tests from jasmine to controller specs 2012-01-31 13:58:41 -05:00
Steven Fuchs
62dd2fc642 moved notifications view tests out of backbone area. 2012-01-29 19:29:51 -05:00
Steven Fuchs
5ea4bc0a1b Merge remote branch 'upstream/master' into return-contact-popup-to-notify 2012-01-29 18:13:30 -05:00
Sarah Mei
38908396f5 Fix stream view spec to look for different things on FF and on webkit. Sigh. 2012-01-29 00:09:56 -08:00
Sarah Mei
0e242c3e0a Fix one spec on FF; pendingify the other until I can figure out what's going on. Seems to be different behavior of the expander plugin across chrome and FF. 2012-01-28 23:35:26 -08:00
Sarah Mei
1f710232d8 Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766 2012-01-28 22:29:43 -08:00
danielgrippi
f250b79105 post owners can now delete any comments on their own posts. fixes #2652 2012-01-27 18:24:46 -08:00
danielgrippi
410f2d436f fix jasmine 2012-01-27 16:09:45 -08:00
danielgrippi
a3d596a853 DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests. 2012-01-26 18:51:02 -08:00
Steven Fuchs
5f705775cd spec to generate some notification fixtures and jasmine specs to test them. Notably making sure that start sharing items have an aspects popup menu. 2012-01-24 23:04:35 -05:00
Daniel Grippi
89472992cc Merge pull request #2720 from MrZYX/people_slash_guid 
use guid instead of id for /people/ urls
 2012-01-24 13:14:08 -08:00
Jonne Haß
6f283632c5 fix resharing a reshare, javascript isn't ruby :P 2012-01-24 19:44:45 +01:00
Jonne Haß
51d1bbbd70 app.user returns false instead of undefined if logged out, fix #2723 2012-01-24 11:56:48 +01:00
Dennis Collinson
870ad3d9f7 DC DG; some fixes, mentioning works. 2012-01-23 19:32:15 -08:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
danielgrippi
3a76490640 window.app.user() doesn't return attributes nested in a key; added a comment_view spec 2012-01-22 23:37:13 -08:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna 
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
 2012-01-22 22:15:14 -08:00
danielgrippi
5d15c53f6b Revert "Revert "now using handlebars for client side templates" for now" 
This reverts commit 5f9c469b12.
 2012-01-22 22:01:57 -08:00
Dennis Collinson
5f9c469b12 Revert "now using handlebars for client side templates" for now 
This reverts commit 4692055d8a.
 2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a now using handlebars for client side templates 2012-01-22 16:59:44 -08:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
danielgrippi
cc1ac843cc re-added widget; fixed tests; use _.throttle instead of depricated custom debounce 2012-01-21 20:23:00 -08:00
danielgrippi
c3b9bb9a9a expanding likes works again 2012-01-21 18:55:07 -08:00
danielgrippi
9e3521396d clear new comment on submit; include the newer autoexpander in jasmine 2012-01-20 21:58:07 -08:00
danielgrippi
25d0f0d87f updated jquery autoResize; comment boxes now expand 2012-01-20 21:45:55 -08:00
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
356494b78b DG DC; $("window") doesn't actually work in the binding scenario 2012-01-19 17:16:58 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Dennis Collinson
9b1d64bb76 stream model has a posts collection 2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f refactoring backbone urls 2012-01-18 19:08:36 -08:00
Dennis Collinson
9cde06a628 You can now like "reshares", stream is polymorphic 2012-01-17 17:22:56 -08:00
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
Dennis Collinson
66d71a217e you should be able to reshare reshares again, first pass 2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802 TT MS; fix a bug when the mention string is not actually in the mentions 2012-01-16 15:59:40 -08:00
danielgrippi
8150d32b86 using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app 2012-01-15 18:28:58 -08:00
danielgrippi
177f608276 fix oembed issues in backbone land 2012-01-15 15:56:34 -08:00
danielgrippi
9d2b1e9415 actually clear photos from the publisher. also, i hate the photo uploader we're using. 2012-01-14 15:40:44 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
Jonne Haß
5d0223601b fallback to english pluralization rule if none is found 2012-01-14 21:26:01 +01:00
Dennis Collinson
dec3006b50 DH DC don't render feedback view on public posts 2012-01-12 17:47:03 -08:00
Dennis Collinson
33772a27d9 cleanup alert spec 2012-01-12 17:47:03 -08:00
Dennis Collinson
7b1d7b8ac9 small refactor 2012-01-12 17:47:02 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
Steven Fuchs
176797628e javascript tests for the notification click callback routine. 2012-01-10 00:07:42 -05:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
a1cf279226 support twitter hashbangs in urls for url parsing [ci skip] 2012-01-08 17:35:56 -08:00
danielgrippi
5e65c88bd8 better regex for capturing urls (sensitive to urls in tags) [ci skip] 2012-01-08 17:06:25 -08:00
danielgrippi
b5dea63774 larger buffer for autoscroll 2012-01-07 21:25:02 -08:00
danielgrippi
a899e71ce5 switch order of auto-linking 2012-01-07 21:19:13 -08:00
danielgrippi
ad2e6a414f autolink urls in content view 2012-01-07 20:47:30 -08:00
danielgrippi
c9c7cff479 don't fetch more posts from the stream if only one post has been returned 2012-01-07 19:59:33 -08:00
danielgrippi
e928cc805a fixed markdown issues with reshares; removed puts from specs 2012-01-07 17:33:16 -08:00
Dennis Collinson
8fa6c46de2 DG DC more hashtag fixes, throw in mention clearing cowboy style 2012-01-07 14:24:28 -08:00
Dennis Collinson
daba42c857 mentions now render client side, wow 2012-01-07 14:24:28 -08:00
Dennis Collinson
b13e72bc00 spec fix for markdown 2012-01-07 14:24:28 -08:00
danielgrippi
0fb1bf5d4b hash tags are linked on the front end, adding markdown.js file 2012-01-07 14:24:27 -08:00
danielgrippi
fd6e3bae62 move timeago and tooltip logic to the base View 2012-01-07 14:24:27 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
24950bd364 restored ability to 'unlike' 2012-01-07 14:23:28 -08:00
danielgrippi
f72edbc039 added notification and unread mesasge count back to the header 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
danielgrippi
a92401f157 prevent further pagination if user has fetched all posts for a given stream 2012-01-07 14:23:28 -08:00
Dennis Collinson
d5e9c5eebc DG DC add stream faces to page party 2012-01-07 14:23:28 -08:00
Dennis Collinson
b582f45452 green jasmine, yo 2012-01-07 14:23:28 -08:00
Dennis Collinson
9d24b518f5 DC DG; correctly populate the stream jasmine fixture 2012-01-07 14:23:28 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
31fac53969 added blocks js model; load app.models.Post before any other model when loading assets 2012-01-07 14:23:27 -08:00
danielgrippi
5e88ca846a remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs 2012-01-07 14:23:27 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23: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
85b5974fa9 removed top-level element delcarations from app templates 2012-01-07 14:23:27 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
71bae10317 fixed notification specs; removed a cuke around reshares already tested in jasmine 2012-01-07 14:23:27 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
3268726a9a added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh) 2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68 modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine 2012-01-07 14:23:26 -08:00
danielgrippi
0a4b4fb344 remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher 2012-01-07 14:23:26 -08:00
danielgrippi
02ca7a32f0 added reshare logic back (doesn't append it to the stream...) 2012-01-07 14:23:25 -08:00
danielgrippi
027bb3dee7 removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view 2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03 created publisher view; wip 2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22 downcase namespacing of app 2012-01-07 14:23:25 -08:00
Dennis Collinson
f5609f2182 App views base renders subviews like magic 2012-01-07 14:23:24 -08:00
danielgrippi
31d24c60c7 added spec for .like_action link being rendered; added comments div back to stream_element for now 2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465 DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green 2012-01-07 14:23:24 -08:00
danielgrippi
67e56dce2c backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget 2012-01-07 14:23:23 -08:00
danielgrippi
c6e4172926 fixed likes_controller; half of the failing jasmine tests 2012-01-07 14:23:23 -08:00
Dennis Collinson
a7627fabea pulling more view logic into superclass 2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active; 
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
 2012-01-07 14:23:22 -08:00
danielgrippi
525fd3c4e4 make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function) 2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85 added more jasmine spec; NSFW wip 2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again 2012-01-07 14:23:22 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
danielgrippi
1d178116e9 DC DG; jasmine green 2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581 introduce comments 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Jonne Hass
77d850f492 fix jasmine:ci 2011-12-11 02:43:04 +01:00
Jonne Hass
4f993b3d24 fix jasmine spec 2011-11-10 18:15:23 +01:00
Dan Hansen & Maxwell Salzberg
3cfa0c4602 use the stream element partials for testing the StreamElement widget instead of Aspects#index 2011-11-04 18:40:24 -05:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)" 
This reverts commit 3d8f971ca9.
 2011-10-27 23:53:55 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
Dan Hansen
db3e411978 fix bootstrap-popover spelling 2011-10-26 13:33:04 -05:00
Dan Hansen
ad978f4342 add bootstrap js to jasmine src files 2011-10-26 13:32:20 -05:00
Dan Hansen
091db3fd66 js i18n now accepts a count 2011-10-25 21:58:37 -05:00
Dan Hansen
b92cb921c1 Publisher.bindAspectToggles() is called in Publisher.initialize(). only bind the events once 
jQuery objects containing the same elements don't evaluate as true. test that the elements within the jQuery objects are the same
 2011-10-23 21:30:54 -05:00
Dan Hansen
81fc5b28da remove embedder 2011-10-23 21:30:54 -05:00
Sarah Mei
06ad78f026 Fix some publisher specs - spelling errors and stray console.log 2011-10-23 19:09:20 -07:00
danielgrippi
8ffbf59f41 updated publisher spec; fixed dropdown opacity bug 2011-10-17 19:00:33 -07:00
danielgrippi
b61246c168 fixed all but two jasmine specs... 2011-10-17 16:54:18 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Dan Hansen & Gonzalo Rodriguez
2057c8fcf1 Aspect navigation rework started.. 
ToDo:
  * Fix failing posts cuke, seems to be timing issue
  * Populate stream title when no aspects selected
  * All aspects selected by default?
 2011-09-05 02:02:07 -03:00
Sarah Mei
d701581379 Fix 1.9 yaml error caused by asterisks in the glob path. 2011-09-03 20:35:16 -07:00
Sarah Mei
a5b120532a Use a jasmine fixture with just one post for the comment specs. 2011-09-03 17:51:51 -07:00
Maxwell Salzberg
722a2a86ea remove console.log; instantiate a page for jasmine tests 2011-09-03 12:21:09 -07:00
Sarah Mei
1a823d647e Fix comment jasmine fixture generation to be more consistent (i.e. take out more aspects.first stuff). Fix comment jasmine spec to be more consistent - remove unneeded spies, etc. 2011-09-03 12:02:51 -07:00
Dan Hansen
2b31999f28 pull in jasmine-ajax, start testing our ajax callbacks with meaningful responses 2011-08-31 00:00:49 -05:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
Maxwell Salzberg
224b59322b remove console.log in spec 2011-08-29 19:16:41 -07:00
Andrej Kacian
36e32ba497 Update jasmine tests for the stream element widget. 2011-08-30 01:46:39 +02:00
danielgrippi
b7f9400a9f Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking). 2011-08-28 22:04:06 -07:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Andrej Kacian
9fd4432e5a Fix a jasmine test in CommentToggler 2011-08-22 20:05:18 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
395df041db Made toggleComments jasmine test aware that there are more posts in the fixture 2011-08-22 00:38:34 +02:00
Andrej Kacian
2a52face12 Add jasmine test for ajax spinner display 2011-08-22 00:38:34 +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
834c75894c jasmine is green again 2011-08-19 14:42:28 -07:00
Raphael Sofaer
88b317f0c1 Fix jasmine spec for aspectFilters 2011-08-17 10:17:14 -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
Andrej Kacian
e5b6850556 Fix the test 2011-08-07 00:44:37 +02:00
Andrej Kacian
6cf42fb8ba Better stab at the jasmine test. 2011-08-06 23:37:21 +02:00
Andrej Kacian
2716316dac Add jasmine test for #1587 fix. 2011-08-06 23:37:21 +02:00
Sarah Mei
a62325be23 Fix references to facebox in jasmine specs. 2011-08-06 14:36:12 -07:00
Raphael Sofaer
f0f388d9e1 Fix weird error in jasmine suite 2011-08-05 15:09:16 -07:00
Raphael Sofaer
168ccc11b0 Call collapseText on stream initialize 2011-08-03 12:47:48 -07:00
Raphael Sofaer
0b1ef41838 Scope stream scrolled events to new elements 2011-08-03 12:36:07 -07:00
danielgrippi
3e7e2b4d2a DH remove test pollution from EventBroker#subscribe spec 2011-07-14 18:03:30 -07:00
Dan Hansen
bdb4c888a9 Remove embedder spec from git repo, it's now in spec/javascripts/widgets/embedder-spec.js 2011-07-13 22:49:32 -07:00
Dan Hansen
ca2413ff6b Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup. 2011-07-13 22:23:31 -07:00
Raphael Sofaer
abe10b3889 Comment out falsely failing JS tests, we should just stop using extend, it is needlessly hard to test. 2011-07-13 11:03:55 -07:00
danielgrippi
039b65b5cc a little js cleanup for post.js 2011-07-12 00:12:08 -07:00
Raphael Sofaer
e59f49aace Fix specs after merge 2011-07-11 14:38:51 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
Dan Hansen
bc465848c9 MS DH fixed like sizes, everywhere 2011-06-02 17:45:45 -05: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
Raphael Sofaer
0770d6e8fd Most of the stream.js stuff needs to be live, unfortunately. 2011-05-31 16:00:57 -07:00
Sarah Mei
5b6eca893b Put jasmine.Clock.tick back down to 200 (bumped to 400 during debugging & accidentally checked in) 2011-05-28 22:23:07 -07:00
Sarah Mei
6d6445b00a Fix locale loading in stream spec 2011-05-28 21:22:35 -07:00
Raphael Sofaer
cfd077a90d Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec 2011-05-28 20:37:12 -07:00
Sarah Mei
5676fdc73e fix jasmine specs 2011-05-28 20:18:40 -07:00