Commit graph

9438 commits

Author SHA1 Message Date
danielgrippi
93c70f0649 one cuke failing in changes_password.feature 2011-10-23 19:05:31 -07:00
danielgrippi
44c9fcf65f log in to the stream 2011-10-23 18:21:07 -07:00
Daniel Grippi
ff10f563ce Merge pull request #2232 from Pistos/postgresql-fix-photo-share-visibilities
PostgreSQL compatibility for FixPhotoShareVisibilities migration.
2011-10-23 18:11:38 -07:00
Pistos
2c89a71958 PostgreSQL compatibility for FixPhotoShareVisibilities migration. 2011-10-23 21:03:54 -04:00
danielgrippi
ea3c7ec439 fixed migration 2011-10-23 16:43:21 -07:00
danielgrippi
75da4e560d fix photo share visibilities for the recently migrated 2011-10-23 16:37:36 -07:00
Sarah Mei
b78ed1b794 Remove duplicate method declaration 2011-10-23 15:20:07 -07:00
Gonzalo Rodriguez
178b7af946 When browser hits 404 for avatar image, fallback to default one. Fixes #2014. 2011-10-23 20:06:22 -02:00
Jonne Hass
a7124a19cf Merge remote-tracking branch 'catalan/master' 2011-10-23 22:59:22 +02:00
Gonzalo Rodriguez
68b33742a4 Add two cuke scenarios to notifications.feature:
* Someone comments on your post
* Someone mentioned you in a post
2011-10-23 18:19:54 -02:00
Jordi Mallach
f12d9b56a7 Avoid using “has just” constructs, as discussed in ddd152505e.
Fix grammar for plurals for mentions and reshares, too.
2011-10-23 20:35:28 +02:00
Jordi Mallach
84bd00577d Update Catalan translation of devise to fe78a69. 2011-10-23 20:18:01 +02:00
Jordi Mallach
89f5f6e727 Update Catalan translation to ddd1525. 2011-10-23 20:10:26 +02:00
Jordi Mallach
bfae64d805 Fix grammar for the singular case. 2011-10-23 20:08:11 +02:00
Maxwell Salzberg
199d2cb7dd change of encoding in schema.rb 2011-10-23 09:10:00 -07:00
Maxwell Salzberg
715982d73e don't raise when uniqueness contraints fail, as we already fail gracefully for these cases 2011-10-23 08:55:00 -07:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
manuels
47bc94c062 Merge pull request #2226 from manuels/migration_with_tmp_post_id
Store old post id for photos
2011-10-23 06:24:34 -07:00
Manuel Schölling
a91932c576 Fixed Pistos' issue in downmigration 2011-10-23 15:23:39 +02:00
Gonzalo Rodriguez
ddd152505e Fix like notification message grammar. Fixes #2222. 2011-10-23 05:17:33 -02:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
Gonzalo Rodriguez
11a59b933f Add cukes scenarios: playing with the aspects-dropdown and posting. 2011-10-23 03:46:08 -02:00
Gonzalo Rodriguez
4331e74673 Associate lables to checkboxes 2011-10-23 02:22:40 -02:00
Gonzalo Rodriguez
0a081b051c Fix more 'communtiy' typos 2011-10-23 01:39:23 -02:00
Daniel Grippi
64dc0cbdf5 Merge pull request #2230 from justindthomas/fix-locale
communtiy is community
2011-10-22 19:30:58 -07:00
Justin Thomas
f18846bf92 communtiy is community 2011-10-22 19:17:00 -07:00
Manuel Schölling
d8e410f242 Fixed postgre queries as suggested by Pistos 2011-10-22 19:53:59 +02:00
Manuel Schölling
eddc3eb012 Merge branch 'master' of git://github.com/diaspora/diaspora into migration_with_tmp_post_id 2011-10-22 19:50:24 +02:00
Manuel Schölling
afe8ee9889 Fixed INSERT statement 2011-10-22 19:10:29 +02:00
Manuel Schölling
b92ee9c8d5 Store old post id for photos 2011-10-22 16:12:41 +02:00
danielgrippi
7577ad4e81 deprication support for featured_users key in application.yml. 2011-10-21 17:45:06 -07:00
danielgrippi
64f7450d6c DG MS; fix case where pod does not have any communty spotlight 2011-10-21 17:39:39 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
1256b6f3fc DG MS; changed coloring of indicators; changed indicator precidence; added soup link 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
19d91908e3 fix the aspect stream 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
80a6a57992 live tipsys 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
Sarah Mei
5dc36b14cc Make script/server work on OS X again - -e is not a valid option to readlink on darwin 2011-10-21 14:41:10 -07:00
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
6cce4f0872 small typo on invites#edit 2011-10-20 11:27:21 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
danielgrippi
c49c76e2a6 DG MS; some refactoring 2011-10-19 15:47:22 -07:00
Daniel Grippi
ba48a46c6e Merge pull request #2208 from Pistos/postgresql-share-anything-migrations
PostgreSQL share anything migrations
2011-10-19 09:49:25 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
Pistos
0ef81d7112 Added PostgreSQL-compatible versions of raw SQL migration code in ShareAnything migration. 2011-10-18 20:50:51 -04:00
Pistos
fdcd6d47ed Whitespace cleanup. 2011-10-18 20:48:49 -04:00