Ariel Zavala
|
58c2d0dd28
|
merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)
|
2010-09-18 02:21:45 -04:00 |
|
Don Park
|
2d16289e46
|
use photos_path to generate the correct POST destination for photo uploads
|
2010-09-18 07:50:12 +08:00 |
|
Patrick Aljord
|
182c6228f3
|
show comments ordered by created_at, they are showing up at random order without that
|
2010-09-18 07:36:21 +08:00 |
|
Ariel Zavala
|
4558f9901e
|
Added translations to photos and registrations controllers
|
2010-09-17 18:25:36 -04:00 |
|
Raphael
|
84789f64c9
|
scope album queries through user
|
2010-09-17 14:57:14 -07:00 |
|
Ariel Zavala
|
ce3284f1a1
|
Merge branch 'master' into i18n
|
2010-09-17 17:28:55 -04:00 |
|
Ariel Zavala
|
7bb3d9c87a
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-17 17:21:29 -04:00 |
|
Ariel Zavala
|
c1c20e14f7
|
Added translations to requests controller
|
2010-09-17 17:05:54 -04:00 |
|
Ariel Zavala
|
f95cebcb8b
|
Added translations to new requests view and aspects controller
|
2010-09-17 16:38:50 -04:00 |
|
Raphael
|
b3549c79f4
|
Give slightly more specific error message
|
2010-09-17 12:49:49 -07:00 |
|
Ariel Zavala
|
cb145c346a
|
Added I18n translations to helpers
|
2010-09-17 15:30:02 -04:00 |
|
Ariel Zavala
|
0014024870
|
Added I18n translations to helpers
|
2010-09-17 15:26:31 -04:00 |
|
Raphael
|
ce2260b747
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-17 11:57:36 -07:00 |
|
Raphael
|
5df33a6fd0
|
Take out users/show, use current_user in update
|
2010-09-17 10:50:18 -07:00 |
|
Raphael
|
be26794e4a
|
only write to your own profile
|
2010-09-17 10:46:14 -07:00 |
|
Raphael
|
99ad001d28
|
Fix websocket spec, take out puts in by_webfinger
|
2010-09-17 09:52:31 -07:00 |
|
Ariel Zavala
|
271925a7f6
|
added photo view translations
|
2010-09-17 11:34:45 -04:00 |
|
Ariel Zavala
|
c6b34be63d
|
Added people views translations
|
2010-09-17 11:27:08 -04:00 |
|
Ariel Zavala
|
375f4f6808
|
added more translations missing on views
|
2010-09-17 10:43:59 -04:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
Raphael
|
b45906f902
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 21:35:48 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
Ariel Zavala
|
d7e9744e84
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-16 23:53:18 -04:00 |
|
Ariel Zavala
|
07138041b0
|
Fixed album controller errors
|
2010-09-16 23:35:57 -04:00 |
|
maxwell
|
e668071ea5
|
README.md
|
2010-09-16 18:48:18 -07:00 |
|
Ariel Zavala
|
db41bcc144
|
Merge branch 'locale-de' of http://github.com/ccoenen/diaspora
|
2010-09-16 21:09:11 -04:00 |
|
Ariel Zavala
|
0be3314e0a
|
merge with diaspora and resolved a conflict
|
2010-09-16 20:42:45 -04:00 |
|
danielvincent
|
95a4120e57
|
DG IZ; dropzones on left back on aspect manage page.
|
2010-09-16 17:22:42 -07:00 |
|
danielvincent
|
ae83dae1ca
|
added git info (branch,date,author) to debug partial
|
2010-09-16 17:03:14 -07:00 |
|
danielvincent
|
25b4b409be
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 16:19:48 -07:00 |
|
danielvincent
|
cbb692b6a3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 16:06:28 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
Ariel Zavala
|
b727fe42f5
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-16 18:56:02 -04:00 |
|
Claudius Coenen
|
64b07fca55
|
Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de
|
2010-09-17 00:23:43 +02:00 |
|
Claudius Coenen
|
5197c1b3ec
|
adding localisation for controller's flash messages'
|
2010-09-17 00:23:35 +02:00 |
|
Ariel Zavala
|
f430961672
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-16 18:15:32 -04:00 |
|
maxwell
|
e7afebece8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 15:07:02 -07:00 |
|
maxwell
|
2e8785b596
|
applying this change from wiki, thanks astronouth7303
|
2010-09-16 15:04:29 -07:00 |
|
Raphael
|
0eb2c97aef
|
object_path shouldn't create links to users
|
2010-09-16 14:51:27 -07:00 |
|
maxwell
|
b155d07abd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 14:38:32 -07:00 |
|
maxwell
|
6f867d60c4
|
MS fixed the nil hostname on user
|
2010-09-16 14:38:24 -07:00 |
|
Raphael
|
d8460ed37b
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 14:21:51 -07:00 |
|
Ariel Zavala
|
be9ae343cc
|
Added localizations that I had missed
|
2010-09-16 15:55:54 -04:00 |
|
Ariel Zavala
|
6a967e7fe9
|
Added localization to status message views
|
2010-09-16 15:47:12 -04:00 |
|
Ariel Zavala
|
ec9affb849
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-16 15:14:38 -04:00 |
|
Raphael
|
feb4cbfd29
|
Merge branch 'master' of http://github.com/fbrubacher/diaspora
|
2010-09-16 12:14:11 -07:00 |
|
Ariel Zavala
|
51b6ce9dfb
|
Added localization to layouts and shared views
|
2010-09-16 15:11:58 -04:00 |
|
Ariel Zavala
|
a673257eef
|
Added localization to photos views
|
2010-09-16 15:11:21 -04:00 |
|
Michael Nutt
|
cd9639cf29
|
websocket js should honor app socket port configuration
|
2010-09-17 03:11:11 +08:00 |
|
Ariel Zavala
|
5078830785
|
Added localization to comments views
|
2010-09-16 15:00:21 -04:00 |
|