Steven Hancock
1aa0b15c8c
Move Javascript to the asset pipeline
...
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
from .handlebars to .jst.hbs (this is to keep them in the same
global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
that were compiled by Jammit in the Rails 3.0 code
2012-03-27 18:07:44 -07:00
danielgrippi
9dffb426d4
remove jquery from assets; wip
2012-03-27 18:07:23 -07:00
danielgrippi
f72f1d4059
more progress
2012-03-27 18:07:22 -07:00
danielgrippi
5b2716d2ef
MS DG; move images to assets
2012-03-27 18:07:22 -07:00
danielgrippi
06936bcdce
stylesheets are basically now being served from sprockets
2012-03-27 18:07:20 -07:00
Maxwell Salzberg
0e4f9ae98d
fix chubbies by expliciting setting the view path
2012-03-27 17:54:27 -07:00
Maxwell Salzberg
ba917ec80b
some sad fixes to try and appease travis :(
2012-03-27 16:31:56 -07:00
Maxwell Salzberg
843c0d9c1a
Merge pull request #3068 from diaspora/posting
...
Merging the trumpeter
2012-03-27 16:11:14 -07:00
Dennis Collinson
9550082a94
fix notification cuke
2012-03-27 16:07:42 -07:00
Maxwell Salzberg
9d26643288
update heroku_san
2012-03-27 15:44:12 -07:00
Dennis Collinson
09f40c8684
Feature Flag new publisher
2012-03-27 15:28:30 -07:00
Dennis Collinson
6288eff599
day mood for a post responds to content
...
extract creating a post with templates to a static post view method.
Legacy templates extracted, day view
day mood shows photos and has variable text size
2012-03-27 14:54:27 -07:00
Dennis Collinson
663abcb0aa
MS DC Pull out stream post logic into own class
2012-03-27 14:54:27 -07:00
Dennis Collinson
2bb677b34b
Revert "a little framer styling"
...
This reverts commit 0ba13491e50d67360d0ed9e2e77dc8095994b8fd.
2012-03-27 14:52:53 -07:00
Dennis Collinson
010e091f62
a little framer styling
2012-03-27 14:52:53 -07:00
Dennis Collinson
775eca0026
MS DC You can has choose a template
2012-03-27 14:52:53 -07:00
Dennis Collinson
11eb1eb7d8
MS DC fix tests
2012-03-27 14:52:53 -07:00
Dennis Collinson
8c640b179e
showing photos in framer
2012-03-27 14:52:52 -07:00
Dennis Collinson
93e64c43aa
MS DC test for note template
2012-03-27 14:52:52 -07:00
Dennis Collinson
e0b18f5d6c
MS DC template picker override
2012-03-27 14:52:52 -07:00
Dennis Collinson
5d5fa084e5
next cuke, fix old
2012-03-27 14:52:52 -07:00
danielgrippi
09704291e9
templates getting rendered properly
2012-03-27 14:52:52 -07:00
Dennis Collinson
358414371e
MS DC framer shows rudimentary version of post
2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2
MS DC Post framer process init
2012-03-27 14:52:52 -07:00
danielgrippi
65f20f439c
new post form touchup
2012-03-27 14:52:52 -07:00
Dennis Collinson
a14090965f
pening sad spec
2012-03-27 14:52:52 -07:00
Dennis Collinson
a0e6433f5a
test multiple file upload in cucumber
2012-03-27 14:52:51 -07:00
Dennis Collinson
60420f1061
DG DC form autosubmits on file field change
2012-03-27 14:52:51 -07:00
Dennis Collinson
426f0278f9
DG DC uploading a photo shows up in the stream
2012-03-27 14:52:51 -07:00
Dennis Collinson
1ec2b73d59
DG DC remotipartjarvascripts
2012-03-27 14:52:51 -07:00
danielgrippi
6dce04d2f5
callbax, yo
2012-03-27 14:52:51 -07:00
Dennis Collinson
37bf5c5aee
REMOTIPART WIP
2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1
Select multiple aspects
2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246
MS DG; mentions work in new publisher
2012-03-27 14:52:50 -07:00
danielgrippi
fd0065598c
DG MS; posting to services now works, updated form serializer to handle array attributes.
2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8
DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services
2012-03-27 14:52:50 -07:00
Dennis Collinson
680e7f6637
select one aspect
2012-03-27 14:52:50 -07:00
Dennis Collinson
a3ecd32264
DG DC Change dropdown text on select
2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd
DC DGtoggle between public an private
2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06
DG DC OMG FORMZ
2012-03-27 14:52:50 -07:00
Dennis Collinson
9fbc4b745a
MS DC posting from post/new werks
2012-03-27 14:51:40 -07:00
Dennis Collinson
cc04f492f2
MS DC added aspect presenter, and include the data on the user
2012-03-27 14:51:40 -07:00
Dennis Collinson
bf4dabc4f4
MS DC posting from post/new werks
2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d
MS DC posts/new page init
2012-03-27 14:51:40 -07:00
Steven Hancock
f5fdb8ade1
Add an error message to the mobile login page
...
This adds an error message to the mobile version of the login page
for failed logins, as requested in #3048
This (along with the standard login page) appears to use the Devise
i18n for the error message, which may need to be updated to reflect
the fact that we're not using email addresses for authentication.
2012-03-27 04:41:56 -07:00
Jonne Haß
67a2f29e84
updated 12 locale files [ci skip]
2012-03-27 13:07:04 +02:00
Maxwell Salzberg
bf060d85d7
update gemfile.lock to include getting rid of resque-ensured-connected [ci skip]
2012-03-26 14:43:12 -07:00
Dennis Collective
c5baf619d1
Merge pull request #3060 from diasporg/reshareself
...
show your own reshare count but not allow for reshare of your own
2012-03-26 14:41:39 -07:00
David Morley
15847d672d
show your own reshare count but not allow for reshare of your own
2012-03-26 11:33:48 -05:00
Maxwell Salzberg
2e64d004f8
Merge pull request #3050 from justindthomas/fix-resque
...
Add Resque.before_fork to correct critical problem for PostgreSQL
2012-03-25 15:02:04 -07:00
