danielgrippi
0883ce1dbb
fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly
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
a2aabeb599
remove ActiveSupport::SecureRandom
2012-03-21 13:49:34 -07:00
Jonne Haß
3c23364fbc
refactor locale initialization and selection a bit
2012-03-21 19:25:47 +01:00
movilla
bb2d474771
Add translation to "Mark unread"
2012-03-21 15:35:44 +01:00
movilla
f7a1b09639
Fixed translation missing back-to-top
2012-03-21 15:06:14 +01:00
Maxwell Salzberg
7b0c7ee4a0
make the invite flow not look totally terrible
2012-03-19 19:47:46 -07:00
Maxwell Salzberg
3cb7003361
remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing
2012-03-19 19:17:46 -07: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
Maxwell Salzberg
5868ff06f1
remove user inspect at the top of invites. Thx Blaine [ci skip]
2012-03-17 16:56:20 -07:00
Jonne Haß
7e7de439f8
fix untranslatable stuff from the invite refactor
2012-03-17 13:52:46 +01:00
danielgrippi
852687b31c
MS DG fix a few final tests
2012-03-16 17:56:35 -07: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
6b97b8044b
small updates, and it looks like we are mostly working
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07: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
e6b403434f
some restructuring around oembed providers
2012-03-15 18:34:47 +01:00
Diaspora Europe
563e94b804
let date looks nice
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
danielgrippi
5e75c6d675
fix jasmine around contact-list.js
2012-03-14 16:26:30 -07:00
Diaspora Europe
e78fc82bea
we need json for the notification dropdown #2998
2012-03-14 16:31:54 +01:00
Maxwell Salzberg
b8b6557379
adding an ajax loader, and pull out the js from the middle of the view
2012-03-13 17:10:23 -07: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
Maxwell Salzberg
8ac7a74f50
kinda gross hack to prevent mobile notifications from show up for unauthenticated users
2012-03-13 16:31:16 -07:00
Maxwell Salzberg
298327d2af
Merge pull request #2982 from diasp/2912-message-overflows
...
Handle many users in a message #2912[ci skip]
2012-03-13 15:58:18 -07:00
Maxwell Salzberg
fa247c23ae
Merge pull request #2998 from diasp/notification-chore
...
Notifications update spec and cleanup json response [ci skip]
2012-03-13 15:56:24 -07:00
Maxwell Salzberg
dfd0248a78
Merge pull request #2991 from ChFernandez/master
...
Pod Administration[ci skip]
2012-03-13 15:47:57 -07:00
Maxwell Salzberg
78cbe0a1d3
Merge pull request #2997 from diasp/1994-mobile-notifications
...
Mobile notifications back again #1994 [ci skip]
2012-03-13 14:18:58 -07:00
Maxwell Salzberg
24f8447248
Merge pull request #2986 from diasp/improve-mobile
...
Nice more and comment buttons[ci skip]
2012-03-13 14:16:33 -07:00
Diaspora Europe
746a144dac
now redirect to stream
2012-03-13 18:07:42 +01:00
Diaspora Europe
82c9ccfbe0
added read all button, hide count if zero
2012-03-13 17:55:48 +01:00
Diaspora Europe
c48e792c75
added notification badge
2012-03-13 17:27:40 +01:00
Diaspora Europe
f224cfe030
added link to notifications mobile view in header
2012-03-13 16:34:37 +01:00
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
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
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
Maxwell Salzberg
000f8d3b08
Revert "adding custom landing page for heroku"
...
This reverts commit 061badf74e
2012-03-09 17:44:45 -08:00
Maxwell Salzberg
061badf74e
adding custom landing page for heroku
2012-03-09 17:20:22 -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
Diaspora Europe
07cc4f06f4
added localized text in comment view
2012-03-08 14:37:39 +01:00
