Markus Unterwaditzer
|
7e0449bb1e
|
Fix #1584 Pseudo-checkboxes in aspect list
|
2011-10-04 23:27:04 -02:00 |
|
danielgrippi
|
1d818fdc23
|
added reshare to mobile site
|
2011-10-03 17:02:23 -07:00 |
|
Gonzalo Rodriguez
|
0b97a3525a
|
Merge branch 'aspect_nav_rework'
|
2011-10-02 21:08:12 -02:00 |
|
danielgrippi
|
9672c27232
|
using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake
|
2011-10-02 12:27:14 -07:00 |
|
Gonzalo Rodriguez
|
d3a5bc1fb8
|
Merge branch 'master' into aspect_nav_rework
|
2011-10-01 03:58:50 -03:00 |
|
Maxwell Salzberg
|
11cbf3bc84
|
Merge pull request #2060 from wcs/hovercard-issues
Fix bug #2008
|
2011-09-29 18:15:45 -07:00 |
|
Maxwell Salzberg
|
f8a968bf52
|
fix some stupid markdown formatting that was bothering me
|
2011-09-29 12:34:04 -07:00 |
|
danielgrippi
|
6b73527379
|
vcuculo's fixes (flattened mobile.scss into mobile boilerplate's css instead of just flipping the load order)
|
2011-09-29 10:19:03 -07:00 |
|
danielgrippi
|
ae1fd49954
|
force hardware acceleration for speedier typing on mobile webkit browsers
|
2011-09-28 23:26:00 -07:00 |
|
Gonzalo Rodriguez
|
74d00d7db4
|
Merge branch 'master' into aspect_nav_rework
|
2011-09-28 19:52:15 -03:00 |
|
danielgrippi
|
d2d205ee08
|
make autoexpand work
|
2011-09-28 11:21:14 -07:00 |
|
danielgrippi
|
42fcf3e394
|
reshares up top
|
2011-09-27 21:32:11 -07:00 |
|
danielgrippi
|
7d662fcc92
|
move share button to top right corner
|
2011-09-27 21:09:28 -07:00 |
|
danielgrippi
|
f34f0ce5fb
|
expand/collapse comments with animation; added collapse link on bottom
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
64113eb8f2
|
increment counter on comment add
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
beb5380ada
|
enable webkit hardware acceleration for css shadows
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
51c7e879de
|
use deletage instead of live; bind where we don't need to delegate
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
9b057bdf16
|
added placeholder; force autofill off on comment fields; touched up mobile reshare view
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
744ab579bd
|
adding comments work for one of two comment add buttons; added info on
posts; post show page.
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
3b08fc8406
|
wip
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
ea357a96ef
|
expand&collapse comments; added comment form (wip)
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
9d72247e9e
|
mobile tags page
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
7acb48ff7a
|
add lighting on more button
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
d972802142
|
comment ajax on mobile.
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
91c9fffb81
|
touched up login page wip
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
f2f14c2894
|
fixed ajax for likes
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
6deb924c32
|
fixed header; compose message on top right
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
645af37358
|
more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
9e3ff7338e
|
ditch unused css rules; move js to body bottom
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
00e561dd01
|
comments -> reactions
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
8c586c4567
|
added html5 boilerplate meta tags to mobile; stripped functionality to add back
|
2011-09-27 21:09:25 -07:00 |
|
Wilmar Cesar Santos
|
1f63860f0e
|
Fix bug #2008
|
2011-09-27 13:32:08 -04:00 |
|
Gonzalo Rodriguez
|
e0ffd7c63e
|
Merge branch 'master' into aspect_nav_rework
Conflicts:
features/posts_from_main_page.feature
public/javascripts/aspect-filters.js
spec/javascripts/aspect-filters-spec.js
|
2011-09-27 00:08:05 -03:00 |
|
Ilya Zhitomirskiy
|
f9172c8733
|
added aspect dropdown to the getting started page, renamed the button to be add contact
|
2011-09-26 17:32:37 -07:00 |
|
Ilya Zhitomirskiy
|
675908a57d
|
added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services
|
2011-09-26 16:04:25 -07:00 |
|
bdjnk
|
1e1fe011e1
|
Ensures that the back-to-top button remains on top and won't be covered by images on small screens.
|
2011-09-26 14:26:40 -07:00 |
|
danielgrippi
|
131166841a
|
added logged out page referencing mobile
|
2011-09-25 11:58:44 -07:00 |
|
Ilya Zhitomirskiy
|
461cb22109
|
in the getting started featured tags are now followable
|
2011-09-23 17:06:21 -07:00 |
|
John Edmonds
|
cfd174bd2c
|
Make header gradient work in Opera.
|
2011-09-17 13:01:51 -04:00 |
|
danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
Gonzalo Rodriguez
|
181bc6cd57
|
Dim a little bit separation bar. Closes #1936. [ci skip]
|
2011-09-13 23:38:37 -03:00 |
|
Gonzalo Rodriguez
|
2947ee46f4
|
Bold titles on profile information sidebar. Closes #1934.
|
2011-09-13 00:04:51 -03:00 |
|
behrooz shabani (everplays)
|
0370fab706
|
Merge branch 'css-rtl' of github.com:everplays/diaspora into css-rtl
|
2011-09-10 16:20:15 +04:30 |
|
Gonzalo Rodriguez
|
04786bc43e
|
Improvements on aspect navigation rework
|
2011-09-08 02:13:15 -03:00 |
|
Gonzalo Rodriguez
|
1a6ee84ed5
|
Refactor aspect listings partial. Splited in two, one for index and
other for contacts.
|
2011-09-07 00:09:39 -03:00 |
|
Maxwell Salzberg
|
a7602c4fd1
|
update jquery mobile
|
2011-09-05 10:51:36 -07:00 |
|
danielgrippi
|
b6e2647530
|
remove sass warnings
|
2011-09-04 23:13:03 -07:00 |
|
danielgrippi
|
341d105e75
|
updated buttons, mixin declarations
|
2011-09-04 22:48:37 -07:00 |
|
Daniel Grippi
|
c63dfb88fe
|
Merge pull request #1883 from manuels/lightbox-click-cursor
[PaperCut] Change cursor for lightbox thumbs
|
2011-09-02 20:14:02 -07:00 |
|
vcuculo
|
9072de5096
|
fixed bookmarklet
|
2011-09-02 10:25:34 +02:00 |
|
danielgrippi
|
af569204b8
|
Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet"
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
|
2011-09-01 16:31:49 -07:00 |
|
Maxwell Salzberg
|
e278b39421
|
Merge pull request #1874 from vcuculo/1785-fix-bookmarklet
Fixed bookmarklet
|
2011-09-01 16:20:59 -07:00 |
|
Maxwell Salzberg
|
d0f21cb444
|
small fix for lists in comments
|
2011-09-01 16:20:13 -07:00 |
|
vcuculo
|
b30a25713e
|
fixed bookmarklet
|
2011-09-02 01:11:25 +02:00 |
|
vcuculo
|
6518a89302
|
fixed bookmarlet
|
2011-09-02 00:44:56 +02:00 |
|
Daniel Grippi
|
9cff210b24
|
Merge pull request #1691 from manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier
[PaperCut] add underlining for hovered tags
|
2011-09-01 10:05:54 -07:00 |
|
danielgrippi
|
7e72a29401
|
fixed aspect edit pane (removed diaspora ids)
|
2011-08-31 14:55:23 -07:00 |
|
Manuel Schölling
|
2b6167f99d
|
Change cursor for lightbox thumbs
|
2011-08-30 15:18:10 +02:00 |
|
Gonzalo Rodriguez
|
57c531ffdc
|
Sorry, only for the user name link
|
2011-08-30 03:32:19 -03:00 |
|
Gonzalo Rodriguez
|
447b92a6fe
|
Remove annoying dotted rectangle on user menu
|
2011-08-30 03:26:14 -03:00 |
|
Maxwell Salzberg
|
f479a9a144
|
Merge branch 'brianwisti-1305-full-markdown'
|
2011-08-29 10:56:48 -07:00 |
|
Andrej Kacian
|
e1838729fe
|
Fix account name color in user menu, issue #1833.
|
2011-08-29 11:55:44 +02:00 |
|
Gonzalo Rodriguez
|
a618b261f3
|
Closes #1571. Give min-width to user menu.
|
2011-08-28 23:02:28 -03:00 |
|
danielgrippi
|
3a27d66ee8
|
fix hover to add hover class to element (ugly); fixes one cucumber test
|
2011-08-27 23:20:57 -07:00 |
|
danielgrippi
|
802dd989a8
|
remove javascript in lieu of css; feature is still failing
|
2011-08-27 22:04:30 -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 |
|
Maxwell Salzberg
|
8dfb278509
|
Merge pull request #1795 from lksnyder0/admin_nav
Admin nav
|
2011-08-25 16:35:09 -07:00 |
|
Maxwell Salzberg
|
b70f684efc
|
fix css for hovercards in notifications, and people with long names
|
2011-08-25 12:16:03 -07:00 |
|
Gonzalo Rodriguez
|
43d6acd868
|
Support green login page flash message for password change success
|
2011-08-23 00:51:00 -03:00 |
|
Dan Hansen
|
6b040c7b4a
|
clean up websocket receiver, add specs to content updater
|
2011-08-22 20:03:38 -05:00 |
|
Luke Snyder
|
f9fc55823b
|
finished styling
|
2011-08-21 13:07:04 -04: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 |
|
Maxwell Salzberg
|
e4062bf5fd
|
now functionally correct
|
2011-08-19 15:56:32 -07: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 2777f16f4f, reversing
changes made to 8b278adff6.
|
2011-08-18 16:16:14 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2777f16f4f
|
Merge branch 'issue1586-aspectdropdown-when-posting'
|
2011-08-18 16:02:09 -07:00 |
|
Maxwell Salzberg
|
947dfaacf7
|
make profile photo auto so it does not get smooshed
|
2011-08-18 14:09:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
b1e95def4a
|
Merge branch 'master' into issue1586-aspectdropdown-when-posting
|
2011-08-18 12:59:00 -07:00 |
|
danielgrippi
|
fca2be5c5d
|
facebox overlay dark again, with a faint spotlight
|
2011-08-17 22:43:58 -07:00 |
|
Brian Wisti
|
03127cd592
|
basic support for Redcarpet Markdown
|
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 |
|
Luke Snyder
|
b62801bd64
|
Initial styling and links
|
2011-08-14 22:10:56 -04:00 |
|
Raphael Sofaer
|
d228f50557
|
Acceptable ajax loader for the aspect dropdown.
|
2011-08-13 12:45:17 -07:00 |
|
danielgrippi
|
1c5f61fb78
|
dropdown images as embedded assets and not 2 separate image tags
|
2011-08-12 18:18:58 -07:00 |
|
danielgrippi
|
75f3accd37
|
moved facebook friend inviter/finder into contacts layout & re-added search
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
a8d37fb3fc
|
Move Facebook inviter view into the contacts layout, rather than a facebox
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
190332308b
|
started on the real stats page
|
2011-08-11 17:15:33 -07:00 |
|
Andrej Kacian
|
8296b8ca1a
|
Tag unfollow and aspect edit icons are now made more opaque on mouseover
|
2011-08-12 00:51:29 +02: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 |
|
Raphael Sofaer
|
091cdd6f94
|
Basic contacts index page on the mobile site
|
2011-08-10 16:23:33 -07:00 |
|
Sarah Mei
|
0b02653f44
|
Merge pull request #1694 from ticho/tag-list-has-unfollow-icon
Add a "unfollow" icon to each tag in followed tags listing
|
2011-08-09 21:44:21 -07:00 |
|
Maxwell Salzberg
|
6406c59bc7
|
move back to top to bottom
|
2011-08-09 18:36:49 -07:00 |
|
Andrej Kacian
|
2a970145c8
|
Added icon to directly unfollow a tag to listing of followed tags.
|
2011-08-09 22:45:06 +02:00 |
|
Maxwell Salzberg
|
a4e6a019a7
|
make the scroll to top a bit more subtle
|
2011-08-09 11:33:47 -07:00 |
|
Maxwell Salzberg
|
72b734e3e8
|
scroll to top like a boss
|
2011-08-09 01:04:54 -07:00 |
|
Manuel Schölling
|
fead6032f7
|
Issue 1586: added a aspect drop down next to the submit button in the publisher
|
2011-08-07 12:51:32 +02:00 |
|
Andrej Kacian
|
6b64d7f55a
|
Correctly space unread and total message counts in conversations list
|
2011-08-07 04:06:26 +02:00 |
|
danielgrippi
|
3655ea22a6
|
missing 'important' flag
|
2011-08-05 17:39:58 -07:00 |
|
danielgrippi
|
ff1882387d
|
wrong margin
|
2011-08-05 17:35:22 -07:00 |
|