Maxwell Salzberg
6d7f6129fe
remove puts in spec [ci skip]
2012-04-19 17:47:32 -07:00
Dennis Collinson
7f3c4c209e
fix post spec
2012-04-19 14:37:46 -07:00
Dennis Collinson
f7d320b622
MS DG; checkboxes are togglable, with tested css magick
2012-04-19 14:05:55 -07:00
Dennis Collinson
8386179f16
max, you're a princess, WIP
2012-04-19 11:15:59 -07:00
danielgrippi
e379a6df0f
Merge branch 'master' into stream-for-photos
...
Conflicts:
app/assets/javascripts/app/views/stream_view.js
2012-04-18 18:30:54 -07:00
Maxwell Salzberg
ab48ca260b
kinda ugly hack for ports in url with iframes
2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8
oembed mostly works
2012-04-18 16:12:56 -07:00
Maxwell Salzberg
31172a9959
basic oembed provider set up... too tried to finish this now
2012-04-18 16:12:56 -07:00
danielgrippi
a307b60dd2
DC DG extract infininte scroll to a mixin
2012-04-18 12:34:43 -07:00
Florian Staudacher
8eb70c8a80
use app.models.Stream instead of app.models.Photos,
...
change naming a bit to be more general since its posts+photos now
(re #3158 )
2012-04-18 20:20:56 +02:00
danielgrippi
3621576717
add/remove hidden class for pagination instead of manipulating HTML contents on every page load.
2012-04-18 10:27:22 -07:00
Maxwell Salzberg
90a2f05515
include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770
2012-04-17 22:28:01 -07:00
danielgrippi
3479cb7bdd
refactored stream and Stream View
...
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
2012-04-17 21:06:34 -07:00
danielgrippi
37cd6f616e
refactor stream fetching logic
2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f
change new publisher to public by default to make testing easier
2012-04-17 16:43:42 -07:00
Florian Staudacher
fe130caf10
moved non-ascii url markdown tests to text_formatter_spec, added test case + fix
2012-04-16 23:41:05 +02:00
Florian Staudacher
6c34207e01
freeze at a valid time, not 0000-01-01 ...
2012-04-15 13:03:33 +02:00
Florian Staudacher
d9d7bbb74b
using timecop for interactions + whitespaces removed
2012-04-15 03:10:18 +02:00
Maxwell Salzberg
9f6ad65d73
update schema, views spec
2012-04-13 18:32:35 -07:00
Dennis Collinson
a0ea8c8542
Update aspects dropdown to say number of selected aspects
2012-04-13 17:49:49 -07:00
Dennis Collinson
9e50d0efb6
Newspaper theme selected by default, template picker object
2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88
Wallpaper frame selected when post has one photo
2012-04-12 11:56:27 -07:00
Jonne Haß
83103c4761
deterministic stream order take 2, this time with spec
2012-04-12 16:33:02 +02:00
Dennis Collinson
d767410e6d
mentions are clickable in framer
2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f
can mention in new composer
2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec
Refactor composer and framer to user same layout
...
composer touchup; added controls to the bottom; centered input area; removed forms.Base view
Fix tests
2012-04-10 11:38:35 -07:00
Florian Staudacher
0bd4d63640
fix jasmine test for publisher textarea "resets height on close"
2012-04-06 22:24:13 +02:00
Florian Staudacher
d7eb4b242f
this seems to be in fact a bug in ruby 1.9.2, disabled for now
...
... when running with 1.9.3 everything's peachy :/
2012-04-06 03:42:37 +02:00
Florian Staudacher
518346deab
try setting a higher swappiness, take other val for mem calculation
2012-04-06 01:55:07 +02:00
Florian Staudacher
248e9d9ae7
add more output (swapping), increase swapfile size
...
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
2012-04-06 01:16:37 +02:00
Maxwell Salzberg
e1d86bddcf
some tweaks so it fails gracefully on systems that do not have free command
2012-04-05 14:29:41 -07:00
Florian Staudacher
fc941fa88b
try monitoring used memory an GC by that
2012-04-05 22:21:30 +02:00
Maxwell Salzberg
20fee66eee
dont do speedup magic on travis
2012-04-05 12:28:07 -07:00
Maxwell Salzberg
2e86d069b8
try two seconds
2012-04-05 12:15:17 -07:00
Maxwell Salzberg
f65a3d760e
defer gc for half as long to prevent travis dying
2012-04-05 12:08:15 -07:00
Florian Staudacher
4051651737
speeding up rspec by deferring garbage collection
...
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
on my machine the rspec tests went from taking 5min 02sec to 3min 29sec :O
(31% improvement)
2012-04-05 15:59:23 +02:00
Maxwell Salzberg
9c9562d0fd
fix http urls with 3 slashes
2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d
DG DC; visual fixups
2012-04-04 18:59:19 -07:00
danielgrippi
6098890783
redirect to post show on create
2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff
framer has better styling
2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732
newspaper template WIP
2012-04-04 18:59:19 -07:00
Maxwell Salzberg
f5754d2b71
small fix for jasmie that works in chrome and ff
2012-04-03 17:26:13 -07:00
Maxwell Salzberg
e521ac92f9
make a test slightly dumber for travis
2012-04-03 16:52:34 -07:00
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
Steven Hancock
a8843c1036
Fix JSON caching regression
...
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.
Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.
closes #3094
2012-04-02 21:40:16 -07:00
danielgrippi
e156947d0b
fix jasmine specs
2012-04-02 18:17:55 -07:00
Florian Staudacher
1709036764
fix jasmine unhappiness I introduced with #3088
2012-04-02 21:25:01 +02:00
Daniel Grippi
a45eed13d5
Merge pull request #3086 from Raven24/fix-publisher-height
...
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
2a4bc32eb5
make wallpaper-post spec pass
2012-04-01 17:43:33 +02:00
Maxwell Salzberg
adf85e1ec6
adding a bit to tubbo's spork branch
2012-03-31 01:22:46 -04:00
