MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07: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
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
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -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
Raphael Sofaer
d12ec38736
Fix mobile infinite scroll
2011-04-07 15:00:57 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -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
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
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
Raphael Sofaer
4037ce48c5
Delete unused show templates
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
b776bb52db
made string on mobile page translatable
2011-04-03 13:17:09 +02:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
MrZYX
764e0c4aee
fixed #985
2011-03-31 18:59:00 +02: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
326155af54
popstate now in aspect-filters. back button now actually works on aspect/index.
2011-03-30 17:39:08 -07:00
Raphael Sofaer
c9d58d9308
Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings"
...
This reverts commit 3b7063d44a
2011-03-30 14:47:40 -07:00
Raphael Sofaer
3b7063d44a
Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings
2011-03-30 14:28:58 -07:00
MrZYX
53bdb2cade
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
2011-03-30 17:17:36 +02:00
zhitomirskiyi
2e25d1d745
added the bookmarklet into a box
2011-03-29 15:03:09 -07:00
MrZYX
aa478ddd5c
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e
fix translations
2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
danielgrippi
fb5bc2805d
fix cucumber
2011-03-23 12:42:07 -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
zhitomirskiyi
058b74846a
removed the bring your friends message from the stream
2011-03-21 15:23:34 -07:00
MrZYX
a2715ca963
fixed migration naming, fixed translation
2011-03-20 23:00:56 +01:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -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
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
MrZYX
ed8d4db3a8
some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones
2011-03-12 03:27:28 +01:00
MrZYX
dc7a672d9f
fixed some translations
2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7
added title to padlock on aspect edit pane
2011-03-09 12:15:23 -08:00
