Raphael Sofaer
2517653d34
Red feature for infinite scroll after changing aspects
2011-04-26 17:28:42 -07:00
Raphael Sofaer
24ea518b6f
Fix some JS bugs, delegate doesn't work if you remove the element
2011-04-25 16:15:33 -07:00
Raphael Sofaer
9940f19962
Test and fix embedder after changing aspects
2011-04-25 12:24:38 -07:00
MrZYX
a09150e4e0
fixed #1023 ; display close icon on diaspora alert faceboxes
2011-04-24 15:40:30 +02:00
Dan Hansen
3d11b402e0
Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks
2011-04-22 20:33:21 -05:00
Dan Hansen
d28e7e70b8
use typeof operand instead of object#hasOwnProperty
2011-04-22 20:02:54 -05:00
Raphael Sofaer
830cbf0876
I'm blaming that one on the vicodin
2011-04-21 15:13:17 -07:00
Raphael Sofaer
bad0d9f4ea
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
public/javascripts/keycodes.js
2011-04-21 12:49:49 -07:00
Raphael Sofaer
804b6cc490
Clean up some JS
2011-04-21 12:48:31 -07:00
MrZYX
45d621a9e6
fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time
2011-04-21 15:42:28 +02:00
MrZYX
89c3e30663
apply suggested fix in/for #1026
2011-04-21 13:31:30 +02:00
Raphael Sofaer
5dcfff104a
Merge remote branch 'ritchewilson/prev_next'
...
Conflicts:
public/stylesheets/sass/mobile.sass
2011-04-19 17:05:12 -07:00
maxwell
14bfdbd4a9
hack to fix the timeago for other languages. ohaibbq can you find why this broke in the first place?
2011-04-18 18:11:03 -07:00
MrZYX
c06b885aa7
fixed #1027
2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980
basically fixed
2011-04-18 15:10:47 -07:00
maxwell
2223c562c0
first fix of notification page
2011-04-18 15:10:47 -07:00
maxwell
5050307179
Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])"
...
This reverts commit 981d39d220
2011-04-18 15:10:46 -07:00
MrZYX
9df8f83276
fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber
2011-04-17 21:28:09 +02:00
MrZYX
981d39d220
Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
...
This reverts commit a16e83df9e
2011-04-16 14:03:24 +02:00
Dan Hansen
7216c8d5cb
DRY up timeago.js, add license to i18n.js & timeago.js
2011-04-15 23:37:17 -05:00
Dan Hansen
7ed21930b4
make infscroll, publisher, stream use pub/sub to listen for the stream being reloaded, random cleanups and fix aspect-filters.js spec
2011-04-15 18:49:31 -05:00
Dan Hansen
296824c92b
add basic pub/sub functionality to WidgetCollection
2011-04-15 18:29:48 -05:00
Dan Hansen
c0cd8fafff
make a widget's start method optional
2011-04-15 18:14:38 -05:00
Dan Hansen
0b85600e0a
diaspora.js cleanup; don't pollute global namespace in spec
2011-04-15 17:31:19 -05:00
danielgrippi
a16e83df9e
touched up notifications page
2011-04-15 10:42:21 -07:00
MrZYX
b25e634be1
fixed #1011
2011-04-15 16:18:59 +02:00
Raphael Sofaer
4870ffb944
Fix db seed, refactor aspect-filters a bunch, fix stream_element a little
2011-04-13 18:13:26 -07:00
Raphael Sofaer
9969dbd109
Start refactoring aspect-filters.js
2011-04-13 15:55:10 -07:00
Raphael Sofaer
f13304073b
The specs are green on my dev machine, let's see if CI is still red
2011-04-13 15:19:17 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
Raphael Sofaer
5afe5f667e
Move js out of notifications index, fix reference to notifications badge
2011-04-12 17:15:02 -07:00
Raphael Sofaer
d5ecce7ca6
Merge branch 'limit_similar_contacts'
...
Conflicts:
app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
Dan Hansen
425fee0653
fix #839
2011-04-12 12:00:33 -05:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
behrooz shabani (everplays)
69eb27cbe9
moved comments textarea to left so it wont disappear avatar in RTL UI
2011-04-12 00:12:39 +04:30
behrooz shabani (everplays)
60371c8981
swapped horizontal margins on links of #conversation_controls in RTL UI
2011-04-12 00:03:56 +04:30
behrooz shabani (everplays)
426c1b28b6
minor fixes on conversations list & sign up stuff
2011-04-11 23:58:33 +04:30
behrooz shabani (everplays)
22b0fca124
small fixes on settings & notifications pages in RTL UI
2011-04-11 23:13:38 +04:30
behrooz shabani (everplays)
e076f89ccd
fixed comment box in RTL UI
2011-04-11 22:56:22 +04:30
behrooz shabani (everplays)
ad34a7f6f7
implemented RTL UI for settings/conversations/notifications
2011-04-11 22:44:55 +04:30
MrZYX
440fd26c14
hopefully finally fix #946
2011-04-11 19:15:14 +02:00
MrZYX
2413b3c4bd
Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl
2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d
added dir attribute to html element; made tipsy gravity dependant on that
2011-04-11 18:00:28 +02:00
behrooz shabani (everplays)
cddeafee74
rtl UI for aspects implemented
2011-04-11 00:21:14 +04:30
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -07:00
Raphael Sofaer
fa59be2353
Another bit of JS cleanup
2011-04-08 16:11:13 -07:00
Raphael Sofaer
0b9575af5d
JS cleanup
2011-04-08 16:11:13 -07:00
MrZYX
f194166841
moar garbage for you aka fixed #1005
2011-04-08 17:46:45 +02:00
MrZYX
75629018db
you want the id in aspect_memberships#destroy to be garbage? There you go… (btw. fixed #1006 )
2011-04-08 17:40:59 +02:00
Raphael Sofaer
c7dc6ce817
Fix jasmine specs
2011-04-07 18:30:29 -07:00
Raphael Sofaer
d23ac3468b
rename widgetCollection#ready to widgetCollection#initialized
2011-04-07 18:23:24 -07:00
Raphael Sofaer
ea932c8706
Fix infieldLabels in infiniteScrolled comment forms. We were initing every widget twice?
2011-04-07 18:21:28 -07:00
Raphael Sofaer
75d514c448
Fix infieldLabels on new aspect box
2011-04-07 17:53:07 -07:00
Raphael Sofaer
d8ac8d1329
Fix infinite scroll javascript in jammed js
2011-04-07 15:22:03 -07:00
Raphael Sofaer
157b117469
Just style links directly
2011-04-07 15:13:37 -07:00
Raphael Sofaer
d12ec38736
Fix mobile infinite scroll
2011-04-07 15:00:57 -07:00
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
MrZYX
95de299e6e
fixed #953
2011-04-06 14:18:33 +02:00
MrZYX
21b5f7932f
fixed #997 by turning cancel link into a reset button
2011-04-06 13:31:56 +02:00
Raphael Sofaer
9454c3a1b9
Working on fixing infinite scroll, in particular for aspects with the number 2 in their id.
2011-04-05 19:28:40 -07:00
Raphael Sofaer
59334dfaf5
Remove extra js, fix mobile view
2011-04-05 16:18:04 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
MrZYX
100d705c2f
fixed #992
2011-04-03 14:57:30 +02:00
MrZYX
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75
added detection of rtl languages on every user based input
2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36
fixed #589 , no CSS!
2011-04-03 02:10:41 +02:00
maxwell
f3a62bf76b
update jquery to latest
2011-04-02 15:03:41 -07:00
MrZYX
2ba1198b90
fixed embedder (again)
2011-04-02 17:19:56 +02:00
danielgrippi
bdff036cda
remove spacing from stream elements
2011-04-01 11:26:04 -07:00
danielgrippi
8b8ea03582
high res logo on mobile site
2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
maxwell
569fb66e9e
bunch of small mobile ui fixes
2011-03-31 23:38:38 -07:00
maxwell
bb59df46f9
updating jquery mobile, fix the menu page a bit
2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
2011-03-31 17:23:54 -07:00
danielgrippi
ed202b61d3
scroll to top before content loads for smoother feedback
2011-03-31 01:56:06 -07:00
danielgrippi
b22b13d73f
Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
...
This reverts commit 326155af54
2011-03-31 01:30:02 -07:00
danielgrippi
d1c3326867
Revert "fix wacky aspect filtering bug (tabs being selected seemingly at random"
...
This reverts commit 14f14d005b
2011-03-31 01:29:48 -07:00
zhitomirskiyi
bb4c2ee85d
added a character count to the publisher
2011-03-30 19:11:24 -07:00
danielgrippi
14f14d005b
fix wacky aspect filtering bug (tabs being selected seemingly at random
2011-03-30 18:26:56 -07:00
danielgrippi
326155af54
popstate now in aspect-filters. back button now actually works on aspect/index.
2011-03-30 17:39:08 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
danielgrippi
5fa2a7a6f3
use popState in message inbox
2011-03-30 16:22:25 -07:00
danielgrippi
0c15e74420
remove extra right padding on stream elements
2011-03-30 14:53:33 -07:00
Raphael Sofaer
4b795cc719
Stop bad call to users/update
2011-03-30 13:16:26 -07:00
zhitomirskiyi
cd7cced9c0
renamed the js to indicate custom
2011-03-29 17:25:35 -07:00
zhitomirskiyi
0aaaefeba2
fix tag plugin
2011-03-29 16:53:48 -07:00
zhitomirskiyi
ba15ea940b
autosuggest on tags now works, bumped up the version of the autocomplete plugin
2011-03-29 15:03:09 -07:00
MrZYX
68b2e47b87
go away robots, we don't want you\!
2011-03-29 20:34:20 +02:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
Ritchie Wilson
a1b07d84e1
Next and Previous arrows for mobile photos
2011-03-28 16:04:29 -04:00
MrZYX
315fdabd76
let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases
2011-03-27 21:08:30 +02:00
MrZYX
55417cf9e3
AspectsController#move_contact -> AspectMembershipsController#update
2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
maxwell
310f529914
dumb api console
2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
danielgrippi
33c013633f
fix cucumber, comments
2011-03-23 18:22:43 -07:00
danielgrippi
2a1914a8f2
fixed comment socket bug on posts where there are no new comment areas
2011-03-23 17:55:18 -07:00
danielgrippi
b6d5165f2d
scroll to post on page if you can see it (via notification popup)
2011-03-23 17:16:30 -07:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
danielgrippi
363c5f4dae
fix gradient direction on add/remove buttons
2011-03-23 12:42:07 -07:00
danielgrippi
e4e8d7ada4
fixed aspect selector bug in header
2011-03-23 11:59:09 -07:00
danielgrippi
2b8b824230
fixed private mention popup in firefox
2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6
added text to private message notification; user picture in popup
2011-03-22 17:14:37 -07:00
Sarah Mei
631163ec02
"Add contact" buttons on tag page are smaller and don't appear on top of names.
...
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
danielgrippi
cc01beb3d0
cross-browser opacity mixin
2011-03-22 12:40:44 -07:00
danielgrippi
48598a9942
added linear-gradient mixin.
2011-03-22 12:35:03 -07:00
danielgrippi
557b5393c2
fix sass error
2011-03-22 12:14:50 -07:00
danielgrippi
cb533c8675
added box-shadow and border-radius mixins. changed _mixins.sass to _mixins.scss
2011-03-22 12:02:54 -07:00
maxwell
5570182e69
use autoresize extraSpace to kill the bug where the comment box is not big engough for the comment, still could use some love
2011-03-22 11:59:10 -07:00
maxwell
35bc86f6a6
dont auto embedd images, untill we think of something better to do
2011-03-22 10:55:41 -07:00
zhitomirskiyi
4517c7c1b1
move service icons to right on publisher. swap out RSS for world icon
2011-03-21 16:23:27 -07:00
zhitomirskiyi
aa5bef0c3f
calls the job on login does a sync call if the cache friends was not called before, fixed the views
2011-03-21 14:56:50 -07:00
maxwell
970e9bee04
Revert "make image width max out at 100%"
...
This reverts commit 32efbeb903
2011-03-21 11:40:52 -07:00
Maxwell Salzberg
32efbeb903
make image width max out at 100%
2011-03-21 10:10:03 -07:00
MrZYX
1b1a23aa8f
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
2011-03-20 18:10:58 +01:00
Sarah Mei
0b1fa4d014
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
2011-03-19 20:53:55 -07:00
MrZYX
25aadebf46
fixed #946 with a solution that doesn't break the links
2011-03-19 21:50:40 +01:00
MrZYX
6fe4b5bc56
fixed 946
2011-03-19 14:21:06 +01:00
William Theaker
1b4827bc7b
16px wrench icon
2011-03-19 02:16:24 -04:00
MrZYX
1885909e30
quickfix for image embedding image size
2011-03-18 13:38:56 +01:00
maxwell
2bd15bf3e6
embed images, and make sure they are activated on a new message is posted
2011-03-17 22:03:47 -07:00
maxwell
275098a309
embed images, and make sure they are activated on a new message is posted
2011-03-17 21:48:11 -07:00
maxwell
562c0d40ac
profile tags now federate
2011-03-17 16:28:17 -07:00
maxwell
2ed6cc673a
fixed css bug
2011-03-17 15:31:06 -07:00
maxwell
b2c0cfb173
remove stray br in stream_element
2011-03-17 15:24:00 -07:00
zhitomirskiyi
43fc2c4d63
fixed the style on the share with list element
2011-03-17 15:19:12 -07:00
zhitomirskiyi
6cc085d64e
addded slideToggle
2011-03-17 14:32:07 -07:00
zhitomirskiyi
2b6165d8ea
wip
2011-03-17 14:32:07 -07:00
maxwell
14ff1e0143
ms dg improved styling, fixed delete
2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3
photos are now successfully delayed
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
maxwell
516b620148
gif and delayed processing wip
2011-03-17 13:59:53 -07:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
danielgrippi
e9c094fc2f
add styling on tag header
2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
danielgrippi
20b5ca7570
added tag helper text on profile, edit on hover
2011-03-15 22:10:20 -07:00
danielgrippi
4943531013
Add stream class to side_stream
2011-03-15 15:20:02 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
MrZYX
73f852c6c2
fixed video embedding in comments
2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a
fixed some 500 on mobile site
2011-03-15 17:02:04 +01:00
maxwell
a419ddac11
make sure audio player does not delete sm text
2011-03-14 18:20:03 -07:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
maxwell
d91fda656c
Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
...
This reverts commit ab997e2d21
2011-03-14 09:51:06 -07:00
MrZYX
e8bb4c2d66
added preload='none' to the audio tag ( #928 )
2011-03-14 13:07:27 +01:00
William Theaker
67affa2f5f
wrench
2011-03-12 02:57:15 -05:00
maxwell
ab997e2d21
js hack to see bigger version of photo thumbnails in the stream without being abnoxious
2011-03-11 17:16:43 -08:00
