MrZYX
406622eeed
prevent timing issue when autosuggest is too slow
2011-05-25 13:32:11 +02:00
Maxwell Salzberg
4c535f3eb4
hackity hack to fix notifciation page decrementing
2011-05-24 20:41:28 -07:00
MrZYX
d6e9e9cca5
fixed comment count update on comment posting
2011-05-24 21:03:24 +02:00
Maxwell Salzberg
20cc3f0c7d
change the smiley for a heart.... the smiley looked sad at that size..
2011-05-23 23:53:18 -07:00
Maxwell Salzberg
ff1168a6ba
comment out the websocket notice. it was my idea to put it there, and it was a bad idea
2011-05-23 11:55:44 -07:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
Maxwell Salzberg
90d62f3c8a
small ui tweak for mobile login page
2011-05-22 15:43:39 -07:00
danielgrippi
0391795f80
better right pane sections
2011-05-21 14:52:59 -07:00
MrZYX
e79ef29a39
fixed that super annoying bug on the notificaitons page
2011-05-20 21:36:06 +02:00
danielgrippi
f2259e5e25
put link in via link translation, add via link to mobile site
2011-05-19 16:06:29 -07:00
danielgrippi
177061d1c5
added via links
2011-05-19 13:13:08 -07:00
MrZYX
331aa1ff60
you know the facepalm smiley? Here it is: m(
2011-05-19 20:10:35 +02:00
Shane Becker
910cc52387
rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011
2011-05-18 11:46:45 -07:00
MrZYX
a3c287ca9a
fixed #1023 (again)
2011-05-18 14:26:08 +02:00
MrZYX
66380fd33f
fixed some translations
2011-05-18 13:55:50 +02:00
Raphael Sofaer
c942f76d29
Turn off user collapse and turn up status messages to over 9000
2011-05-17 18:14:35 -07:00
Raphael Sofaer
f409ace067
Merge remote branch 'evant/354-long-post' into evant_log_post_merge
...
Conflicts:
config/assets.yml
2011-05-17 18:02:36 -07:00
Raphael Sofaer
2953cc8497
Move infinite scroll out of vendor, because it has been edited
2011-05-17 15:06:21 -07:00
danielgrippi
0405b72477
removed some unused defs
2011-05-17 15:00:49 -07:00
MrZYX
79a684d072
copy crossdomain.xml to public
2011-05-17 22:59:40 +02:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
MrZYX
1746f610b6
if we disable websocket in single process mode, there's no need for the JS
2011-05-17 19:26:37 +02:00
danielgrippi
8d7b0b2c4c
take out animations in inf scroll.
2011-05-16 16:55:24 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07: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
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02: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
MrZYX
f916f3a3e0
remove the width from the share button, thanks artem
2011-05-15 00:49:35 +02:00
danielgrippi
01be909e38
well, that was dumb. (fix cucumber)
2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -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
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
Evan Tatarka
5f406b18d5
Updated code to work with lastest master. Tests should now pass.
2011-05-12 20:38:05 -04: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
danielgrippi
47cf614996
sneaky fixed header
2011-05-11 18:53:59 -07:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07: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
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -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
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
danielgrippi
29c3f7f1d4
make cursor a question mark on welcome page info text
2011-05-09 15:55:24 -07:00
danielgrippi
645d685c58
Merge branch 'welcome-page'
2011-05-09 15:45:05 -07:00
danielgrippi
cfa9e6cf29
some polish on the welcome page
2011-05-09 15:39:44 -07:00
