Nick van der Burgt
c45fa2d402
Revert changes
2010-12-29 16:06:06 +01:00
MrZYX
154fa77bd6
updated locales
2010-12-29 12:49:30 +01:00
Nick van der Burgt
8bbb142c85
Set a limit on the second page
2010-12-29 12:32:24 +01:00
Nick van der Burgt
46e9be88d1
Wrote spec test for notifications pagination
2010-12-29 12:27:39 +01:00
Nick van der Burgt
e0f583d7d3
Fixed mistake of running will_paginate on @people instead of @notifications
2010-12-29 10:51:42 +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
e2804dbbcb
Replace old references to request.from with request.sender
2010-12-28 22:56:53 -08:00
Sarah Mei
2184af09d9
Patch database_cleaner to actually, you know, work.
2010-12-28 22:23:27 -08:00
Sarah Mei
f18439fa14
ZOMG specs pass on mysql!
...
Make '_type' column on services into 'type'.
2010-12-28 21:08:54 -08:00
Sarah Mei
fd74b79b61
do clean before each scenario so db doesn't get into borked state
2010-12-28 20:58:16 -08:00
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