Sarah Mei
a1b92f5224
Merge javascript formatting changes.
2010-12-28 20:31:49 -08:00
Sarah Mei
c1e036d4f7
Merge branch 'mysql' of github.com:diaspora/diaspora into mysql
2010-12-28 20:04:34 -08:00
Sarah Mei
6f1aee990c
Database is cleaned between scenarios. Progress?
2010-12-28 20:03:58 -08:00
zhitomirskiyi
bd05e97c29
requiring the websocket lib file
2010-12-28 19:53:45 -08:00
zhitomirskiyi
ddf95e2750
couple more passing cucumber stories, changed the queries on request and notification
2010-12-28 19:14:47 -08:00
Thomas R. Koll
06d80d0e57
Issue #729 : Failed posts and comments don't retain text
...
The forms were cleared on a submit event instead of a ajax:success
2010-12-28 23:46:34 +01:00
Joe Davis
eb84561dcd
almost finished
2010-12-28 21:59:34 +00:00
Nick van der Burgt
b33056f72b
Fixed a small mistake
2010-12-28 22:03:13 +01:00
Nick van der Burgt
c7f3a9abfd
Pagination for the notifications
2010-12-28 21:54:41 +01:00
Nick van der Burgt
507a273716
Modified IE to be compatible in the future
2010-12-28 21:54:41 +01:00
Nick van der Burgt
2e9aab137f
Added some more HTML5 elements so no suprises in the future
2010-12-28 21:54:41 +01:00
Raphael
4fec1bf717
1 failure left in mysql specs
2010-12-28 11:38:26 -08:00
Alec Leamas
122d1142b9
Fixing "Can't modify frozen string" error messages from rake db:first_user
2010-12-28 18:07:09 +01:00
zhitomirskiyi
be9101b51f
Merge branch 'mysql' of github.com:diaspora/diaspora into mysql
2010-12-27 22:23:58 -08:00
zhitomirskiyi
11153cf2ca
a couple more passing specs
2010-12-27 22:23:41 -08:00
Sarah Mei
787d550a1f
Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly.
2010-12-27 21:48:51 -08:00
Nick van der Burgt
00973e6ad6
Changed Chrome Frame back on
2010-12-27 19:13:41 +01:00
Nick van der Burgt
e6127c6aa9
Included ie.js into the layout
2010-12-27 17:33:50 +01:00
Nick van der Burgt
13b33ee864
Added ie.js file
2010-12-27 17:29:10 +01:00
Nick van der Burgt
980914bc87
Turned of Chrome Frame message thing
2010-12-27 17:27:29 +01:00
Raphael
3d7d8b51d2
Add a spec to user, fix a cucumber step for mysql
2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831
Fix a couple more specs in mysql
2010-12-26 20:52:15 -08:00
Raphael
34b5566333
Merge branch 'mysql' of github.com:diaspora/diaspora into mysql
2010-12-26 20:37:28 -08:00
Raphael
a6dcaa2327
Photo specs passing, 9 failures left in mysql
2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a
14 failures after updating mysql branch to master
2010-12-26 17:25:07 -08:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
MrZYX
dbccb6d0de
updated locales
2010-12-26 22:26:55 +01:00
Jonne Hass
647c02d38d
updated danish locale - thanks Halfdan Mouritzen & friends
2010-12-26 22:13:40 +01:00
Sarah Mei
0e2fa40539
cucumber not quite as jacked on mysql
2010-12-26 12:46:48 -08:00
MrZYX
74b5281a75
Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian
2010-12-26 21:44:04 +01:00
MrZYX
f92eb1735f
Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian
2010-12-26 21:43:23 +01:00
Dorian
346217ea46
Bug #761 : Aspect name double escaped in page title
2010-12-26 03:59:15 +01:00
Dorian
89ce11456a
Markdownify message in photo page
2010-12-26 03:06:19 +01:00
Dorian
b348f094ab
Test for XSS in comment
2010-12-26 02:16:53 +01:00
Dorian
d6e72cd2bb
Escape person.name in comment
2010-12-26 02:16:53 +01:00
danielvincent
3e9cce2a4b
bigger avatars in stream.
2010-12-25 19:32:48 -05:00
danielvincent
7827968b52
removing <p> from statusmessage partial
2010-12-25 19:18:42 -05:00
danielvincent
0fb102a2ec
right/left arrow keys functional on photo#show
2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa
mark notifications as read and update badge
2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
2010-12-25 16:07:31 -05:00
MrZYX
8b29e99cf8
updated locales
2010-12-25 15:22:43 +01:00
Sarah Mei
de502bf67c
Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.
2010-12-24 18:39:20 -08:00
Sarah Mei
d0774022b0
adding file for terminitor: automatic terminal-opening utility
2010-12-24 17:29:10 -08:00
Sarah Mei
a1ea193fb9
Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs.
2010-12-24 16:08:45 -08:00
Michael Sofaer and Raphael Sofaer
7175200779
Fix a spec, need to move to a computer with firefox.
2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed
Merry Christmas! I got you someting green.
...
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4
11 Controller specs remain in mysql. ALMOST DONE
2010-12-24 14:12:55 -08:00
Sarah Mei
a13136a4dc
Clean up first_user rake tasks; create add_user rake task
2010-12-24 13:46:25 -08:00
Sarah Mei
5ae16c15a3
Fix bug in :pod_uri generation.
2010-12-24 13:00:06 -08:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
