Commit graph

9425 commits

Author SHA1 Message Date
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
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
Ilya Zhitomirskiy
924e18887a Merge branch 'roll_up_slow_migrations' 2011-10-18 16:26:05 -07:00
Ilya Zhitomirskiy
e47ccd4eff removed fake migration and migrate.txt 2011-10-18 16:25:24 -07:00
Ilya Zhitomirskiy
f7e70f8d93 lmiting the type column on share_visibilities and comments 2011-10-18 16:08:30 -07:00
Ilya Zhitomirskiy
4cae3e9d62 rolled up share_anything migration 2011-10-18 15:41:26 -07:00
Maxwell Salzberg
e4b284da7f aspect visibilities single alter table 2011-10-18 15:12:34 -07:00
Maxwell Salzberg
ed51260cf0 wip 2011-10-18 14:41:13 -07:00
Maxwell Salzberg
ce1ad0e21c rolling up the first 2011-10-18 14:18:48 -07:00
Maxwell Salzberg
59a2947ba0 fix services_controller_spec 2011-10-18 13:03:36 -07:00
Ilya Zhitomirskiy
9b6275640d fixed the uniqueness on indecies and foreign key constrains in the down migrations 2011-10-18 12:43:24 -07:00
Maxwell Salzberg
2b081df9fd this is the wrong place for this Revert "add a big fat warning on the readme"
This reverts commit 4b55d7ec02.
2011-10-18 12:40:59 -07:00
Maxwell Salzberg
4b55d7ec02 add a big fat warning on the readme 2011-10-18 12:34:29 -07:00
Maxwell Salzberg
6965101fa6 fix some mistakes I made yesterday, check if the name field exsists before trying it 2011-10-18 12:29:07 -07:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00