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

393 commits

Author SHA1 Message Date
danielgrippi
d8470d303a simple mixtracking 2012-05-30 15:25:19 -07:00
danielgrippi
55cfc0a367 Revert "load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip]" 
we don't process images with the same aspect ratio at smaller
resolutions.

This reverts commit 6d038d6225.
 2012-05-28 21:49:09 -07:00
danielgrippi
6d038d6225 load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip] 2012-05-28 21:40:45 -07:00
Dennis Schubert
f68f14aa5b Quickfix: replace slideAndRemove() with remove() to prevent the ugly javascript error and make the post go away after click on "hide". Fixes #3249 2012-05-29 01:57:52 +03:00
Maxwell Salzberg
fb1fd665de Merge pull request #3313 from OhaiBBQ/master 
BMM #3, “Show x more comments” deletes text in comment box when clicked
 2012-05-24 20:20:58 -07:00
Dan Hansen
e248526bef bugmash #4 
The Publisher doesn’t expand after writing more than 30 lines of text
 2012-05-24 19:50:39 -07:00
Dan Hansen
d334097ee2 bugmash #3 
persist unsaved comment value after expanding comments
 2012-05-24 19:08:43 -07:00
Dennis Collinson
c4240154b1 back to profile works 2012-05-24 12:43:06 -07:00
Maxwell Salzberg
bc25ef2385 dont navigate to posts that dont exisit 2012-05-24 12:31:53 -07:00
danielgrippi
58ac040f8f clicking a permalink on the new stream does not make an HTTP request to go to the post's page 2012-05-24 12:05:27 -07:00
Dennis Collinson
f3174941bd fix the "has no posts" on back bug. 2012-05-24 11:40:27 -07:00
Maxwell Salzberg
bed07872f2 composer now prevents you from submitting an empty frame. 2012-05-24 11:36:43 -07:00
Maxwell Salzberg
d270910500 set the submit button to be disabled on the framer, and write a test 2012-05-24 11:36:43 -07:00
danielgrippi
a5f023354a fixed the empty state styling on smallframe [ci skip] 2012-05-24 11:00:07 -07:00
Maxwell Salzberg
82218fd7cb new stream now remembers how far you have scrolled. 
also, jasmine is really cool.
 2012-05-23 17:25:40 -07:00
danielgrippi
5d2ea71766 added EditbaleSmallFrame class; frame on framer second step is partially editable 2012-05-23 17:07:41 -07:00
danielgrippi
2a37491be0 changed service icons; icons for template picker [ci skip] 2012-05-23 15:09:57 -07:00
danielgrippi
0e1c66f5b6 DG MS; only show applicable frames in the framer step 2012-05-23 12:59:27 -07:00
danielgrippi
92cbcae9c3 DG MS; moved framer controls into a subview & off to the side 2012-05-23 12:16:35 -07:00
danielgrippi
120c6b46e0 MS; Fix fake following, as we took it out so I nuked the tests 2012-05-22 19:04:04 -07:00
danielgrippi
c6b8d75313 DG MS; cool header with background in new stream 2012-05-22 19:00:22 -07:00
danielgrippi
20360b5cc5 DG MS; added interactions & permalink in the new stream [ci skip] 2012-05-22 15:48:23 -07:00
danielgrippi
2e52def47a DG MS; background colors for great justice (on the stream) 2012-05-22 15:47:09 -07:00
Dennis Collinson
1c342282b0 fixing event passing 2012-05-22 15:11:21 -07:00
danielgrippi
83fec811cc DG MS; author attribution in the stream; cleaned up some *new* stream styling 2012-05-22 13:50:19 -07:00
Dennis Collinson
9f1d0b64b4 killing stream_object_view 2012-05-22 13:43:21 -07:00
Dennis Collinson
36ef010ed9 DG DC MS; stream has one interactions div 2012-05-22 12:38:48 -07:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
Dennis Collinson
10201f2e40 more work on new stream interactions, hella refactorz. 2012-05-21 17:15:10 -07:00
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
danielgrippi
481160bdcb move canvas-frame functionality into js sub-class for great justice 2012-05-21 12:58:25 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
danielgrippi
0960a090fa actually use the computed image height; remove unused presenter 2012-05-21 11:09:42 -07:00
danielgrippi
ff42f250ca make a small-frame template folder; we're not going to want the same dom structure moving forward... 2012-05-21 11:09:42 -07:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
danielgrippi
27aff7fb1e DG DC; GREEEEEEEEEN 2012-05-17 17:01:31 -07:00
Dennis Collinson
c66bd9d6d8 fix posting with services, fix cuke 2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2 Going back to the composer from the framer is happy via button 2012-05-17 15:32:35 -07:00
danielgrippi
c8aa67360b backfill some tests; jasmine green 2012-05-17 13:31:40 -07:00
danielgrippi
e48d57b19b Revert "DC fix back button to profile with this.deferred reference" 
This reverts commit e5206f3429.
 2012-05-17 12:05:45 -07:00
