Maxwell Salzberg
a18aa9abf4
to whoever is following along at home. I am sorry. testing travis by pushing is not fun
2012-03-13 19:43:19 -07:00
Maxwell Salzberg
0c11172fb0
bundler ARG :(
2012-03-13 19:38:34 -07:00
Maxwell Salzberg
319812fdcb
downgrade bundler :(
2012-03-13 19:34:52 -07:00
Maxwell Salzberg
56a7da530f
small js test fixes
2012-03-13 19:30:34 -07:00
Maxwell Salzberg
af6b06ed9b
fixes to make travis run?
2012-03-13 19:30:19 -07: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
ba88ce6be4
update db/schema
2012-03-13 16:17:39 -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
11590c3357
Merge pull request #2967 from diasp/2210-remove-youtube_titles
...
Remove unused youtube_titles from comments and posts #2210
2012-03-13 15:51:04 -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
afd750536f
added badges to mobile css
2012-03-13 16:46:04 +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
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
