MrZYX
892bc2bc1a
Merge branch '99translations' of ../diaspora-fork
2010-12-30 14:29:39 +01:00
MrZYX
a7467dedb8
updated locales
2010-12-30 14:29:36 +01:00
MrZYX
c7458f107a
fixed syntax error in devise.ga.yml
2010-12-30 14:28:13 +01:00
MrZYX
37964892ce
Merge branch 'irish-language' of https://github.com/joedavis/diaspora
2010-12-30 14:24:24 +01:00
Joe Davis
cca1b207bd
finished translating
2010-12-30 12:58:27 +00:00
MrZYX
154fa77bd6
updated locales
2010-12-29 12:49:30 +01:00
Alec Leamas
6a90646eaa
Nullifying test garbage in last patch
2010-12-29 10:46:29 +01:00
Alec Leamas
8d218e7871
suburi cucumber test.
...
Adds the features/uri-features test directory, testing sub-uri
deployment. These tests uses script/server since much of this code is
about configuring the server. They are not run by "rake cucumber", to
run them use "bundle exec rake cucumber features/uri-test".
Tests requires a working app_config.yml setup with pod_url =
"http://localhost:3000/diaspora "
Patches cucumber.yml to always load step definitions from features/**, see
http://thoughtsincomputation.com/posts/cucumber-step-definitions-and-autorequire-hell
2010-12-29 10:31:25 +01:00
Alec Leamas
c92f80b2eb
Cleaning up some paths.
...
Handling root_url if not ending w /, using http: for all cross-site
references.
2010-12-29 10:10:26 +01:00
Alec Leamas
215d6a8504
Build test diaspora_handle properly.
2010-12-29 10:10:08 +01:00
Sarah Mei
a1b92f5224
Merge javascript formatting changes.
2010-12-28 20:31:49 -08:00
Joe Davis
eb84561dcd
almost finished
2010-12-28 21:59:34 +00: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
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
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
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
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
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
Sarah Mei
aeaabd29f1
run specs before cucumber in default rake task
2010-12-24 10:41:20 -08:00
MrZYX
6ba2e0b68d
Merge branch '760-XSS-with-person-name' of https://github.com/Dorian/diaspora into Dorian-760-XSS-with-person-name
2010-12-24 15:56:00 +01:00
Dorian
5cbccda33a
Spec for not allowing user to do the XSS
2010-12-24 15:49:26 +01:00
MrZYX
2f135f2579
updated locales
2010-12-24 15:41:54 +01:00
Dorian
293445225a
Don't let user put HTML in alt and title image attribute of avatar
2010-12-24 15:33:04 +01:00
zhitomirskiyi
7796776135
vimeo works, does not yet fetch the title
2010-12-23 15:36:29 -08:00
MrZYX
07a074edb6
updated locales
2010-12-23 14:50:20 +01:00
zhitomirskiyi
1bc168d075
focusing a publisher on reshare
2010-12-22 09:51:50 -08:00
danielvincent
9b6d40544c
fixed _comments bug on show pages
2010-12-21 17:36:14 -08:00
danielvincent
7cb9760a1e
show comments toggle like fb
2010-12-21 16:56:32 -08:00
danielvincent
dae5906b6a
ownership render bug fixed on photoshow
2010-12-21 16:56:32 -08:00
Jeff Dickey & Michael Sofaer
fd96a6dbc4
Add Michael and Jeff to pairs file
2010-12-21 14:59:47 -08:00
