Commit graph

6192 commits

Author SHA1 Message Date
Raphael Sofaer
a45f46828a re-enable commenting box on show page without comments, but it looks kind of ugly 2011-03-07 10:18:50 -08:00
Raphael Sofaer
909a198380 Post photos without text 2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
Raphael Sofaer
981c37d286 Merge branch 'master' of github.com:diaspora/diaspora 2011-03-06 09:58:28 -08:00
MrZYX
c79b55f520 updated locales 2011-03-05 16:32:01 +01:00
Raphael Sofaer
a865373bfa Adjust readme 2011-03-04 10:30:10 -08:00
MrZYX
06ff32d8d5 updated locales 2011-03-04 14:43:44 +01:00
Raphael Sofaer
eb9705c82d Adjust batch invite text 2011-03-03 17:23:20 -08:00
Raphael Sofaer
435451bc5b admins can resend invitations 2011-03-03 16:59:33 -08:00
MrZYX
f0ba62be59 replaced ▼ with ▼, this fixes #904 and shouldn't harm anything. 2011-03-03 21:32:44 +01:00
MrZYX
ae0595bca8 fixed #903 2011-03-03 21:25:01 +01:00
Raphael Sofaer
3d0831f2b2 Merge remote branch 'mnutt/photo_upload_status' 2011-03-03 11:43:16 -08:00
Raphael Sofaer
da12954d22 Move statusmessage create view out to partial 2011-03-03 11:10:44 -08:00
MrZYX
8ab54076f8 updated locales 2011-03-02 22:45:31 +01:00
Raphael Sofaer
1afc83f356 Revert "memprof"
This reverts commit 8ee81314d6.
2011-03-02 13:34:29 -08:00
Raphael Sofaer
685130cbd4 Take out n-query on home page 2011-03-02 13:34:06 -08:00
Raphael Sofaer
770091e82b Don't retrieve all the user's contacts again unnecessarily 2011-03-02 12:11:25 -08:00
Raphael Sofaer
8ee81314d6 memprof 2011-03-02 11:47:13 -08:00
Raphael Sofaer
9d92161430 Make migrations compatible with postgres 2011-03-02 11:05:16 -08:00
Sarah Mei
ba6afa50e8 Removing extra csrf tag. Thx feanor12. 2011-03-01 22:25:05 -08:00
Sarah Mei
1590b69569 WTF. Seriously. It works with 1.9 now though. 2011-03-01 21:43:49 -08:00
Sarah Mei
d183150fa9 Upgrade launchy. 2011-03-01 21:41:28 -08:00
Raphael Sofaer
68f0f7ec21 Add rcov task 2011-03-01 18:12:42 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
Raphael Sofaer
a7f149e399 Possible performance gain from not hitting posts relation 2011-03-01 11:42:57 -08:00
Raphael Sofaer
00cca370ad Add translation key method, should be replaced with separate partials. 2011-03-01 11:03:58 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
809ee8a678 Started notifications refactor 2011-03-01 10:30:29 -08:00
MrZYX
00ebf6469b it can happen that the http referer is nil when we expect it to be set (for example if the user has a privacy extension enabled 2011-03-01 18:38:40 +01:00
MrZYX
31f5500b11 removed RAILS_ENV=test example from config/server.sh 2011-03-01 17:28:35 +01:00
Michael Nutt
ac2c50b33f denote that fileuploader has been modified 2011-02-28 20:37:41 -05:00
Raphael Sofaer
ebfebb16d7 Fix integration spec 2011-02-28 17:22:40 -08:00
Raphael Sofaer
a11507d30c Take out typos for real this time 2011-02-28 16:40:03 -08:00
Raphael Sofaer
a0a901a675 fix typo 2011-02-28 16:27:47 -08:00
Raphael Sofaer
810220bc97 clear disconnected records in migration 2011-02-28 16:24:09 -08:00
Raphael Sofaer
98d8d9e0da Add the migration 2011-02-28 15:31:12 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
MrZYX
98999b1703 updated locales 2011-02-28 22:15:15 +01:00
Raphael Sofaer
8a4ca3af0e fix error on account deletion 2011-02-28 11:24:31 -08:00
Michael Nutt
1bfbb4b605 make mention helper text and file upload status line up 2011-02-27 12:45:32 -05:00
Michael Nutt
208a47162c add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00
Michael Nutt
b6dc32959c place thumbnails inside status message form and add spacing 2011-02-27 02:04:43 -05:00
Michael Nutt
43e10307a6 fix broken jquery autoresize plugin 2011-02-27 02:03:55 -05:00
Sarah Mei
5e69f7d9a2 Upgrade arel, for some reason. 2011-02-26 16:02:10 -08:00
Sarah Mei
f28a6a9f80 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-26 15:59:16 -08:00
MrZYX
0fc5f1c043 log the 'received comment but no corresponding post' case 2011-02-26 16:50:47 +01:00
Sarah Mei
1adcc4cc99 fix jasmine specs 2011-02-26 16:50:35 +01:00
MrZYX
b47714f881 updated locales 2011-02-26 16:50:25 +01:00
MrZYX
5bcc3acbbb save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db 2011-02-26 16:50:08 +01:00