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
danielgrippi
5a1f3675b5
namespacing. set up initial feedback hooks.
2012-02-21 15:23:29 -08:00
danielgrippi
c0eeb7680b
pages wip
2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd
DG MS; post vitals on top left; user action placeholder on top right
2012-02-21 15:23:28 -08:00
danielgrippi
e3ebf05ac2
DG MS; new templates for post show pages.
2012-02-21 15:23:27 -08:00
Jonne Haß
14d7348a0d
updates locales and fixed needed empty timeago translations
2012-02-20 14:24:30 +01:00
Jonne Haß
fd085c6653
updated 129 locale files [ci skip]
2012-02-20 01:26:16 +01:00
Jonne Haß
097a8b409d
updated 20 locale files [ci skip]
2012-02-18 02:34:50 +01:00
Maxwell Salzberg
1f4e255f57
fix logging to work great with non-persisted objects
2012-02-17 14:59:42 -08:00
Maxwell Salzberg
ab727fc846
federation logger now in place.
2012-02-16 17:58:15 -08:00
Jonne Haß
4e93d087bd
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2012-02-17 01:33:08 +01:00
Jonne Haß
a4a79db86b
updated 108 locale files [ci skip]
2012-02-17 01:33:02 +01:00
Jordi Mallach
4a9d2ff9e9
Update Catalan translation to e16a20e.
2012-02-17 00:27:24 +01:00
Jonne Haß
7a1f491008
updated 19 locale files [ci skip]
2012-02-16 23:10:18 +01:00
danielgrippi
5acc7dc458
correctly reference intergration servers in application.yml.example [ci skip]
2012-02-16 13:01:17 -08:00
danielgrippi
62c0ad13b7
DG MS; move logic out of layout into LayoutsHelper.
2012-02-15 18:38:36 -08:00
Jonne Haß
21b420ca1e
updated 100 locale files [ci skip]
2012-02-15 14:13:47 +01:00
Jonne Haß
d9fd978f9d
Merge pull request #2892 from Gallaecio/master
...
Updated Galician (gl) translation
2012-02-14 16:04:32 -08:00
Adrián Chaves Fernández (Gallaecio)
4088af9159
Galician translation is now completely up-to-date.
2012-02-14 23:38:48 +01:00
Dennis Collinson
e16a20e18c
toggle all nsfw posts
2012-02-14 14:15:24 -08:00
Adrián Chaves Fernández (Gallaecio)
098a9e3484
Merge remote-tracking branch 'upstream/master'
2012-02-14 22:55:19 +01:00
Adrián Chaves Fernández (Gallaecio)
39f39b12fd
Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’.
2012-02-14 22:47:29 +01:00
Adrián Chaves Fernández (Gallaecio)
0c8b0189d1
Updated Galician translation of the ‘diaspora’ file.
2012-02-14 22:28:09 +01:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd
basic federation profile testing stuff
2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a
change language around explore/participate.
2012-02-13 19:13:43 -08:00
