Daniel Grippi
f8edfc5914
Merge pull request #3014 from Raven24/oembed-providers
...
Oembed providers
2012-03-15 12:07:04 -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
Florian Staudacher
f1a0055a80
bump ruby-oembed version
2012-03-15 18:22:34 +01:00
Florian Staudacher
3d1925ec63
small fixes for oembed:
...
- make container inline-block to fit content (for overlay buttons to be centered)
- fix javascript ("src" instead of "href" for iframes), also disambiguate variable names
2012-03-15 17:39:02 +01:00
Diaspora Europe
563e94b804
let date looks nice
2012-03-15 16:44:25 +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
Jonne Haß
3a149d8cc7
rubygems 1.8.17 should be fine
2012-03-15 15:07:22 +01:00
Maxwell Salzberg
2d3df3e374
two cukes failed because the local files were changed?
2012-03-14 18:44:10 -07:00
Maxwell Salzberg
70cc9c5c96
travis does not seem to have bundler 1.1.1 yet
2012-03-14 18:02:45 -07:00
Maxwell Salzberg
ff03a0ca7f
update bundler; again
2012-03-14 18:00:18 -07:00
Maxwell Salzberg
94d2292587
dont install bunlder, travis now has the most recent version
2012-03-14 17:57:06 -07:00
Maxwell Salzberg
83f152803b
make travis.yml pass travis lint test
2012-03-14 17:37:20 -07:00
danielgrippi
5c90b0d5e7
comment out a jasmine spec for now to make travis happy
2012-03-14 17:33:08 -07:00
Maxwell Salzberg
c167810aef
also update em-http-request :/
2012-03-14 17:16:13 -07:00
Maxwell Salzberg
52a79d71b4
update em-sync so travis is happy
2012-03-14 17:09:13 -07:00
danielgrippi
5e75c6d675
fix jasmine around contact-list.js
2012-03-14 16:26:30 -07:00
Maxwell Salzberg
7aa906b463
make setupBinds make even more sense
2012-03-14 11:16:25 -07:00
Maxwell Salzberg
1d5bc6be70
Merge branch 'fix-comment-jasmine' of https://github.com/Raven24/diaspora into Raven24-fix-comment-jasmine
2012-03-14 11:09:32 -07:00
Maxwell Salzberg
36f9ca6b1a
resolve merge in notifications controller
2012-03-14 10:46:59 -07:00
Florian Staudacher
cd965e32fa
fix comment stream jasmine - bind function after spy has been defined
2012-03-14 18:43:06 +01:00
Maxwell Salzberg
654d2e63b3
Merge pull request #3006 from diasp/3004-fix-notification-dropdown
...
We need json for the notification dropdown #2998
2012-03-14 10:34:24 -07:00
Diaspora Europe
05f2be40e1
added test for notification dropdown #2998
2012-03-14 17:02:18 +01:00
Diaspora Europe
e78fc82bea
we need json for the notification dropdown #2998
2012-03-14 16:31:54 +01:00
Diaspora Europe
7fd39b2896
mobile: added index and read all tests to notification spec #2997
2012-03-14 15:58:07 +01:00
Jonne Haß
b3868fc6dd
updated 9 locale files [ci skip]
2012-03-14 10:29:16 +01:00
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
Florian Staudacher
813b706f8e
added little fix for extra long content
2012-03-14 02:09:27 +01:00
Florian Staudacher
9aa0a7ed58
extracted "show more" part from #2941 , tests still WIP
2012-03-14 02:09:27 +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
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
