Florian Staudacher
8249847e9c
bookmarklet now is a complete html document (+test)
...
it auto-expands to the size of the text that was selected
it self-closes after posting again
2012-02-18 16:26:15 -08:00
danielgrippi
87aa1fde34
change language around explore/participate.
2012-02-18 16:26:15 -08:00
danielgrippi
dba50ae273
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e11 .
Conflicts:
app/views/templates/likes_info.jst
Revert "reference pin icon in mobile view [ci skip]"
This reverts commit 9377dd30f4 .
Revert "first pass at strickly user level rename from like => pin. still need to update assets"
This reverts commit d06ccb9ba9 .
Conflicts:
config/locales/diaspora/en.yml
add heart icon back
2012-02-18 16:26:15 -08:00
Maxwell Salzberg
0d77ca2c94
small typo [ci skip]
2012-02-18 16:26:15 -08:00
Maxwell Salzberg
1f8c087f68
fix authorizations page css to use media box
2012-02-18 16:26:14 -08:00
danielgrippi
ef7ffa2cbd
remove joindiaspora specific home page from repo [ci skip]
2012-02-18 16:26:13 -08:00
danielgrippi
c2695697d3
forgot to save a template [ci skip]
2012-02-18 16:26:13 -08:00
danielgrippi
d89358d80b
adding custom landing page for heroku
2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4
fix a bunch of small css related media box issues [ci skip]
2012-02-18 16:26:13 -08:00
danielgrippi
173894d926
stubbornella media and img dom structure FTW! major css deletion <3
2012-02-18 16:26:10 -08:00
danielgrippi
a16a8fc784
Participate / Explore have been upgraded to top-level status.
2012-02-18 16:26:10 -08:00
Florian Staudacher
56d9da6e04
make previously added specs green
2012-02-18 16:26:09 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
Dennis Collinson
558ceec92a
a user can mark themselves as nsfw
2012-02-07 19:03:20 -08:00
Dennis Collinson
efd99344eb
git status
2012-02-07 18:29:51 -08:00
danielgrippi
5d051fcc52
we're now rolling 100% handlebars for our templates, with jammit handling them as static assets.
2012-02-05 16:42:34 -08:00
danielgrippi
36e5ca431f
replace two more underscore templates with handlebar counterparts [ci skip]
2012-02-05 13:40:34 -08:00
danielgrippi
5a72f868d3
replace two underscore templates with their handlebars counterparts
2012-02-05 12:50:28 -08:00
danielgrippi
39ff47150b
allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.
2012-02-04 15:50:36 -08:00
Dennis Collective
6dbd644b01
Merge pull request #2719 from stwf/return-contact-popup-to-notify
...
aspects popup menu missing from 'started sharing' notifications
2012-02-03 00:42:10 -08:00
Hrishi
a2d427f06c
fix for the bug 8 (The back-to-top button covers the send button on the private message page)
2012-02-02 13:15:52 +05:30
danielgrippi
488e064e11
swap pin for heart [ci skip]
2012-02-01 16:53:22 -08:00
danielgrippi
310a0679f1
particpate stream, yo!
2012-02-01 16:05:16 -08:00
Maxwell Salzberg
f826340336
push stream listings to the side a bit
2012-02-01 13:56:52 -08:00
Maxwell Salzberg
51e5b0e02f
reorder side stream to insinuate new groupings
2012-02-01 13:39:21 -08:00
Jakob Kramer
eb445e45ba
fix missing translation in mentioning-lightbox
2012-01-31 22:16:48 +01:00
Steven Fuchs
5ea4bc0a1b
Merge remote branch 'upstream/master' into return-contact-popup-to-notify
2012-01-29 18:13:30 -05:00
danielgrippi
bcbabc5fd2
Switch boilerplate for bootstrap 2 on mobile. [ci skip]
2012-01-29 11:51:47 -08:00
Lennart Prelle
5deab956c0
use a form with a configurable paypal id
2012-01-29 20:14:31 +01:00
danielgrippi
0797460586
whats on your mind -> start a conversation
2012-01-29 09:19:36 -08:00
Jakob Kramer
44ff6ae8d8
fixed a link titled 'RSS' linking to an atom feed
2012-01-29 15:20:34 +01:00
Jonne Haß
9b07ce07d6
--amend [ci skip]
2012-01-29 13:13:08 +01:00
Jonne Haß
03f119ede7
fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip]
2012-01-29 13:09:03 +01:00
Maxwell Salzberg
13d1e68540
refactor people#index
2012-01-28 23:48:37 -08:00
Sarah Mei
d40746bff7
Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs.
2012-01-28 13:45:39 -08:00
danielgrippi
f250b79105
post owners can now delete any comments on their own posts. fixes #2652
2012-01-27 18:24:46 -08:00
danielgrippi
d773749374
comment stream now uses handlebars.
2012-01-27 17:46:35 -08:00
danielgrippi
d8c6dc0d79
added source to stream element js template. [ci skip]
2012-01-27 13:51:24 -08:00
danielgrippi
ff71bc5a44
remove @backbone reference in people/show (thx @mrZYX for the catch); added loaders to people and tag pages
2012-01-27 10:53:03 -08:00
danielgrippi
0da5f18ad5
add placeholder in CommentStreamView. [ci skip]
2012-01-26 19:58:00 -08:00
danielgrippi
5a78796ec0
Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders
2012-01-26 19:52:27 -08:00
danielgrippi
fa1ee731af
DG MS; made an imageUrl handlebars helper for assets served through handlebars templates.
2012-01-26 17:04:03 -08:00
Maxwell Salzberg
939383ef32
You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash
2012-01-25 11:22:45 -08:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Dennis Collinson
f506a8778c
moving javascript hax
2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee
almost done
2012-01-23 19:31:01 -08:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
danielgrippi
8f38a19976
stray underscore reference in handlebars template [ci skip]
2012-01-23 10:27:37 -08:00
Steven Fuchs
d8f2e73ea2
refer to model for target value, not set attributes.
2012-01-23 12:05:43 -05:00
danielgrippi
c94cc1cef2
markdown text in comments (auto linking, etc). we can use {{{ }}} notation here because markdown strips out xss, etc.
2012-01-23 00:57:05 -08:00