vcuculo
8919d0c0ce
fixed bookmarklet
2011-09-02 10:28:32 +02:00
danielgrippi
af569204b8
Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet"
...
This reverts commit e278b39421d0f21cb444
2011-09-01 16:31:49 -07:00
vcuculo
6518a89302
fixed bookmarlet
2011-09-02 00:44:56 +02:00
Brian Wisti
8aafc61071
merged with blank markdownify check
2011-08-30 12:55:52 -07:00
Maxwell Salzberg
c66b7d584d
Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown
...
Conflicts:
Gemfile.lock
2011-08-27 14:13:15 -07:00
Dan Hansen
3ed50cab94
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
...
Conflicts:
app/views/status_messages/bookmarklet.html.haml
config/assets.yml
db/schema.rb
public/javascripts/contact-edit.js
public/javascripts/publisher.js
public/javascripts/view.js
2011-08-20 14:40:56 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
...
This reverts commit a407f12463
2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
...
This reverts commit 2777f16f4f8b278adff6
2011-08-18 16:16:14 -07:00
Brian Wisti
b87c7bb489
Improve code block support
2011-08-16 21:48:48 -07:00
Raphael Sofaer
cc3eeac98e
Merge the aspect dropdown in the publisher with master, some things are still broken
2011-08-16 14:59:53 -07:00
Raphael Sofaer
140268365c
Simplify aspect dropdown views
2011-08-16 12:43:08 -07:00
Dan Hansen
2e9040e227
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
2011-08-10 23:57:33 -07:00
danielgrippi
db645e8da8
merged publics/show and posts/show
2011-08-10 18:07:38 -07:00
Ilya Zhitomirskiy
ce94779766
not showing the reshare button to the users on things they can't reshare
2011-07-21 18:22:17 -07:00
Maxwell Salzberg
757c9169fc
updated gemfile
2011-07-21 14:32:10 -07:00
danielgrippi
e0bbde4ce2
comment likes wip. need to backfill some tests, make views nicer
2011-07-11 15:03:28 -07:00
danielgrippi
776368d45e
added left/right arrow events to the lightbox; lightbox only on stream element images for now
2011-07-10 21:09:00 -07:00
danielgrippi
e09ddef361
DH DG; lightboxin wip
2011-07-10 21:08:34 -07:00
Raphael Sofaer
97ca10ddda
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
2011-07-10 20:06:31 -07:00
danielgrippi
6a165c0e3d
made show pages wider for status messages. made names blue in comments for easier reading
2011-07-10 18:54:38 -07:00
danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
danielgrippi
60077bd70a
minor visual changes, more or less. facebox headers are now white.
2011-07-01 10:51:45 -07:00
danielgrippi
15571ecff0
render ASPhoto show page just like status message show for now
2011-06-23 15:47:59 -07:00
Dan Hansen
864233eb63
fix status message show page and break out Post to it's own javascript widget
2011-06-02 17:45:45 -05:00
Dan Hansen
c1366e0e04
Make photos display inline on StatusMessage#show
2011-04-27 17:06:26 -05:00
MrZYX
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75
added detection of rtl languages on every user based input
2011-04-03 02:14:35 +02:00
maxwell
569fb66e9e
bunch of small mobile ui fixes
2011-03-31 23:38:38 -07:00
zhitomirskiyi
f99b724e0b
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
2011-03-31 17:23:54 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
Raphael Sofaer
75354c1aba
fix error on mobite status message show
2011-03-30 12:51:02 -07:00
MrZYX
53bdb2cade
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
2011-03-30 17:17:36 +02:00
danielgrippi
aa4c20e404
pass post to comments partial. use sql in raw_visible_posts
2011-03-29 17:31:57 -07:00
maxwell
bbe5f56292
you can now mention in the bookmarklet
2011-03-29 13:55:14 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
maxwell
9e5890288c
more bookmarklet improvements
2011-03-28 18:34:52 -07:00
maxwell
f08b5dfafe
basic functionality done, fixing rough edges
2011-03-28 18:11:59 -07:00
danielgrippi
535e686b2c
fixed tag ordering in stream_element partial
2011-03-23 16:24:12 -07:00
maxwell
1de52d3ba2
fixed failing cucumber
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
maxwell
516b620148
gif and delayed processing wip
2011-03-17 13:59:53 -07:00
zhitomirskiyi
574a3b45b1
made it flash the sm on the profile page
2011-03-17 11:54:13 -07:00
MrZYX
a78710690a
moar translations
2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e
moved the fixture to the right place
2011-03-16 18:10:50 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
maxwell
d91fda656c
Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
...
This reverts commit ab997e2d21
2011-03-14 09:51:06 -07:00
maxwell
ab997e2d21
js hack to see bigger version of photo thumbnails in the stream without being abnoxious
2011-03-11 17:16:43 -08:00
danielgrippi
2cf0503310
put text below photo in stream
2011-03-10 15:28:44 -08:00