danielgrippi
e5206f3429 DC fix back button to profile with this.deferred reference 2012-05-17 11:47:17 -07:00
danielgrippi
ed6785d7cb don't use an iframe for the composer anymore. yayyyyy 2012-05-16 18:55:25 -07:00
Dennis Collinson
a90968ea2d basic experimental stream 2012-05-14 17:57:02 -07:00
Dennis Collinson
ca1a61825d make post load faster from profile to show 
using dirty preloads for now.
I like it dirty.
 2012-05-14 12:14:11 -07:00
danielgrippi
f14907e64c more responsive stuffs [ci skip] 2012-05-12 22:29:08 -07:00
Dennis Collinson
3b897f29d8 kill unused (i hope) participations collection 2012-05-12 18:11:21 -07:00
Dennis Collinson
ec8625746e add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang 2012-05-12 18:08:45 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
Dennis Collinson
9b9a64ffd0 fix reshares in interaction presenternavigate replace states on next or previous so back and forward work 
default user image
 2012-05-10 15:28:27 -07:00
Dennis Collinson
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
danielgrippi
1791d6b1b8 defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip] 2012-05-09 00:46:40 -07:00
danielgrippi
b641cddb65 eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip] 2012-05-09 00:36:14 -07:00
danielgrippi
f053b71c87 add title to service icons. yay. [ci skip] 2012-05-08 18:28:31 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Dennis Collinson
d1d99d5dd4 Jamie Cai DC refactor isOwnProfile, fix tests 2012-05-07 17:53:37 -07:00
danielgrippi
cb2c972cee Merge branch 'master' of github.com:diaspora/diaspora 2012-05-07 16:41:29 -07:00
Dennis Collinson
1c135b61fd Jamie Cai DC message in profile when user has no posts 2012-05-07 15:56:30 -07:00
danielgrippi
34819b4128 temp button instead of textbox for beta-limbo users 2012-05-07 15:40:13 -07:00
danielgrippi
6010579c39 md5 the user's diaspora id for wallpaper image filename; clean up photo_form.js a little (thx max) 2012-05-06 12:35:11 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
danielgrippi
91ffe00de2 apple-style drop shadows (blur the crap out of them); isotope doesn't overflow: hidden; anymore (no shadow cutoff) [ci skip] 2012-05-06 12:35:10 -07:00
danielgrippi
b5fbefad4b this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action. 
for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`.  the current image tests in the public folder are results of the convert command noted.
 2012-05-06 12:35:10 -07:00
danielgrippi
e5bb4216f9 clean up dom on post viewer; use circles instead of weird semi-rounded boxes to be consistent 2012-05-05 19:55:38 -07:00
Dennis Collinson
d47785d957 next and previous should be faster 
unbind events on navigate, implimented for at least the single page view
bind changed to on for backbone navigating
 2012-05-05 18:35:58 -07:00
Dennis Collinson
ada91e8568 next and last post don't have obnoxious blink 1/2 the time. 
why not the rest, I don't know, time to start getting into event cleanup territory.
 2012-05-05 17:45:43 -07:00
danielgrippi
456da7844a set profile name… no tests make me a sad boy, but i must run & will backfill this one tomorrow. 2012-05-04 22:09:40 -07:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient 
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
 2012-05-04 18:25:09 -07:00
danielgrippi
40347038f8 DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
Dennis Collinson
4253796f55 preload post on post show 2012-05-04 16:55:09 -07:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
2d3edbf74f pulsate control to add new post if no posts present 2012-05-02 22:05:40 -07:00
Florian Staudacher
d31ea8f2bd use back-to-top initializer, fixes #2840 2012-05-02 00:03:07 +02:00
danielgrippi
90919fa488 don't attempt to favorite with a save if you are not the post owner. in doing so, you will get logged out. also, update the gemfile.lock 2012-04-29 00:05:49 -07:00
danielgrippi
cfb52a7129 dg ms; little js cleanup [ci skip] 2012-04-28 23:52:54 -07:00
Maxwell Salzberg
a4bf4a40f2 slay reLayout suckage by reading 2012-04-28 17:58:53 -07:00
danielgrippi
1b6c33aff5 show a user's full profile info if she's on her own page. duh. 2012-04-28 17:41:22 -07:00
danielgrippi
c3b0bbd425 show new profile pages for those who have it activated 2012-04-28 16:06:36 -07:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
danielgrippi
52efb3710c show a follow button for users with pre-existing contacts (legacy beta testers) 2012-04-28 14:13:43 -07:00
danielgrippi
4dea64fe9f click entire white bar on post in profile to go to show page to make it easier to navigate (our icons are too small for my dumb mouse to click) [ci skip] 2012-04-28 11:52:11 -07:00
danielgrippi
accd507f36 logout button on your profile [ci skip] 2012-04-28 11:51:27 -07:00
danielgrippi
9a547b8161 follow links on profile page [ci skip] 2012-04-28 11:13:39 -07:00
danielgrippi
699b0cff16 don't expose follow/unfollow to a user in the UI 
following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.
 2012-04-28 11:07:18 -07:00
Florian Staudacher
462959fbcd Merge pull request #3190 from diaspora/reshare-flash 
use flash message instead of just appending reshares to the current stream
 2012-04-28 10:04:40 -07:00
danielgrippi
7f4af0359f add bootstrap tooltips for great justice (and clarity) [ci skip] 2012-04-27 20:45:26 -07:00
danielgrippi
889b86f9cb implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved) 2012-04-27 19:38:06 -07:00
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
Maxwell Salzberg
7309114136 adding magic to buttons on framer [ci skip] 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
fb4ad72378 composer is much cooler 2012-04-26 20:30:17 -07:00
danielgrippi
c9d0879d3d fav by clicking on something yeahhhh 2012-04-26 18:39:43 -07:00
Florian Staudacher
0dee8aae36 [reshares] display flash message instead of just appending it to the stream (fixes #2094) 2012-04-27 00:57:20 +02:00
Maxwell Salzberg
6d2cd31e73 disable framer button when you click it the first time. 2012-04-26 15:00:55 -07:00
danielgrippi
d3b874b020 add basic profile info to profile; remove random console.logs [ci skip] 2012-04-26 14:52:48 -07:00
Maxwell Salzberg
b387f89164 make composer not clip in both views [ci skip] 2012-04-26 12:46:04 -07:00
danielgrippi
828cc919d0 DG MS; proof of concept 2012-04-26 12:46:03 -07:00
Maxwell Salzberg
e9217931ce only set the title when we have something nice to say 2012-04-25 23:08:11 -07:00
danielgrippi
6933eeb675 show reshared people on hover [ci skip] 2012-04-25 17:23:16 -07:00
Dennis Collinson
76ad02f2a5 hella spinners 2012-04-25 14:13:16 -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
ec096f8131 remove some opacity stuff; fix isotope pagination [ci skip] 2012-04-24 18:55:33 -07:00
danielgrippi
87fb922804 remove opacity and stuff from isotope [ci skip] 2012-04-24 18:05:40 -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
44f28b8220 don't randomly fav things; fix wallpaper text on profile [ci skip] 2012-04-24 14:21:18 -07:00
danielgrippi
311afa7dc9 i guess my captions commit got lost somewhere [ci skip] 2012-04-24 13:56:37 -07:00
Dennis Collinson
6ac1c5bc21 images aren't darkened in wallpaper if they don't have text 2012-04-24 13:27:27 -07:00
danielgrippi
931dd2621b fixed captions and stuff [ci skip] 2012-04-24 12:45:00 -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
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
40c04234bd navigate to experimental profile on successful post 2012-04-23 18:08:02 -07:00
Dennis Collinson
d64eb529d2 MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgrippis stuff does not work in firefox. or safari. 
or konqueror. we will talk to him about it later
 2012-04-23 17:30:23 -07:00
Dennis Collinson
88a17474f7 MS DC kill dead code in small Frame 2012-04-23 16:52:09 -07:00
Dennis Collinson
cfa518674f MS DC MOAR profile tweaks, show cubbies posts 2012-04-23 16:45:16 -07:00
Dennis Collinson
0e8fd604e9 DC MS reworking newprofile grid WHOA 2012-04-23 16:44:39 -07:00
danielgrippi
affba80524 tweak profile top layout [ci skip] 2012-04-23 16:43:32 -07:00
Dennis Collinson
e8cfe01c8a reLayouts when something is favorited, whoa 2012-04-23 12:35:13 -07:00
Maxwell Salzberg
85f2f13d79 more color [ci skip] 2012-04-23 12:23:10 -07:00
Maxwell Salzberg
bcdd03b4e9 markdownify profile in new profile view 2012-04-23 11:42:49 -07:00
Florian Staudacher
9562adaa10 put date formatting in a mixin 2012-04-23 14:34:20 +02:00
danielgrippi
98e614bbe8 specifiy masonry width [ci skip] 2012-04-22 17:05:30 -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
b6fc97a2a4 added styling & color to text posts [ci skip] 2012-04-22 16:21:22 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
danielgrippi
494ba1f9b8 images that are single pane fill up the whole frame [ci skip] 2012-04-21 23:20:19 -07:00
danielgrippi
d38582c5de youtube in canvas [ci skip] 2012-04-21 23:07:44 -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
0279874e32 markdownify small frames, css for new profile. 2012-04-21 16:05:24 -07:00
danielgrippi
e2adb8d26f squares; how do they work 2012-04-21 13:12:57 -07:00
danielgrippi
b4ca14ade4 DG MS; clicking a post in the profile goes to the show page. 2012-04-21 13:12:57 -07:00
danielgrippi
aa4c554177 DG MS; added photos and more styling to the canvas view. 2012-04-21 13:12:57 -07:00
Dennis Collinson
3130bbad97 render template currently needs to be overridden WHOA junglist massiv 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
danielgrippi
6d9dd1f4d3 skeleton in place. 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
5f839aa26f include modernizer in the mobile group so it works 2012-04-20 00:00:23 -07:00
Maxwell Salzberg
56312a3148 fix mobile modernizer with asset pipeline 2012-04-19 22:45:34 -07:00
Florian Staudacher
fe7de0544d forgot to rename that ... (fixes #3169) 2012-04-19 20:24:11 +02:00
Florian Staudacher
9f1713b8f9 bind to new eventname [ci skip] 2012-04-19 14:06:09 +02: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
d8c42fde67 remove app.models.Photos 2012-04-18 20:21:16 +02: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
Florian Staudacher
4385027443 small js fixes 
closes #3106 - hardening url handling,
fixes #2725 - backport from upstream
 2012-04-18 19:59:34 +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
Florian Staudacher
d328cdaa96 "twipsy" is now "tooltip", "position" must be "placement" and "select" is not a valid trigger 
- should fix a few cukes...
 2012-04-15 02:02:12 +02:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -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
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -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
9c7103be1d don't set publisher height on focus (already done in css), fixes #3109 2012-04-06 21:21:35 +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
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
Daniel Grippi
6f75fb4173 Merge pull request #3088 from Raven24/fix-bmm-2 
show an error message when creating a comment failed [ci skip]
 2012-04-01 18:24:54 -07: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
ef292c40eb create a dummy-participation object, that the post appeas followed by self 2012-04-01 22:34:54 +02:00
Florian Staudacher
e6ebf4ad62 show error message when creating a comment failed 
(e.g. when the post got deleted in the meantime)
bug mash 5.2
 2012-03-30 19:42:14 +02:00
Florian Staudacher
859c0b93b5 reset publisher css height when "cleared" (fixes #2867) 2012-03-30 16:09:41 +02:00
Raven24
5ad38a5372 damn my brain! 2012-03-30 01:50:21 +03: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
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Steven Hancock
77b107831b punycode.js is required by our javascript 
The punycode.js file was somehow removed from the repo. This
replaces it with the current version from github and adds it
to our main.js manifest. Our javascript requires punycode for
(at least) stream rendering.
 2012-03-28 20:03:00 -07:00
Dennis Collinson
a9c0c4098b add bootstrap dropdown 2012-03-28 19:13:51 -07:00
Dennis Collinson
755ff52452 turn asset pipeline debugging off 
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
 2012-03-28 19:01:44 -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
Maxwell Salzberg
0ce0f3ca74 NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline 
WIP Merge branch 'rebased-asset-pipeline'
 2012-03-28 14:52:55 -07:00
Maxwell Salzberg
283e730430 AHHH CRAZY. stupid branchs. WIP 2012-03-27 18:40:02 -07:00
Maxwell Salzberg
e1bf6441fe update new js files 2012-03-27 18:26:46 -07:00
Steven Hancock
8b92ed73a4 Remove jquery_ujs from main.js manifest 
Since jquery and jquery_ujs are now included by the jquery_include_tag
helper (see commit 9e752585), they shouldn't be included by the asset
pipeline in our javascript manifests. :)
 2012-03-27 18:08:28 -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
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline 
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
 2012-03-27 18:07:44 -07:00