danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
30796de400
switching the order around to utilize eagerloading
2011-05-13 16:58:24 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500
slimming down application_helper, moved markdown and aspect related methods to individual helpers
2011-05-13 00:51:45 +08:00
MrZYX
9f070593ff
check if we can all cleaned_is_rtl? before doing it in direction_for helper
2011-05-12 11:05:32 +02:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
danielgrippi
c67d143719
dropdown in ContactsController#sharing now works
2011-05-11 15:47:13 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Raphael Sofaer
160e01f7bd
Fix broken sorting by activity
2011-05-07 00:50:26 -04:00
Arzumy MD
6ba2b00fb8
cleaned up formatting in application_helper, removed unnecessary return
2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8
spec for application_helper#page_title, with default text
2011-05-06 00:14:18 +08:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10
#1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor
2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e
moar mappings for process_emoticons
2011-05-04 15:28:42 +02:00
MrZYX
a92b28b4bf
general search and replace in markdownify ( #1042 )
2011-05-03 17:46:29 +02:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
6623dbb1f1
fixed #1039
2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd
Fix pagination on tags, specs are red, need to take all helpers out of applicationController
2011-04-28 09:28:59 -07:00
Raphael Sofaer
b4e36878fe
Fix pages after 1 on tag page
2011-04-28 09:28:59 -07:00
maxwell
62c164e1a4
fixed displays of the days based on locale
2011-04-18 18:29:55 -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
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
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
Raphael Sofaer
a05b141366
Add tagged posts to db seed, make people#show and tags#show infinite scroll
2011-04-07 16:36:14 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
MrZYX
e7d48a16ee
moved + to the left for rtl languages
2011-04-05 19:33:51 +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
danielgrippi
5b0da52e0a
fixed comment socketing bug, post ordering on own profile page.
2011-03-29 19:40:44 -07:00
danielgrippi
8816bd7f91
8 failures left. wip.
2011-03-29 17:31:56 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
Raphael Sofaer
349aa13c05
Revert "reduce db quries on aspects#index"
...
This reverts commit 3af5e24ac6
2011-03-28 14:59:16 -07:00
MrZYX
3af5e24ac6
reduce db quries on aspects#index
2011-03-27 17:22:35 +02:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
danielgrippi
b6d5165f2d
scroll to post on page if you can see it (via notification popup)
2011-03-23 17:16:30 -07:00
danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -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
c3612ee66d
Remove empty helper and spec files.
2011-03-19 22:39:21 -07:00
MrZYX
7cd1789669
allwow https youtube links
2011-03-19 22:19:31 +01:00
