danielgrippi
e19c84b5a3
remove the monkey patch that didn't work.
2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9
better patch for ActiveSupport
2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7
no more rspec failures; and suppress a warning with a backported
...
monkeypatch
2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f
MS DG down to four failures
2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a
more progress
2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265
basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3
2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc
refactor locale initialization and selection a bit
2012-03-21 19:25:47 +01:00
movilla
2d32595db6
Añadida traducción en castellano para comprobar
2012-03-21 15:41:53 +01:00
movilla
965c30f406
Update config/locales/diaspora/en.yml
2012-03-21 15:37:54 +01:00
Maxwell Salzberg
416b577eca
I am a jerk and I told someone to take this out last night fixes #3027
2012-03-20 15:17:41 -07:00
Jonne Haß
dceb3253a0
updated 8 locale files [ci skip]
2012-03-20 14:00:05 +01:00
Benjamin Neff
042a125f4d
fix legacy routes for old invite links
2012-03-20 03:47:48 +01:00
Maxwell Salzberg
af008ab713
remove unused expander plugin
2012-03-19 19:13:15 -07:00
Jonne Haß
491d484a2e
updated 28 locale files [ci skip]
2012-03-18 22:22:07 +01:00
Maxwell Salzberg
aee17798c1
rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form
2012-03-17 17:10:08 -07:00
Jonne Haß
7e7de439f8
fix untranslatable stuff from the invite refactor
2012-03-17 13:52:46 +01:00
Maxwell Salzberg
11505a386c
adding a test for decremented invites, as, and check the invite is valid in the controller
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b
fixed rspec tests, more fit and finish around how the invite code works,
...
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Diaspora Europe
d626148a83
fix will paginate renderer
2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0
Merge pull request #3003 from diasp/will-paginate-bootstrap
...
mobile: added will paginate for bootstrap
2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1
make tests happy
2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f
some restructuring around oembed providers
2012-03-15 18:34:47 +01:00
Diaspora Europe
fe65058624
use will paginate, added renderer for bootstrap
2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7
mobile: added will paginate for bootstrap
2012-03-15 16:44:25 +01:00
Jonne Haß
0419ca0bb6
made change password explanations translatable [ci skip]
2012-03-15 15:22:20 +01:00
Maxwell Salzberg
2d3df3e374
two cukes failed because the local files were changed?
2012-03-14 18:44:10 -07:00
Jonne Haß
b3868fc6dd
updated 9 locale files [ci skip]
2012-03-14 10:29:16 +01:00
Maxwell Salzberg
2a30e60fe0
Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly
2012-03-13 16:41:16 -07:00
Steven Hancock
f2922c943c
Cross-Origin Resource Sharing
...
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.
CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.
closes #2216
2012-03-10 23:49:56 -08:00
Jonne Haß
854735dc52
fix plurals
2012-03-10 17:18:42 +01:00
Jonne Haß
40be5ab805
updated 37 locale files, added es-MX
2012-03-10 17:08:52 +01:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e
run second search ajaxily when no results are found from remote pod.
2012-03-07 23:19:50 -05:00
Dennis Collinson
9b08f3f69a
package assets always isn't refreshing, back to on
2012-03-07 18:42:41 -08:00
Maxwell Salzberg
b7fc774d06
semi-colons; use them
2012-03-07 16:24:02 -08:00
Maxwell Salzberg
ee2fafa31d
totally gross js load order problem.. make the widget system fire after the backbone app to get the notification and search autocomplete back
2012-03-07 15:20:21 -08:00
danielgrippi
bdcbf5b985
responsive show pages [ci skip]
2012-03-06 15:19:05 -08:00
danielgrippi
cb9420bfd6
don't use symlinks; fix assets ordering issues.
2012-02-28 11:04:15 -08:00
Maxwell Salzberg
22cda15aa8
presenter now has a title
2012-02-27 18:11:41 -08:00
danielgrippi
5bebd97bca
added translations to post viewer
2012-02-27 15:14:19 -08:00
danielgrippi
0112285985
Merge branch 'master' into profiles
...
Conflicts:
lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Jonne Haß
38e4394e55
updated 22 locale files [ci skip]
2012-02-27 22:33:19 +01:00
Jonne Haß
0604a36a15
updated 161 locale files [ci skip]
2012-02-26 01:07:13 +01:00
Dennis Collinson
b28508ecbc
MS DC show last post and show page works unauthenticated
...
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
Dennis Collinson
5154500239
small refactoring around router.js
2012-02-24 14:33:57 -08:00
danielgrippi
2c0cfa53dc
don't show left-right nav when idle
2012-02-24 13:31:17 -08:00
danielgrippi
806487a5ff
namespace view folder with folders
2012-02-23 11:12:20 -08:00
danielgrippi
91e77e9dce
small css tweaks
2012-02-22 20:50:56 -08:00
danielgrippi
846b14fac6
DG MS; you can comment from show pages. killer tofu.
2012-02-22 17:42:51 -08:00
