Diaspora Europe
97d6b8dab8
notifications update spec and cleanup json response
2012-03-13 11:46:14 +01:00
Diaspora Europe
3c6175041d
mobile notifications back again #1994
2012-03-13 11:29:20 +01:00
Maxwell Salzberg
da6866c04c
Merge pull request #2994 from diasp/improve-reset-password
...
Improve reset password views
2012-03-12 18:13:52 -07:00
Maxwell Salzberg
e4a11c709c
Merge pull request #2993 from diasp/mobile-reset-password
...
Added reset password mobile views[ci skip]
2012-03-12 18:13:26 -07:00
Diaspora Europe
bcc754b07c
reset password: added localized text, improved layout
2012-03-12 12:49:47 +01:00
Diaspora Europe
248492ad15
added reset password mobile views
2012-03-12 10:39:42 +01:00
Diaspora Europe
c98a728645
remove useless cancel button
2012-03-12 08:36:34 +01:00
Diaspora Europe
746e9c5cfc
nice more and comment buttons
2012-03-12 08:36:33 +01:00
Maxwell Salzberg
dbe7a4c72b
Merge pull request #2990 from stevenh512/rack-cors
...
Cross-Origin Resource Sharing
2012-03-11 01:39:13 -08: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
chfernandez
b8ca31b6b3
improved weekly_user_stats in admin with a dropdown box by week to list all new users of that week also a link_to the user profile so the admin can sent welcome msgs, etc
2012-03-10 19:08:19 -08:00
Steven Fuchs
73fd96d439
this file should have never been added...
2012-03-10 14:21:13 -05: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
Maxwell Salzberg
0a75e59c19
remove installing wrong bundler manually
2012-03-09 18:36:14 -08:00
Maxwell Salzberg
5a34ef8592
update travis.yml for bundler 1.1
2012-03-09 18:33:47 -08:00
Maxwell Salzberg
ed62910286
this is dumb, but use RC bundler so travis does not barf
2012-03-09 18:19:16 -08:00
Maxwell Salzberg
332aede418
roll back heroku san
2012-03-09 18:03:40 -08:00
Maxwell Salzberg
000f8d3b08
Revert "adding custom landing page for heroku"
...
This reverts commit 061badf74e
2012-03-09 17:44:45 -08:00
Maxwell Salzberg
123841147b
update some gems, including bundler :)
2012-03-09 17:43:09 -08:00
Maxwell Salzberg
061badf74e
adding custom landing page for heroku
2012-03-09 17:20:22 -08:00
Maxwell Salzberg
51c47695b2
Merge pull request #2978 from Raven24/video-thumbnail
...
oembed video thumb [oh yeah]
2012-03-09 16:56:42 -08:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Florian Staudacher
7505670a2a
removed unnecessary js/css, since it works differently now
2012-03-09 18:16:21 +01:00
Jonne Haß
675c441e67
Merge pull request #2985 from diasp/more-localization
...
Added localized text in comment view
2012-03-08 06:02:40 -08:00
Diaspora Europe
07cc4f06f4
added localized text in comment view
2012-03-08 14:37:39 +01:00
Maxwell Salzberg
06f9e780e5
Merge pull request #2983 from diasp/improve-mobile-views
...
Improve mobile sign up and sign in view [ci skip]
2012-03-07 23:25:14 -08:00
Maxwell Salzberg
9f220ffd9c
Merge pull request #2984 from diasp/localized-text
...
Added localized text in getting started view [ci skip]
2012-03-07 23:24:49 -08:00
Diaspora Europe
f26563c90c
added localized text in getting started view
2012-03-08 08:21:22 +01:00
Steven Fuchs
d84b0c58bd
simplify search results processing since only one person can be returned
2012-03-07 23:19:51 -05:00
Steven Fuchs
9de477cf5a
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f
jasmine spec for stimulating deferred searches
2012-03-07 23:19:51 -05:00
Steven Fuchs
7d3a6a061c
add spec to ake sure background query is only set when a full diaspora id is given.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ac8cd8368e
fixing conflicts in merge
2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
8344422aef
partial rename no longer needed
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
Maxwell Salzberg
db0859a83c
bug fix: you can now mention and post a photo at the same time
2012-03-07 14:42:46 -08:00
Diaspora Europe
92a857533e
improve mobile sign up and sign in view
2012-03-07 17:01:16 +01:00
Diaspora Europe
ecc86c1f86
handle many users in a message #2912
2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882
Merge pull request #2906 from Raven24/fix-2770
...
fix for #2770
2012-03-06 22:36:53 -08:00
Maxwell Salzberg
d211272cab
Merge pull request #2981 from DeadSuperHero/beautyqueen
...
Fix #2974 , markdown headers now different from headers in post [ci skip]
2012-03-06 22:35:04 -08:00
Florian Staudacher
2976f7d7d1
added overlayed "play" icon to thumb,
...
made the "loader" gif background for oembed container
make videos autoplay after click
2012-03-07 00:52:26 +01:00
danielgrippi
bdcbf5b985
responsive show pages [ci skip]
2012-03-06 15:19:05 -08:00
Sean Tilley
053ca1d20b
Fix #2974 , markdown headers now different from headers in post
2012-03-06 17:10:04 -06:00
Maxwell Salzberg
aa35519bf0
Merge pull request #2939 from gandaro/2938-consistent-superscripts
...
disable superscripts on server-side markdownify, since they are disabled...[ci skip]
2012-03-06 12:30:41 -08:00
Maxwell Salzberg
f81a6ced01
Merge pull request #2886 from diasp/2823-fix-unlike-unfollow
...
#2823 fix unlike and unfollow update
2012-03-06 12:22:20 -08:00
