Commit graph

5098 commits

Author SHA1 Message Date
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
MrZYX
9db2d8854f fixed #781 2011-01-01 23:55:12 +01:00
MrZYX
cdf1722247 updated locales 2011-01-01 17:14:26 +01:00
MrZYX
a71b81eacd renamed en-shaw to en_shaw 2011-01-01 02:22:35 +01:00
Philip Champon
607fea6722 Handling bug http://bugs.joindiaspora.com/issues/767
Added email argument to task, warn and replace if address resolves to
an invalid user@domain one.
2010-12-31 14:53:32 +01:00
MrZYX
3338397822 added en-shaw to languages.yml 2010-12-31 13:11:34 +01:00
MrZYX
0faeb70ec3 updated locales 2010-12-31 13:06:35 +01:00
zhitomirskiyi
94e0427ffa Merge branch 'master' of github.com:diaspora/diaspora 2010-12-30 14:28:41 -08:00
zhitomirskiyi
9f227b3b0a manual logging in the backup, since Rails.logger is nil 2010-12-30 14:27:35 -08:00
Alec Leamas
3f2d48b26e handling http/https references
See discussion in c92f80b2eb
2010-12-30 23:22:43 +01:00
MrZYX
4596759628 added ga to languages.yml 2010-12-30 14:41:08 +01:00
MrZYX
3133ade245 fixed indentation error in devise.ga.yml 2010-12-30 14:38:14 +01:00
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
Thomas R. Koll
be270c4696 Adding rake statistics:genders to list all genders with profile count 2010-12-30 14:18:12 +01:00
Joe Davis
cca1b207bd finished translating 2010-12-30 12:58:27 +00:00
Thomas R. Koll
61d0f0ea65 Feature #717: Adding rake tasks to print statistics on users and content
Adds following rake tasks:
  rake statistics:users
  rake statistics:content
2010-12-30 13:38:26 +01:00
Thomas R. Koll
5c7d39505a Fixes #721 when creating a comment (ajax) the link to your own profile is fucked up and instead it linked to the user id 2010-12-30 00:48:43 +01:00
Thomas R. Koll
367d2756be Fixes #713: Set a pointer cursor for "add photos" input field 2010-12-30 00:17:59 +01:00
Thomas R. Koll
5e1f5ff5b1 Starting spec for rails.js 2010-12-29 17:43:50 +01:00
Thomas R. Koll
869cbdf9e9 * Localizeable "Rename aspect" button
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
2010-12-29 17:00:08 +01:00
Nick van der Burgt
3faff76b0c Reverted the changes in ie.js 2010-12-29 16:11:34 +01:00
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
a1b92f5224 Merge javascript formatting changes. 2010-12-28 20:31:49 -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
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