Sarah Mei
32d3219bf6
Fix that one freaking exporter example that was apparently failing spuriously. Actually, we had bad xpath that grabbed the wrong created_at, and it only passed when the created_at times were the same.
2011-05-29 00:08:11 -07:00
Sarah Mei
5b6eca893b
Put jasmine.Clock.tick back down to 200 (bumped to 400 during debugging & accidentally checked in)
2011-05-28 22:23:07 -07:00
Sarah Mei
8de71d41e4
Don't need to export the selenium server port anymore on CI. Yay!
2011-05-28 22:22:06 -07:00
Sarah Mei
6d6445b00a
Fix locale loading in stream spec
2011-05-28 21:22:35 -07:00
Sarah Mei
f732d20f0c
Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt.
2011-05-28 21:03:39 -07:00
Raphael Sofaer
cfd077a90d
Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec
2011-05-28 20:37:12 -07:00
Sarah Mei
5676fdc73e
fix jasmine specs
2011-05-28 20:18:40 -07:00
Sarah Mei
f16cf223eb
This test was not testing how person objects are actually built. Fixed.
2011-05-28 20:14:18 -07:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
MrZYX
4e5c6f0c97
updated locales
2011-05-29 04:14:25 +02:00
Raphael Sofaer
503de3efe1
Fix facebox close button and loading gif
2011-05-28 18:18:22 -07:00
MrZYX
787a5ae749
don't update timestamps in the migration
2011-05-27 19:57:51 +02:00
MrZYX
54f1effdf8
Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora
2011-05-27 19:35:39 +02:00
MrZYX
f5488bd032
made migration more failure tolerant
2011-05-27 19:26:47 +02:00
Jakob Kramer
0efaa77c46
fixes bug #1092
2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2
Photo association on GUID 2/2: replace status_message_id with status_message_guid
2011-05-27 18:56:24 +02:00
MrZYX
fba69bd8a5
Photo association on GUID 1/2: Migration
2011-05-27 17:32:09 +02:00
MrZYX
307b69c7cf
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-05-27 15:34:58 +02:00
MrZYX
0bfb6f01c6
updated locales
2011-05-27 15:34:50 +02:00
Jonne Hass
fcf3334cf7
Merge pull request #645 from cyberkov/994-fix-typos-in-appyml-example
...
fixed typos as mentioned in bug 994
2011-05-27 06:10:22 -07:00
cyberkov
ba0cf65b48
fixed typos as mentioned in bug 994
2011-05-27 14:42:17 +02:00
Jordi Mallach
b086d3a2ca
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-05-27 01:11:55 +02:00
Jordi Mallach
2c6be3c28e
Update Catalan translation to db22be43. Fix some leftovers in the process.
2011-05-27 01:10:51 +02:00
MrZYX
c5630006b6
better compatibillity with old git versions to get the current rev.
2011-05-26 16:27:56 +02:00
Jordi Mallach
89086c2453
Shorter message for one string that was overlapping.
2011-05-26 10:35:09 +02:00
Raphael Sofaer
17521f99cf
Fix build for those without integration environments configured
2011-05-25 15:49:57 -07:00
Raphael Sofaer
38289b1a47
Multi-server integration tests are now possible
2011-05-25 15:16:14 -07:00
MrZYX
ba08c38a74
fixed activity_streams::photo controller spec
2011-05-26 00:01:10 +02:00
MrZYX
0c5bdece5a
warn and exit if there's no config at all
2011-05-25 23:39:54 +02:00
MrZYX
47dd3ba076
when you get a mail from CI, look at it
2011-05-25 23:08:00 +02:00
MrZYX
cf1d83878c
fixed #747
2011-05-25 22:50:13 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e
record objectId in post (cant use object_id booo)
2011-05-25 12:16:52 -07:00
Sarah Mei
c6d61c68c0
Backfill some tests for app config, refactor base file name so people copy it instead of moving it
2011-05-25 11:07:29 -07:00
Sarah Mei
f29a605a7c
Remove photo-related pending specs.
2011-05-25 09:08:49 -07:00
Sarah Mei
85eb2d9de0
Unpending the relayable spec
2011-05-25 08:54:57 -07:00
MrZYX
406622eeed
prevent timing issue when autosuggest is too slow
2011-05-25 13:32:11 +02:00
Maxwell Salzberg
56644c9d1e
use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n
2011-05-24 21:45:12 -07:00
Maxwell Salzberg
4c535f3eb4
hackity hack to fix notifciation page decrementing
2011-05-24 20:41:28 -07:00
Sarah Mei
5e56b8a0ee
HULK SMASH PENDING SPEC
2011-05-24 23:36:00 -04:00
MrZYX
574deada03
get rid of nil values in app config, they destroy the merge
2011-05-24 23:54:31 +02:00
MrZYX
d6e9e9cca5
fixed comment count update on comment posting
2011-05-24 21:03:24 +02:00
MrZYX
e946600ad4
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-05-24 17:33:40 +02:00
MrZYX
ce9e7c5369
updated locales
2011-05-24 17:33:36 +02:00
MrZYX
db22be43a8
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386
remove text from token page explaining there is no FF cubbies extension
2011-05-24 07:42:37 -07:00
MrZYX
f4213b63a6
fixed notification helper spec
2011-05-24 16:25:48 +02:00
Jordi Mallach
75e7b0e45d
Update Catalan translation to fc7b2cf.
2011-05-24 16:17:00 +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
