Commit graph

5969 commits

Author SHA1 Message Date
MrZYX
ba439b9413 Merge branch '559-posting-empty-messages' of https://github.com/grzuy/diaspora into sharebutton 2011-02-15 13:08:59 +01:00
Gonzalo Rodriguez
2b3926c629 Disable share button when whitespaces on status message input. 2011-02-15 09:50:39 -02:00
Dan Hansen
42fd9a19da now sarahmei can watch revolution OS too! will write tests soon 2011-02-14 23:59:03 -06:00
MrZYX
54feaca998 redirect to the start page if there's no referer in photos#show 2011-02-14 22:25:21 +01:00
MrZYX
b4b3fd2bb3 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-14 21:50:54 +01:00
MrZYX
fbaf9d6e84 fixed translation in request accepted mail 2011-02-14 21:50:38 +01:00
maxwell
4111a0ae4e make notifications return json for MuGMaN 2011-02-14 11:59:58 -08:00
MrZYX
614aa3056a updated locales 2011-02-14 17:46:13 +01:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
50ea657cd2 put it back for reference 2011-02-13 15:14:27 -08:00
zhitomirskiyi
9f78156206 broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
MrZYX
965f4e2ea5 another weired case where a photo can have a .status_message_id but no .status_message 2011-02-13 21:08:32 +01:00
MrZYX
20e1316491 it can somehow happen that a person has no profile. somehow. idk why. 2011-02-13 19:29:04 +01:00
MrZYX
86cc7a0d35 added some languages 2011-02-13 13:36:06 +01:00
MrZYX
654be58a87 moved gl-ES to gl and added it to languages.yml 2011-02-13 13:18:58 +01:00
MrZYX
81369176f1 updated locales 2011-02-13 12:02:03 +01:00
MrZYX
935b934b7a Merge branch 'pubphoto' of https://github.com/diasporg/diaspora 2011-02-13 11:56:20 +01:00
danielvincent
ca0d52c8e2 log character counts of status messages and comments 2011-02-13 00:17:34 -08:00
Raphael Sofaer
cac8c586de Forgot that emails are no longer db-unique 2011-02-12 22:44:09 -08:00
Raphael Sofaer
8fabe0f402 Checking in the migration helps. 2011-02-12 22:41:30 -08:00
Raphael Sofaer
753a113aa9 New splunk logs indicate we need more indicies 2011-02-12 21:47:55 -08:00
David Morley
9b88eef832 add photos.show.original_post 2011-02-12 16:11:37 -08:00
Dennis Schubert
2dcbb9bb12 Moved MySQL-recipe to own file and start/stop the service to create the MySQL-system-tables (this should finally fix mysql-recipe) 2011-02-13 01:09:33 +01:00
Dennis Schubert
1a4f580716 Merge branch 'jammitfix' of https://github.com/diasporg/diaspora into diasporg-jammitfix 2011-02-13 00:44:50 +01:00
Raphael Sofaer
10805c1187 Log stacktrace lines from diaspora/lib as well as diaspora/app 2011-02-12 15:43:08 -08:00
David Morley
d030343048 turn off gzip on jammit 2011-02-12 15:08:45 -08:00
David Morley
6df0a25327 fix link to facebox 2011-02-12 14:57:35 -08:00
Raphael Sofaer
6a0a945986 Switch dispatch_post and add_to_streams 2011-02-12 13:36:46 -08:00
MrZYX
3fc2dfb31a Merge branch 'master' of github.com:diaspora/diaspora 2011-02-12 21:31:51 +01:00
MrZYX
cd2d7db7b2 workaround from https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror 2011-02-12 21:31:14 +01:00
Raphael Sofaer
8dc3e5efa8 restrict log lines a little further 2011-02-12 12:09:50 -08:00
MrZYX
e76c5068d1 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-12 21:08:06 +01:00
MrZYX
6f4ffee1e4 small fix to logging 2011-02-12 21:07:46 +01:00
Sarah Mei
84d596ee47 Clean up the public/uploads folder after ci runs. 2011-02-12 09:16:12 -08:00
MrZYX
a572637e4c fix a translation 2011-02-12 18:06:56 +01:00
MrZYX
3c089506ff localize emails 2011-02-12 17:35:12 +01:00
MrZYX
8639e08920 updated locales 2011-02-12 14:41:13 +01:00
zhitomirskiyi
936a51578a renamed log line 2011-02-11 23:42:50 -08:00
zhitomirskiyi
971a319764 contacts size 2011-02-11 23:41:21 -08:00
Raphael Sofaer
de475ec4eb Take error out of posting status messages with photos 2011-02-11 19:20:19 -08:00
Raphael Sofaer
3e2c9b4b94 set photo-message relations based on guid on federation 2011-02-11 18:47:26 -08:00
Raphael Sofaer
e43cd3a8da Make error in migration more descriptive 2011-02-11 18:25:58 -08:00
Raphael Sofaer
02a66466fe Abort migration if there are post-visibilities left, so that the db is not left with no index 2011-02-11 18:25:58 -08:00
Raphael Sofaer
31fef1a55d typo in table name 2011-02-11 18:25:58 -08:00
Raphael Sofaer
316292c914 mysql2 result is not an array 2011-02-11 18:25:58 -08:00
Raphael Sofaer
2faf3fe10d delete dup pvs in migration 2011-02-11 18:25:58 -08:00
Raphael Sofaer
88da878c97 Move migration to avoid conflict 2011-02-11 18:25:57 -08:00
Raphael Sofaer
ff0f37ceea eliminate one source of dup pvs 2011-02-11 18:25:57 -08:00
maxwell
2784f641ba fix 500 when viewing a nonexsitaint status message 2011-02-11 18:13:01 -08:00
Raphael Sofaer
d202200a88 tweak copy 2011-02-11 18:04:00 -08:00