maxwell
|
bbe5f56292
|
you can now mention in the bookmarklet
|
2011-03-29 13:55:14 -07:00 |
|
MrZYX
|
98820c0866
|
do not display tags on the public profile
|
2011-03-29 22:25:03 +02:00 |
|
MrZYX
|
4dabfdad2b
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-03-29 21:53:37 +02:00 |
|
MrZYX
|
2027655316
|
updated locales
|
2011-03-29 21:53:29 +02:00 |
|
Jordi Mallach
|
d759f97c9f
|
Update Catalan translation to aa478ddd.
|
2011-03-29 20:56:11 +02:00 |
|
Jordi Mallach
|
8a222e2991
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-03-29 20:40:43 +02:00 |
|
MrZYX
|
68b2e47b87
|
go away robots, we don't want you\!
|
2011-03-29 20:34:20 +02:00 |
|
maxwell
|
ccaa9465ec
|
remove puts
|
2011-03-29 11:06:44 -07:00 |
|
maxwell
|
5392b5c6ef
|
strip more than 5 tags when updating profile so people with broken profiles can update again
|
2011-03-29 10:56:11 -07:00 |
|
MrZYX
|
aa478ddd5c
|
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
|
2011-03-29 15:39:57 +02:00 |
|
maxwell
|
ccbba9b52e
|
fix translations
|
2011-03-28 20:09:09 -07:00 |
|
maxwell
|
8b7dc0a2cc
|
translated bookmarklet, added post to main page
|
2011-03-28 19:57:06 -07:00 |
|
maxwell
|
9e5890288c
|
more bookmarklet improvements
|
2011-03-28 18:34:52 -07:00 |
|
maxwell
|
f08b5dfafe
|
basic functionality done, fixing rough edges
|
2011-03-28 18:11:59 -07:00 |
|
Raphael Sofaer
|
349aa13c05
|
Revert "reduce db quries on aspects#index"
This reverts commit 3af5e24ac6.
Conflicts:
app/controllers/aspects_controller.rb
|
2011-03-28 14:59:16 -07:00 |
|
Ritchie Wilson
|
a1b07d84e1
|
Next and Previous arrows for mobile photos
|
2011-03-28 16:04:29 -04:00 |
|
Jordi Mallach
|
9d04f36a38
|
Update Catalan translation to 40810741.
|
2011-03-28 20:55:13 +02:00 |
|
Raphael Sofaer
|
c33a952bbd
|
Forgot parens
|
2011-03-28 11:22:03 -07:00 |
|
Raphael Sofaer
|
a0d3921d72
|
Fix 500 on tag show with comments
|
2011-03-28 10:01:19 -07:00 |
|
MrZYX
|
c2a4c2157d
|
oh yeah it's delete_all on has_many, seems like I shouldn't code today…
|
2011-03-28 18:04:21 +02:00 |
|
MrZYX
|
824c4b38ad
|
dependent delete for likes
|
2011-03-28 17:54:07 +02:00 |
|
Sarah Mei
|
ffe48fe189
|
Refactor aspects#index to be easier to read; move some expensive operations after the guard clause
|
2011-03-27 19:19:25 -07:00 |
|
Sarah Mei
|
ae106e71ae
|
Move sort order to a before filter, because this index method is waaaaay too big.
|
2011-03-27 18:52:43 -07:00 |
|
Sarah Mei
|
4d0338efa4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-03-27 18:32:25 -07:00 |
|
Sarah Mei
|
59650c8104
|
Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.)
|
2011-03-27 18:32:11 -07:00 |
|
Raphael Sofaer
|
4180d5dcf8
|
Take out rspec convention link
|
2011-03-27 17:39:28 -07:00 |
|
Raphael Sofaer
|
36a262a3ad
|
Revert "update selenium-webdriver to 0.1.4,fixes #829"
This reverts commit eddd8d969f.
|
2011-03-27 16:32:40 -07:00 |
|
MrZYX
|
5c4979ccf0
|
use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why
|
2011-03-28 00:09:07 +02:00 |
|
MrZYX
|
eddd8d969f
|
update selenium-webdriver to 0.1.4,fixes #829
|
2011-03-27 22:52:33 +02:00 |
|
MrZYX
|
40810741f3
|
fixed cucumber
|
2011-03-27 22:04:36 +02:00 |
|
adonix
|
b71bfdf583
|
972-issue:all-aspects-spelling
|
2011-03-27 12:14:09 -07:00 |
|
MrZYX
|
315fdabd76
|
let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases
|
2011-03-27 21:08:30 +02:00 |
|
Sarah Mei
|
c4bc24d485
|
Add spec for remembering sort order
|
2011-03-27 10:56:08 -07:00 |
|
Sarah Mei
|
56b0d7821d
|
Move a few specs out of an expensive context they don't need
|
2011-03-27 10:47:04 -07:00 |
|
Sarah Mei
|
a5f6b6512d
|
Upgrade cucumber version
|
2011-03-27 10:46:38 -07:00 |
|
MrZYX
|
a9e3511c19
|
updated locales
|
2011-03-27 18:50:01 +02:00 |
|
MrZYX
|
e2f6427724
|
just realized that the change to AspectsController#index in the previous commit isn't needed
|
2011-03-27 17:26:17 +02:00 |
|
MrZYX
|
3af5e24ac6
|
reduce db quries on aspects#index
|
2011-03-27 17:22:35 +02:00 |
|
MrZYX
|
52fee96bfc
|
whoops, recieve is a post route, not a get, thanks mb-log
|
2011-03-27 16:11:38 +02:00 |
|
MrZYX
|
55417cf9e3
|
AspectsController#move_contact -> AspectMembershipsController#update
|
2011-03-27 13:29:36 +02:00 |
|
MrZYX
|
d50cfe8d5d
|
updated locales
|
2011-03-27 00:40:34 +01:00 |
|
MrZYX
|
3a5f8d814d
|
fixed spec
|
2011-03-27 00:23:14 +01:00 |
|
MrZYX
|
b689d4695b
|
refactor of routes.rb done so far; further refactor needs design decisions
|
2011-03-27 00:05:35 +01:00 |
|
MrZYX
|
11b0a2c19d
|
dependent destroy for likes
|
2011-03-26 21:47:40 +01:00 |
|
MrZYX
|
421e50d2ca
|
specify what we don't want in a tag for now
|
2011-03-26 19:02:04 +01:00 |
|
MrZYX
|
5918dbf786
|
typo in script/server
|
2011-03-26 18:58:18 +01:00 |
|
MrZYX
|
38673158f6
|
actually it was the other way around, we have to tell ruby that it's utf8, though now the build fails because (first guess) \w probably doesn't include utf8 chars in 1.9
|
2011-03-26 18:43:31 +01:00 |
|
MrZYX
|
9ff0ceab07
|
Revert "someone doesn't save his files as UTF8 :\"
This reverts commit c84f767174.
|
2011-03-26 18:28:47 +01:00 |
|
MrZYX
|
c84f767174
|
someone doesn't save his files as UTF8 :\
|
2011-03-26 18:21:07 +01:00 |
|
MrZYX
|
867a5e143f
|
comment out init_public in script server for now as it's buggy and confuses users
|
2011-03-26 17:57:13 +01:00 |
|