David Morley
|
151b23f77b
|
remove modulization part
|
2011-02-15 11:11:40 -08:00 |
|
David Morley
|
e3df222d0e
|
move file
|
2011-02-15 10:42:02 -08:00 |
|
David Morley
|
166039f37a
|
x-git header for pod versioning
|
2011-02-12 15:20:57 -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 |
|
maxwell
|
fd6d6350c8
|
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
|
2011-02-11 18:00:23 -08:00 |
|
maxwell
|
e78ab6bca1
|
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
|
2011-02-11 18:00:07 -08:00 |
|
maxwell
|
c6bdbc987a
|
strip whitespace on comments
|
2011-02-11 17:54:37 -08:00 |
|
maxwell
|
4b47de5b9e
|
do not 500 on public photo viewing, also redirect if there is no photo rather than 500ing
|
2011-02-11 17:47:29 -08:00 |
|
zhitomirskiyi
|
34dbc5a872
|
added mention created logging statement
|
2011-02-11 17:36:21 -08:00 |
|
zhitomirskiyi
|
ea3afa6720
|
added the mention explanation text
|
2011-02-11 17:31:23 -08:00 |
|
maxwell
|
dc08efacf9
|
strip mention html for services
|
2011-02-11 17:13:48 -08:00 |
|
Raphael Sofaer
|
c173bf5104
|
reorder log line in SQL event
|
2011-02-11 16:29:38 -08:00 |
|
zhitomirskiyi
|
2b650e6b6d
|
removed person can't be blank error message
|
2011-02-11 16:29:19 -08:00 |
|
Raphael Sofaer
|
a9eef6018c
|
log bits of caller and a hashcode of caller, we'll probably want to take out logging caller as it may be slow
|
2011-02-11 15:55:02 -08:00 |
|
Raphael Sofaer
|
ac667b7ecd
|
No SystemTimer on windows
|
2011-02-11 13:20:47 -08:00 |
|
zhitomirskiyi
|
9f239789b9
|
can remote the person from the last aspect from edit contact pane
|
2011-02-11 12:58:01 -08:00 |
|
Raphael Sofaer
|
fcad60d908
|
Delete empty spec file
|
2011-02-11 12:18:59 -08:00 |
|
Raphael Sofaer
|
bc22851dd2
|
Add a little bit of info to create_invitee logging
|
2011-02-11 12:09:02 -08:00 |
|
zhitomirskiyi
|
3b2d323448
|
fixed the notifications to call the base_class
|
2011-02-11 11:49:47 -08:00 |
|
Raphael Sofaer
|
c1844c9be2
|
Merge remote branch 'lfortin/js-formatting'
Conflicts:
public/javascripts/web-socket-receiver.js
|
2011-02-11 11:31:30 -08:00 |
|
Raphael Sofaer
|
cb73922a26
|
Take extra / out of view, thanks NPerry
|
2011-02-11 11:23:32 -08:00 |
|
Raphael Sofaer
|
b413513999
|
Merge remote branch 'rtzn/master'
|
2011-02-11 11:13:01 -08:00 |
|
Raphael Sofaer
|
8db6f49e64
|
Log all sql
|
2011-02-11 11:12:03 -08:00 |
|
zhitomirskiyi
|
6441977a7c
|
added the post author name to the text also commented email
|
2011-02-11 10:31:20 -08:00 |
|
MrZYX
|
3dbfc85aa9
|
updated locales
|
2011-02-11 17:20:07 +01:00 |
|
zhitomirskiyi
|
0e9fdeeab0
|
destroy
|
2011-02-10 19:55:30 -08:00 |
|
zhitomirskiyi
|
4033c19323
|
destroy_all so that the callbacks are called
|
2011-02-10 19:50:21 -08:00 |
|
zhitomirskiyi
|
34e2b657fd
|
mend
|
2011-02-10 19:44:25 -08:00 |
|