Commit graph

1299 commits

Author SHA1 Message Date
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04: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
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
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
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
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
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Raphael
32fc6212ab Put only the hostname in diaspora_handle 2010-09-15 23:49:55 -07:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Raphael
e9009ea609 Downcase username only if it is there 2010-09-15 18:23:54 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
0e0df7fb22 downcase before validation 2010-09-15 17:21:23 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7 change the name of instantiate back 2010-09-15 17:08:56 -07:00
Raphael
d2f5d3c4c1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 17:05:36 -07:00