Jonne Haß
b1cdc30367
Merge pull request #4004 from movilla/upload_photo
...
Upload photo mobile. Close #3324
2013-02-26 15:30:09 -08:00
movilla
76b1e9b0dc
Add the ability to upload photos from the mobile site
2013-02-26 23:25:58 +01:00
Jonne Haß
cf9659de4a
fix XSS vulnerability in conversations#new, closes #4010
2013-02-26 19:09:30 +01:00
Fabián Rodríguez
c1eb986f5b
remove unnecessary code from people_controller#contacts and use #each in view
2013-02-23 22:36:04 -02:00
Fabián Rodríguez
e76935daaf
remove inline styles from views/people/show
2013-02-23 22:36:04 -02:00
Fabián Rodríguez
7472642bd1
Refactor:
...
*people_controller#show
*photos_controller#index
*views/people/show both html and mobile
2013-02-23 22:36:03 -02:00
Jonne Haß
19b9b0edb8
Merge pull request #3990 from movilla/mismatch_author_name
...
Wrap text if too long in mobile notifications
2013-02-22 07:51:20 -08:00
movilla
c52a878e86
Wrap text if too long in mobile notifications
2013-02-22 16:15:25 +01:00
Florian Staudacher
f788f3426a
Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed
...
Include reshares in the public user feed, closes #1781
2013-02-21 13:37:29 -08:00
movilla
e0d0d0f668
Fixed removing images from publisher on the profile and tags pages
2013-02-21 22:19:24 +01:00
Jonne Haß
35350d1ceb
Include reshares in the public user feed, closes #1781
2013-02-21 14:32:28 +01:00
Jonne Haß
0fd3bcb397
move custom splash page login into the controller, fixes #3991
2013-02-21 13:46:04 +01:00
movilla
5769abcc32
Include our custom fileuploader on the mobile site too
2013-02-20 16:01:08 +01:00
Florian Staudacher
4cbae601e8
[WIP] aspect membership dropdown Backbone.js rework
...
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships
TODO
* more tests
2013-02-17 13:40:10 +01:00
Lennart Prelle
2d0abe8309
added a id and a autoscroll to first unread message in conversation ( Fix : #3216 )
2013-02-11 16:15:01 +01:00
movilla
63f1d1c197
friendlier mobile buttons
2013-02-09 15:23:04 +01:00
Ruxton
ff7308685a
Add a changelog_url helper so that pods can report a more correct changelog
2013-02-04 09:45:36 +08:00
movilla
0ea7bc5258
Adapt css for search mobile page
2013-02-02 23:23:22 +01:00
movilla
507e8ee199
Add Getting_Started page mobile
2013-02-02 16:02:19 +01:00
Jonne Haß
b8128d356b
Merge branch 'hotfix/0.0.2.4' into develop
...
Conflicts:
Changelog.md
app/views/people/show.html.haml
config/defaults.yml
spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28
Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
...
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Jonne Haß
1aa8b6e9f2
do not display the publisher on the profile photos page
2013-01-31 19:25:30 +01:00
Asphyxia
b91ed859a1
Hovering a Timeago-String should show the Timestamp
2013-01-31 13:43:37 -03:00
Asphyxia
389e93a3ae
Stream form on profile page
2013-01-31 00:15:27 -03:00
Jonne Haß
d398365641
Merge branch 'movilla-settings_mobile' into develop
2013-01-29 15:13:19 +01:00
Jonne Haß
4eb98cd7dc
Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile
...
Conflicts:
Changelog.md
2013-01-29 14:58:11 +01:00
Fabián Rodríguez
649844ea6a
Refactor contacts/index
2013-01-29 10:01:08 -02:00
movilla
0010819343
add settings web mobile
2013-01-27 20:38:19 +01:00
Asphyxia
6ee921235e
Side panel ui changes
2013-01-27 08:04:33 -03:00
Diaspora Europe
6d4e577676
show links in sidebar #1338
2013-01-26 11:59:15 +01:00
malavbhavsar
4629afb1f5
Fix services index view.
2013-01-24 23:00:53 -05:00
Asphyxia
7f34c7af7a
Issue #3874 : Distorted profile thumbnail
2013-01-21 22:43:48 -03:00
Asphyxia
d6a9818632
Issue #3851 : Profile pictures not centered
2013-01-18 15:51:59 -03:00
Asphyxia
5a6090a0fb
Issue #3846 : Wrong message on mobile
2013-01-18 15:40:00 -03:00
Fabián Rodríguez
0f499e7c2e
make publisher work with backbone
2013-01-16 19:33:20 -02:00
Fabián Rodríguez
2eba28266b
remove server side rendering of aspects
2013-01-16 19:33:19 -02:00
Diaspora Europe
ac3b2bc99f
pod version in footer and updated link to changelog #3705
2013-01-15 16:45:10 +01:00
Diaspora Europe
c8ddba6b3e
add images to notifications
2013-01-11 12:30:12 +01:00
movilla
ceace52762
Add progress percentage to upload images
2012-12-20 21:24:09 +01:00
movilla
763a893829
Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser
2012-12-08 14:59:01 +01:00
Jonne Haß
0677459ff9
Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop
2012-12-08 13:47:13 +01:00
Jonne Haß
459df9b735
Merge pull request #3791 from movilla/suggest_member
...
Translation "suggest member" of Community Spotlight
2012-12-06 09:34:01 -08:00
movilla
491c2a537c
Add feature contact pod admin
2012-12-06 15:26:49 +01:00
movilla
65376a604b
Allow translation of "suggest member" of Community Spotlight
2012-12-06 13:15:34 +01:00
Liam
c9559b93f5
Update cat image so it's secure - new image from khanb1 on flickr.
2012-12-02 10:31:45 +00:00
David McMullin
6e912adb88
add a necessary param, fix the retrieve limit
2012-12-01 11:18:13 +00:00
Jonne Haß
7b548fd571
Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
...
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
rschaden
49d4079065
add email validation to invitations
2012-11-25 14:25:20 +01:00
Bobby Wilson
abd4e17daf
Fix #3750
2012-11-22 13:00:47 -07:00
Jonne Haß
5f6e03cfe5
Merge pull request #3714 from marpo60/refactor
...
Housekeeping
2012-11-22 01:06:05 -08:00
Jonne Haß
e9bccb8afe
get rid of string concat of translatable strings in getting started
2012-11-18 17:24:43 +01:00
Fabián Rodríguez
f590abb343
fix 3682, use correct image path for padlocks
2012-11-15 18:17:15 -02:00
Dennis Schubert
ae53254259
Really remove Devises timeoutable...
...
... and force it to really remember the session by a hidden field.
2012-11-14 20:32:15 +01:00
movilla
3fa0254876
add simple background for unread messages/conversations mobile
2012-11-13 19:58:25 +01:00
David McMullin
97664cb880
port tagFollowings to BackBone
2012-11-12 21:37:00 +00:00
movilla
764aa579cd
fix css error with intivation people block in search results
2012-11-11 15:38:03 +01:00
Braulio Martinez
3260bada38
Remove posts#new action from Rails and related tests
2012-11-07 23:14:35 -02:00
Fabián Rodríguez
75c943e876
remove app/views/aspects/update
2012-11-06 21:39:37 -02:00
Fabián Rodríguez
893c37004e
remove app/views/aspects/index
2012-11-06 21:39:37 -02:00
Fabián Rodríguez
ae2b459f0e
remove app/views/aspects/aspect_list_item
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
3743eac10d
remove app/views/aspects/aspect_contacts
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
1961ab3326
remove app/views/invitations/edit
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
cf48d384a8
remove app/views/invitations/token_not_found
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
f26d8fdf4c
remove app/views/people/profile_photo_upload
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
8bc64bdf4f
remove app/views/people/aspect_list
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
8cf8fae396
remove app/views/people/add_contact_small
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
b7a6f8b3b2
remove app/views/likes/likes_container
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
34c601bc41
remove app/views/notifications/popup
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
48bb6ad25c
remove old experimental leftovers
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
aa8b37f2be
remove app/views/requests/
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
5d169a3d73
remove app/views/shared/mail_signup_form
2012-11-06 21:39:35 -02:00
Fabián Rodríguez
f22ec35989
remove app/views/shared/author_info
2012-11-06 21:39:35 -02:00
Jonne Haß
a78cacb799
Merge pull request #3687 from movilla/add_icon_mobile_my_activity
...
Add My Activity icon mobile. Close #3680
2012-11-06 09:02:46 -08:00
movilla
f3ce1e6c66
Fix Invite link box shows on search results page even if invites have been turned off
2012-11-06 15:56:53 +01:00
Jason Robinson
b96fbb0676
Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.
2012-11-01 21:50:31 +02:00
movilla
880b16f530
Add My Activity icon mobile
2012-10-29 12:14:19 +01:00
movilla
c9b58c9ff6
Add My Activity icon mobile
2012-10-26 22:47:43 +02:00
movilla
ebd1b28b2d
Fix problem javascript with read-unread notifications on notifications popup
2012-10-13 15:16:06 +02:00
Fabián Rodríguez
40f5314184
adds password_confirmation field to registration page
2012-10-11 19:45:52 -02:00
Sean Tilley
bbaf41aa8d
Merge pull request #3637 from movilla/dropdown_welcome_page
...
Aspect dropdown on welcome page (after signup) - overflow hidden - Fix #3604 [ci skip]
2012-10-08 14:36:01 -07:00
movilla
7be7ac3176
Aspect dropdown on welcome page (after signup) - overflow hidden - fix 3604
2012-10-08 19:15:21 +02:00
Florian Staudacher
83ab60ab9e
Merge branch 'hotfix/mobile-bookmarklet' into develop
...
fix layout determination for mobile bookmarklet
2012-10-05 12:25:33 +02:00
Jason Robinson
a26dc34a7b
Fix broken mobile bookmarklet, isse #3613
2012-10-05 09:53:19 +02:00
Florian Staudacher
8678c14735
Merge pull request #3589 from MrZYX/refactor_config
...
New configuration system, details: see changelog
2012-09-30 13:07:40 -07:00
David McMullin
586e23727c
add specs for chromeframe
...
fix typo in ChromeFrame itself
remove unneccessary chromeframe meta tags from layouts
2012-09-30 17:04:50 +01:00
Jonne Haß
89c1fd5f7f
query the set url only through #pod_uri in the app
2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9
New configuration system
...
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca
some refactoring regarding the law of demeter
2012-09-23 19:33:19 +02:00
Sean Tilley
48049d9b49
Merge pull request #3590 from movilla/reshares_mobile_2_the_revenge_absolute_root
...
reshare mobile doesnt show the original author - absolute_root - Fix : #3368 [ci skip]
2012-09-19 20:54:18 -07:00
movilla
dc0b2d9e58
reshare mobile doesnt show the original author - absolute_root - Fix: 3368
2012-09-19 07:30:03 +02:00
Jonne Haß
42f97db42e
Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop
2012-09-17 21:36:36 +02:00
Florian Staudacher
452de1b866
fix remaining cukes and some cleanup
2012-09-17 20:35:38 +02:00
movilla
ae0ac1c72d
css change when you choose aspects before posting -dropdown list-
2012-09-16 17:37:27 +02:00
Florian Staudacher
948b84eca1
WIP backbone-ify publisher, get rid of weird old POJsO
2012-09-16 14:35:59 +02:00
Jonne Haß
ab0ad630df
strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
2012-09-12 05:48:12 +02:00
Florian Staudacher
04a17fd508
Merge pull request #3561 from movilla/NSFW_mobile_will_come_back
...
NSFW mobile come back
2012-09-10 13:08:51 -07:00
movilla
a4a483af90
NSFW mobile come back
2012-09-10 20:48:34 +02:00
Sean Tilley
3deff9327a
Merge pull request #3557 from movilla/web_mobile_login_second
...
New web mobile login (Jonne suggestion) [ci skip]
2012-09-08 12:02:15 -07:00
movilla
c6d24c61f9
404 page set for mobile
2012-09-08 19:43:10 +02:00
movilla
a564cbff9d
New_login_mobile_web_
2012-09-08 15:30:59 +02:00
movilla
c0c568365a
Fix blank page 404 on mobile
2012-09-04 00:09:45 +02:00
Florian Staudacher
45223fd634
Merge pull request #3520 from movilla/new_mobile_resgistrations_
...
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
2012-08-31 01:17:20 -07:00
Sean Tilley
3775deb03f
Merge pull request #3525 from movilla/big_block_login_
...
Issue #3523 : The text 'Gebruikersnaam' (unsername in Dutch) overlay the inputfield. [ci skip]
2012-08-30 10:13:44 -07:00
movilla
6a32bdd570
Issue #3523 : Overflow text username in Duych - maybe several language-_
2012-08-30 16:03:35 +02:00
movilla
94525f5e45
Issue #3523 : Overflow text username in Duych - maybe several language-
2012-08-30 15:55:54 +02:00
movilla
6c6be3e22a
New mobile_web registrations
2012-08-29 23:09:52 +02:00
movilla
b1815c8e9a
Add placeholder search mobile
2012-08-25 03:45:02 +02:00
Maxwell Salzberg
ac9af24209
Merge pull request #3505 from movilla/add_header_mobile_icons
...
Add icon to search & contacts via mobile
2012-08-22 10:40:02 -07:00
Maxwell Salzberg
4c9326eaf9
fix stupid sign up form
2012-08-21 15:42:07 -07:00
movilla
75402bdfa0
Add icons search & contacts mobile
2012-08-21 16:50:37 +02:00
movilla
e41ef3caa5
Small changes in mobile_style
2012-08-20 22:40:52 +02:00
movilla
9913f40a38
Added private conversation for mobile
2012-08-20 16:33:05 +02:00
Maxwell Salzberg
329a37ef9a
Merge pull request #3493 from movilla/conversation_mobile
...
Add file mobile conversation
2012-08-14 11:08:41 -07:00
movilla
783edaa327
Fix issue #3473 Wrong profile icon size in tag stream
2012-08-12 23:23:16 +02:00
movilla
9931f39ce0
add mobile conversation
2012-08-12 05:01:42 +02:00
Florian Staudacher
645fa76b20
make the "last post" link show ownly if the person has any posts
...
(fixes #3437 )
2012-08-09 15:12:22 +02:00
Florian Staudacher
932fb186e3
fix failing bookmarklet specs (wait for js to finish)
2012-08-04 16:10:11 +02:00
Florian Staudacher
9d11748486
added minimal layout for bookmarklet popup
2012-08-04 14:48:18 +02:00
Dennis Schubert
15b7ee0cf8
Fix the bookmarklet when using paramters
...
... because setting values without waiting for the browser to finish the DOM rendering is evil ...
2012-07-26 23:57:28 +03:00
Florian Staudacher
b9c4e8a02f
let the 'toggle mobile' link show in the footer, refactored layout a bit
2012-07-22 15:25:51 +02:00
movilla
d45e53bb91
Link to post in the mobile
2012-07-22 13:32:02 +03:00
Florian Staudacher
629277502f
Merge pull request #3450 from despora/mobile_messages
...
add messages/conversations to mobile
2012-07-16 15:10:00 -07:00
Lennart Prelle
00032a1649
add messages to mobile
2012-07-14 14:23:03 +02:00
Jason Robinson
e644a70406
Mobile bookmarklet was not loading jQuery causing javascript to not execute, fixes #3204
2012-07-10 23:06:42 +03:00
Florian Staudacher
038599bf8f
update jquery.mentionsInput to latest version
...
+ make some tests a little nicer
2012-07-10 20:37:57 +02:00
Florian Staudacher
ea8f358a9a
use unminified jQuery textchange plugin
2012-07-10 17:58:34 +02:00
movilla
2ff89ed33d
Change root_url to root_path
2012-07-06 20:08:41 +03:00
Jonne Haß
c9e54700ff
string concatenation is still bad
2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f
Last translation admin-panel (weekly user)
2012-06-24 02:34:49 +02:00
Florian Staudacher
994bfd4a24
fix client-side validations in registration form + test
2012-06-18 18:57:44 +02:00
Florian Staudacher
f4d7196fb5
tell jQuery not to expect html when deleting photos in the publisher
2012-06-18 15:25:50 +02:00
movilla
d5aefaa64c
Login with pod_name
2012-06-16 22:51:38 +02:00
Steven Hancock
9280753950
Fix deprecation warning, :confirm option on links is deprecated
...
Use `:data => { :confirm => 'text' }` instead.
2012-06-14 01:56:51 -07:00
Steven Hancock
a8de3a5a3f
Rails.root and File.join cleanup
...
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936
show a "post is not public" message when visitor is not logged in
...
and tries to access a show page of a non-public post
2012-06-07 22:16:37 +02:00
Maxwell Salzberg
9071540400
use pod name helper in emails
2012-06-04 14:04:39 -07:00
Maxwell Salzberg
018e513130
remove disable_with depreciation warning.
2012-05-31 22:35:07 -07:00
Maxwell Salzberg
cf6974b898
fix photo uploader loading image
2012-05-31 11:58:11 -07:00
danielgrippi
9e42d4386f
actually add the guid into the layouts [ci skip]
2012-05-30 16:34:29 -07:00
danielgrippi
de680216f0
add mixstuff to post.haml layout [ci skip]
2012-05-30 15:33:40 -07:00
danielgrippi
f3e568d3c1
actually include mixpanel. durr [ci skip]
2012-05-30 14:00:25 -07:00
danielgrippi
72d2f619fc
added GA back into rack; added mixpanel configuration options
2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577
add a podname app config var, and use it throughout the app
2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56
Merge pull request #3302 from movilla/new_login
...
Translation new make something /stream [ci skip]
2012-05-29 11:45:24 -07:00
Carlos Alexandro Becker
22103ffe65
set cursor into username field on login page - fixes #3305
2012-05-28 01:40:30 -03:00
movilla
13c16af5ad
Fix Translation missing Email_link
2012-05-26 21:49:54 +02:00
Maxwell Salzberg
de499ba276
new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip]
2012-05-23 18:06:50 -07:00
Dennis Schubert
348c5ac522
Extend usernames pattern to allow '@', '.' and '"' to not lock out old users with dots in their username or users using their email address to sign in...
2012-05-23 20:52:43 +03:00
movilla
a7f967c2c5
Translation new make something /stream
2012-05-23 00:43:45 +02:00
Jonne Haß
5c534521cc
top level email is a noun, not a verb [ci skip]
2012-05-22 10:26:21 +02:00
Dennis Collinson
2059fea656
put stream.haml back as it is still used in mobile
2012-05-21 17:43:49 -07:00
Dennis Collinson
17dc5eab18
can't remove these yet, cause of mobile
...
Revert "do you like old views, because I don't.Kill the old stream views"
This reverts commit 370d8b0482
2012-05-21 17:40:23 -07:00
Dennis Collinson
370d8b0482
do you like old views, because I don't.Kill the old stream views
2012-05-21 17:20:08 -07:00
danielgrippi
72f718c8c3
new login page. kept the old one for safe keeping.
2012-05-19 11:10:17 -07:00
Maxwell Salzberg
471ce309ea
kill your darlings; remove diaspora_client with fire
2012-05-17 14:55:53 -07:00
Maxwell Salzberg
a6758c0832
Merge pull request #3264 from movilla/share_amparito
...
Translation invitation Share this link /stream [ci skip]
2012-05-16 17:48:14 -07:00
movilla
d394272e5d
Translation invitation Share this link /stream
2012-05-16 00:56:34 +02:00
Movilla
4fac6c9619
Rebase Add translation app/views/admins/stats.html.haml => Admin Panel
2012-05-15 22:38:48 +02:00
Movilla
a3daa00a41
Rebase Add translation app/views/admins/stats.html.haml for Admin Panel
2012-05-15 22:27:08 +02:00
Maxwell Salzberg
ab2e740ca2
upgrade to Rails 3.2.3
2012-05-14 21:53:16 -07:00
Maxwell Salzberg
fe6dcffa8f
remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer
2012-05-14 16:33:56 -07:00
Maxwell Salzberg
06f389231a
kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk
2012-05-14 16:25:19 -07:00
Maxwell Salzberg
7a6633e82a
Merge pull request #3256 from SuperTux88/invitation-mail
...
Invitation mail cleanup
2012-05-14 15:38:43 -07:00
Benjamin Neff
e15aff46a6
delete message input field
2012-05-15 00:23:54 +02:00
Benjamin Neff
ea90c6caf0
remove "message" from invite-form (not used in email)
2012-05-13 02:51:54 +02:00
movilla
7538f89a95
Translation registrations/new
2012-05-12 22:18:10 +02:00
danielgrippi
81661c883f
custom landing page logic for mobile. yay
2012-05-11 17:05:09 -07:00
danielgrippi
a3ca176d74
new getting started page [ci skip]
2012-05-10 20:43:00 -07:00
Maxwell Salzberg
eaedfc9827
create a new publisher using the new composer. only for beta users
2012-05-09 16:55:33 -07:00
danielgrippi
0ec364e44c
DG MS; popup on services, inlined in the composer
2012-05-08 18:09:33 -07:00
Steven Hancock
56db268613
Use markerb for emails
...
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB
This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
2012-05-07 19:41:30 -07:00
danielgrippi
34819b4128
temp button instead of textbox for beta-limbo users
2012-05-07 15:40:13 -07:00
danielgrippi
a5f34e67c7
made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock.
2012-05-04 21:25:50 -07:00
danielgrippi
69b9b5768f
yield outside container like in master
2012-05-04 17:40:47 -07:00
danielgrippi
511a87e830
remove unused file [ci skip]
2012-05-04 17:38:08 -07:00
danielgrippi
5821a84024
validations and all that jazz [ci skip]
2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04
actually use labels, html5 validations, etc [ci skip]
2012-05-04 17:38:08 -07:00
danielgrippi
40347038f8
DG RY; mostly done, validations pending [ci skip]
2012-05-04 17:38:07 -07:00
Dennis Collinson
6fcba2dd4b
preload javascript vars using gon
2012-05-04 15:17:32 -07:00
danielgrippi
feb19e304e
add chartbeat to mobile [ci skip]
2012-05-03 16:05:57 -07:00
danielgrippi
004874eb89
Revert "adding custom landing page for heroku" [ci skip]
...
This reverts commit 3b994f45e1
2012-05-03 14:13:24 -07:00
danielgrippi
7be7acdfd6
add chartbeat option for great success (and metrics)
2012-05-03 14:04:19 -07:00
danielgrippi
3b994f45e1
adding custom landing page for heroku
2012-05-03 14:04:19 -07:00
danielgrippi
f263d0309d
spelling error. running cukes are important.
2012-05-01 18:27:24 -07:00
danielgrippi
fe49579ff5
remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked)
...
i've submitted an issue to the gem. hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
2012-05-01 18:02:25 -07:00
Sean Tilley
d15c7267c2
Merge pull request #3206 from movilla/reshare-flash
...
Fix url "/logo_caps.png" mails [ci skip]
2012-04-30 14:21:43 -07:00
movilla
bdc479636f
Fix url "/logo_caps.png"
2012-04-30 18:29:26 +03:00
danielgrippi
c06e8b3329
track anonomous user segments via analytics (let's see how successful the beta channel features are)
2012-04-29 11:37:05 -07:00
danielgrippi
bbd4ee5738
correctly redirect for beta and admin users (profile vs stream homepages)
2012-04-28 15:09:02 -07:00
danielgrippi
193644b5c1
Revert "adding custom landing page for heroku" [ci skip]
...
This reverts commit 6f951ac678
2012-04-26 17:57:54 -07:00
Maxwell Salzberg
6f951ac678
adding custom landing page for heroku
2012-04-26 16:45:46 -07:00
danielgrippi
6d866fa49d
Revert "adding custom landing page for heroku"
...
This reverts commit 2c9d84607a
2012-04-26 15:08:07 -07:00
danielgrippi
2c9d84607a
adding custom landing page for heroku
2012-04-26 13:57:50 -07:00
movilla
cc329594c5
Add translation app/views/admins/user_search.html.haml - Admin Panel
2012-04-24 02:05:13 +02:00
Dennis Collinson
afc26c684b
DC MS infinite scroll with isotope on new profile page. boom!
2012-04-22 16:46:39 -07:00
Dennis Collinson
ca33070b9e
loader is background image of span
...
fix tests
2012-04-21 15:21:52 -07:00
danielgrippi
6d9dd1f4d3
skeleton in place.
2012-04-21 13:12:56 -07:00
Maxwell Salzberg
b4d50510f9
sorry aobut that [ci skip]
2012-04-20 10:40:22 -07:00
Movilla
7b203e3636
Better fix issue #3134
2012-04-20 16:07:31 +02:00
Maxwell Salzberg
5f839aa26f
include modernizer in the mobile group so it works
2012-04-20 00:00:23 -07:00
Maxwell Salzberg
56312a3148
fix mobile modernizer with asset pipeline
2012-04-19 22:45:34 -07:00
Maxwell Salzberg
bfbae50e5a
update a few things for the asset pipeline, and fix a couple of other mobile bugs
2012-04-19 21:52:44 -07:00
Maxwell Salzberg
a9b5df8dc5
Merge branch '3162-second-attempt' of https://github.com/wubwubwubcr3w/diaspora into wubwubwubcr3w-3162-second-attempt
2012-04-19 21:20:36 -07:00
Maxwell Salzberg
307ee15884
hella open graph tags
...
added some basic open graph tags to the posts#show page.
2012-04-19 17:40:13 -07:00
wubwubwubcr3w
ebd367c5a1
also readd mbp-respond.min.js
2012-04-19 22:00:15 +02:00
wubwubwubcr3w
70ba2651c3
second attempt on readding modernizr-custom.js
2012-04-19 20:37:42 +02:00
Maxwell Salzberg
c9e3852de8
oembed mostly works
2012-04-18 16:12:56 -07: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
Jordi Mallach
4d92653874
Fix typo in key name: seperated → separated.
2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d
Fix typo in key name: autorize → authorize.
2012-04-15 19:05:03 +02:00
Florian Staudacher
d9d7bbb74b
using timecop for interactions + whitespaces removed
2012-04-15 03:10:18 +02:00
Maxwell Salzberg
c4b36a179e
Merge pull request #3138 from stevenh512/bootstrap-sass
...
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00
Steven Hancock
acf823ff1b
bootstrap-sass fixes
...
* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
2012-04-13 17:37:38 -07:00
Jonne Haß
cac2b1e10b
lets just avoid no and yes as keys in YAML, too many issues. Thanks! [ci skip]
2012-04-11 22:06:33 +02:00
Steven Hancock
021cc99492
bootstrap-sass
...
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.
I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.
I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
2012-04-11 06:16:01 -07:00
Maxwell Salzberg
f6b6a67729
this file got renamed
2012-04-10 10:30:52 -07:00
Maxwell Salzberg
a70b057bf5
update resources in devise emails :(
2012-04-09 22:56:30 -07:00
Maxwell Salzberg
ff740f41f6
fix bookmarklet on mobile
2012-04-09 10:48:43 -07:00
Maxwell Salzberg
903f4cb9ac
Merge pull request #3124 from liamnic/master
...
Fix Bookmarklet By Adding application.css[ci skip]
2012-04-09 10:34:26 -07:00
Maxwell Salzberg
6642bd5554
Merge pull request #3121 from dmorley/patch-13
...
Update app/views/shared/_photo_area.mobile.haml[ci skip]
2012-04-09 10:32:26 -07:00
Maxwell Salzberg
0eb946497f
Merge pull request #3101 from despora/fallback_for_donation
...
added fallback for donation
2012-04-09 10:24:20 -07:00
Jonne Haß
e9a22ae41a
fix syntax error in authorizations/new.html.haml
2012-04-09 14:44:47 +02:00
movilla
6ded31a940
Add translation /authorizations fix image
2012-04-08 15:33:46 +02:00
Liam Nicholson
0cd2eb7b8d
Fix Bookmarklet By Adding application.css.
2012-04-08 09:31:40 +02:00
David Morley
c9431a6512
Update app/views/shared/_photo_area.mobile.haml
2012-04-07 15:28:35 -07:00
Jonne Haß
5866ebe638
using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip]
2012-04-05 03:14:02 +02:00
Lennart Prelle
c2195a3c22
new forms
2012-04-04 11:44:57 +02:00
Lennart Prelle
01ed9fc9d9
fallback to diaspora donation if no paypal-id is present
2012-04-04 11:44:06 +02:00
Maxwell Salzberg
bb5aa2821d
use the built in asset_sync initializer. add a rake task to bootstrap
...
heroku and asset sync, which puts the S3 config vars in from your app
config.
2012-04-03 14:47:33 -07:00
Jonne Haß
a5a6378eb0
translate 'mark unread' in notifications badge
2012-04-01 13:03:44 +02:00
Maxwell Salzberg
0e2bcf18d2
the logged out logo is now in the branding folder
2012-03-31 00:15:55 -04:00
Sean Tilley
19bf699b9f
Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory
2012-03-29 17:18:27 -05:00
Maxwell Salzberg
52c9d76a86
Merge pull request #3065 from diasp/2176-url-in-rss
...
Make URL clickable in RSS #2176
2012-03-29 12:18:36 -07:00
Maxwell Salzberg
79a09dbea6
Merge pull request #3069 from movilla/trad_mobile
...
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
2012-03-29 12:14:35 -07:00
movilla
af10497b6c
Add translation via mobile
2012-03-29 17:26:03 +03:00
Diaspora Europe
9fdca1adf8
make URL clickable in RSS #2176
2012-03-29 13:43:04 +02:00
Maxwell Salzberg
402694e516
fixing cukes
2012-03-28 14:47:28 -07:00
Maxwell Salzberg
5dbfd89d93
some more fixes for the show pages
2012-03-28 13:56:52 -07:00
Steven Hancock
f96fc5834f
Make the Mention button work with the asset pipeline
...
* Fix the javascript_include_tag in the status_messages/new view
* Precompile pubhlsiher.js and jquery.textchange.min.js
This fixes a 500 error that was being thrown when the Mention button
was clicked, due to the above two javascripts not being precompiled
and a javascript include that needed to be updated to load
jquery.textchange.js from the correct path.
2012-03-27 18:08:28 -07:00
Steven Hancock
e1607baff4
jquery_include_tag helper
...
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.
A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).
Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
2012-03-27 18:07:44 -07:00
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
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
movilla
3b66dd6e3f
small translations of mobile My Activity
2012-03-28 00:46:20 +02: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
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
Maxwell Salzberg
4006c1502e
Merge pull request #3013 from diasp/mobile-header
...
Mobile: added activity link to header
2012-03-23 11:05:01 -07:00
movilla
5bfafd549f
Add translation to app/views/admins/ correlations.haml
2012-03-22 21:46:20 +01:00
movilla
7cb577a24f
Add translations to /app/views/admins/_admin_bar.haml
2012-03-22 16:59:09 +01:00
movilla
bb2d474771
Add translation to "Mark unread"
2012-03-21 15:35:44 +01:00
movilla
f7a1b09639
Fixed translation missing back-to-top
2012-03-21 15:06:14 +01:00
Maxwell Salzberg
7b0c7ee4a0
make the invite flow not look totally terrible
2012-03-19 19:47:46 -07:00
Maxwell Salzberg
aee17798c1
rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form
2012-03-17 17:10:08 -07:00
Maxwell Salzberg
5868ff06f1
remove user inspect at the top of invites. Thx Blaine [ci skip]
2012-03-17 16:56:20 -07:00
Jonne Haß
7e7de439f8
fix untranslatable stuff from the invite refactor
2012-03-17 13:52:46 +01:00
Maxwell Salzberg
11505a386c
adding a test for decremented invites, as, and check the invite is valid in the controller
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b
fixed rspec tests, more fit and finish around how the invite code works,
...
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b
small updates, and it looks like we are mostly working
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Diaspora Europe
743e42c1e9
mobile: remove stream link from header
2012-03-16 08:38:45 +01:00
Diaspora Europe
cd62c33f17
mobile: added stream and activity links to header
2012-03-16 08:20:42 +01:00
Diaspora Europe
563e94b804
let date looks nice
2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7
mobile: added will paginate for bootstrap
2012-03-15 16:44:25 +01:00
Jonne Haß
0419ca0bb6
made change password explanations translatable [ci skip]
2012-03-15 15:22:20 +01:00
danielgrippi
5e75c6d675
fix jasmine around contact-list.js
2012-03-14 16:26:30 -07:00
Maxwell Salzberg
b8b6557379
adding an ajax loader, and pull out the js from the middle of the view
2012-03-13 17:10:23 -07:00
Maxwell Salzberg
2a30e60fe0
Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly
2012-03-13 16:41:16 -07:00
Maxwell Salzberg
8ac7a74f50
kinda gross hack to prevent mobile notifications from show up for unauthenticated users
2012-03-13 16:31:16 -07:00
Maxwell Salzberg
298327d2af
Merge pull request #2982 from diasp/2912-message-overflows
...
Handle many users in a message #2912[ci skip]
2012-03-13 15:58:18 -07:00
Maxwell Salzberg
dfd0248a78
Merge pull request #2991 from ChFernandez/master
...
Pod Administration[ci skip]
2012-03-13 15:47:57 -07:00
Maxwell Salzberg
78cbe0a1d3
Merge pull request #2997 from diasp/1994-mobile-notifications
...
Mobile notifications back again #1994 [ci skip]
2012-03-13 14:18:58 -07:00
Maxwell Salzberg
24f8447248
Merge pull request #2986 from diasp/improve-mobile
...
Nice more and comment buttons[ci skip]
2012-03-13 14:16:33 -07:00
Diaspora Europe
82c9ccfbe0
added read all button, hide count if zero
2012-03-13 17:55:48 +01:00
Diaspora Europe
c48e792c75
added notification badge
2012-03-13 17:27:40 +01:00
Diaspora Europe
f224cfe030
added link to notifications mobile view in header
2012-03-13 16:34:37 +01:00
Diaspora Europe
3c6175041d
mobile notifications back again #1994
2012-03-13 11:29:20 +01:00
Maxwell Salzberg
da6866c04c
Merge pull request #2994 from diasp/improve-reset-password
...
Improve reset password views
2012-03-12 18:13:52 -07:00
Diaspora Europe
bcc754b07c
reset password: added localized text, improved layout
2012-03-12 12:49:47 +01:00
Diaspora Europe
248492ad15
added reset password mobile views
2012-03-12 10:39:42 +01:00
Diaspora Europe
c98a728645
remove useless cancel button
2012-03-12 08:36:34 +01:00
Diaspora Europe
746e9c5cfc
nice more and comment buttons
2012-03-12 08:36:33 +01:00
chfernandez
b8ca31b6b3
improved weekly_user_stats in admin with a dropdown box by week to list all new users of that week also a link_to the user profile so the admin can sent welcome msgs, etc
2012-03-10 19:08:19 -08:00
Maxwell Salzberg
000f8d3b08
Revert "adding custom landing page for heroku"
...
This reverts commit 061badf74e
2012-03-09 17:44:45 -08:00
Maxwell Salzberg
061badf74e
adding custom landing page for heroku
2012-03-09 17:20:22 -08:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Diaspora Europe
07cc4f06f4
added localized text in comment view
2012-03-08 14:37:39 +01:00
Maxwell Salzberg
06f9e780e5
Merge pull request #2983 from diasp/improve-mobile-views
...
Improve mobile sign up and sign in view [ci skip]
2012-03-07 23:25:14 -08:00
Diaspora Europe
f26563c90c
added localized text in getting started view
2012-03-08 08:21:22 +01:00
Steven Fuchs
9de477cf5a
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
8344422aef
partial rename no longer needed
2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e
run second search ajaxily when no results are found from remote pod.
2012-03-07 23:19:50 -05:00
Diaspora Europe
92a857533e
improve mobile sign up and sign in view
2012-03-07 17:01:16 +01:00
Diaspora Europe
ecc86c1f86
handle many users in a message #2912
2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882
Merge pull request #2906 from Raven24/fix-2770
...
fix for #2770
2012-03-06 22:36:53 -08:00
danielgrippi
bdcbf5b985
responsive show pages [ci skip]
2012-03-06 15:19:05 -08:00
Joe Bivins
8df0bb85fe
Wrap the publisher params tag in a div instead of a paragraph.
...
Safari 4.1.3 cited the closing params tag as being an unmatched tag.
Changing the paragraph to a div causes the error to disappear.
2012-03-03 12:42:54 -05:00
danielgrippi
0112285985
Merge branch 'master' into profiles
...
Conflicts:
lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Maxwell Salzberg
c85e2a9b5d
Merge pull request #2935 from Raven24/host-meta
...
adapt host-meta document to RFC 6415
2012-02-25 17:11:06 -08:00
Maxwell Salzberg
a1f39398be
Merge pull request #2902 from JMSilla/master
...
Fix atom feed bug (bug mash 7) [ci skip]
2012-02-25 16:47:13 -08:00
Florian Staudacher
6a9a0e61f9
adapt host-meta document to RFC 6415
2012-02-25 16:56:34 +01:00
danielgrippi
dc0b5db0ac
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc
MS DC show last post and show page works unauthenticated
...
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
David Morley
33fada305c
put all the elements back on the page and make facebook inviter usable again
2012-02-24 20:46:27 -06:00
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
Maxwell Salzberg
0db2bd9e40
Merge pull request #2908 from diasporg/adminclean
...
clean up admin page [ci skip]
2012-02-24 10:44:52 -08:00
Florian Staudacher
663a5a0e7c
escape all passed params in js - fixes #2922
2012-02-24 14:15:08 +01:00
Dennis Collinson
9769dfb303
cukes passing
2012-02-23 17:24:19 -08:00
danielgrippi
846b14fac6
DG MS; you can comment from show pages. killer tofu.
2012-02-22 17:42:51 -08:00
danielgrippi
ebcde41e69
display original author if post is a reshare
2012-02-21 15:23:30 -08:00
danielgrippi
f31418feb3
pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now
2012-02-21 15:23:29 -08:00
danielgrippi
f83b82902c
markdownify text; better folder structure for photo-viewer templates
2012-02-21 15:23:29 -08:00
danielgrippi
3d1ac7ed55
added basic reshare attribution
2012-02-21 15:23:29 -08:00
danielgrippi
c0eeb7680b
pages wip
2012-02-21 15:23:28 -08:00
danielgrippi
7acbfe1b78
refactored some js to make sense of how we're going to attack the post show page with a js Page
2012-02-21 15:23:28 -08:00
danielgrippi
30de08b340
fix post presenter / arrow ordering
2012-02-21 15:23:28 -08:00
danielgrippi
ead286bf99
DG RY; moved actions to the bottom of the show pages; fixed arrows
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
25cf776059
the previous and next posts are now supplied in json of the presenter; give the template creator a default value
2012-02-21 15:23:28 -08:00
danielgrippi
cc0e04ea3f
DG MS; fix user controls
2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd
DG MS; post vitals on top left; user action placeholder on top right
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
a3e8ced6a1
haha more arrow controlz
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4
haxy auto comment functionality; try me and then revert me"
2012-02-21 15:23:27 -08:00
danielgrippi
c3c23209c3
more fiddling with box model; added arrows
2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7
DG MS; added a new layout for post pages.
2012-02-21 15:23:27 -08:00
danielgrippi
e3ebf05ac2
DG MS; new templates for post show pages.
2012-02-21 15:23:27 -08:00
David Morley
a63bcd0080
make popular tags human readable
2012-02-19 21:28:12 -06:00
David Morley
c41923081a
resque with header
2012-02-19 15:50:12 -06:00
David Morley
6e4844629a
admin cleanup
2012-02-19 15:29:07 -06:00
Florian Staudacher
7c73a526dd
fix for #2770
...
- apply the padding to the wrapper element, not to the textarea
apparently padding a textarea makes it shrink in firefox... ?
- don't use manual padding, instead specify max-height for images
extra-huge images are jolted, but they don't explode the layout
- closing handled by view,
gets rid of "Publisher.close is not a function" error msg
2012-02-19 21:14:12 +01:00
JMSilla
1fe15654c5
Fix problem with atom feed entry titles being too long
2012-02-18 16:18:54 +00:00
Maxwell Salzberg
063912287c
use the user presenter, luke
2012-02-16 13:19:14 -08:00
danielgrippi
62c0ad13b7
DG MS; move logic out of layout into LayoutsHelper.
2012-02-15 18:38:36 -08:00
Daniel Grippi
10c5757193
Merge pull request #2891 from Raven24/bookmarklet-oops
...
bookmarklet - publisher needs a little more js...
2012-02-14 12:33:32 -08:00
Florian Staudacher
a03a57efb7
publisher needs a little more js...
2012-02-14 21:28:37 +01:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
Florian Staudacher
4263797099
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-14 18:57:30 +01:00
Daniel Grippi
1638f32042
Merge pull request #2841 from Raven24/bookmarklet-specs
...
intentionally failing specs - dirty input breaks bookmarklet (+fix)
2012-02-13 21:14:56 -08:00
danielgrippi
b27961b38a
change language around explore/participate.
2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e119377dd30f4d06ccb9ba9
2012-02-13 19:13:43 -08:00
Maxwell Salzberg
5f4ebc94bb
small typo [ci skip]
2012-02-13 17:06:55 -08:00
Maxwell Salzberg
ef40350bae
fix authorizations page css to use media box
2012-02-13 17:06:18 -08:00
danielgrippi
ecdbd1bb26
remove joindiaspora specific home page from repo [ci skip]
2012-02-10 15:45:48 -08:00
danielgrippi
3c7ebe3200
forgot to save a template [ci skip]
2012-02-10 15:24:47 -08:00
danielgrippi
3e4d2fe7e8
adding custom landing page for heroku
2012-02-10 15:20:15 -08:00
danielgrippi
ed3d5c429a
fix a bunch of small css related media box issues [ci skip]
2012-02-10 15:18:27 -08:00
danielgrippi
e6e49bbf1f
stubbornella media and img dom structure FTW! major css deletion <3
2012-02-09 14:29:01 -08:00
danielgrippi
398ca3d97b
Participate / Explore have been upgraded to top-level status.
2012-02-09 14:29:01 -08:00
Florian Staudacher
9fcc2a4ffa
make previously added specs green
2012-02-09 01:01:28 +01: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
danielgrippi
bf5538d035
convert header template from underscore to handlebars [ci skip]
2012-01-23 00:40:19 -08:00
danielgrippi
0a670ccf8a
convert comment underscore template to a handlebars template.
2012-01-22 23:37:13 -08:00
danielgrippi
3a76490640
window.app.user() doesn't return attributes nested in a key; added a comment_view spec
2012-01-22 23:37:13 -08:00
danielgrippi
778683f3e3
don't extend helpers in the notifications index view; make notification_count and unread_message_count controller helper methods (now that we're not using vanna)
2012-01-22 22:26:27 -08:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
danielgrippi
9510e1ca6f
i mustache you a question, but i'll shave it for you later.
2012-01-22 22:01:57 -08:00
danielgrippi
5d15c53f6b
Revert "Revert "now using handlebars for client side templates" for now"
...
This reverts commit 5f9c469b12
2012-01-22 22:01:57 -08:00
Sarah Mei
5bd929b697
Remove references to GetSatisfaction
2012-01-22 20:46:13 -08:00
Dennis Collinson
5f9c469b12
Revert "now using handlebars for client side templates" for now
...
This reverts commit 4692055d8a
2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a
now using handlebars for client side templates
2012-01-22 16:59:44 -08:00
Steven Fuchs
e882dedd33
remove vanna controller from app, adjust scripts, specs, views and controllers to work.
2012-01-22 17:39:35 -05:00
Florian Staudacher
729f815736
checkbox labels should now be where they're supposed to (they were color:#CCC before, I left them #222 for now)
...
also labels are font-weight:normal and a little smaller since they seemed very dominant compared to the input fields (if not desireable, just remove font-size:.96em)
are there any more inputs I don't (yet) know about...?
2012-01-22 15:18:11 +01:00
Florian Staudacher
363ca8c07e
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-22 14:42:45 +01:00
Jonne Haß
c8e09bf325
localize back to top [ci skip]
2012-01-22 13:54:31 +01:00
Maxwell Salzberg
50e8e90066
add basic nsfw for mobile. fixes #2709
2012-01-22 01:56:16 -08:00
danielgrippi
cc1ac843cc
re-added widget; fixed tests; use _.throttle instead of depricated custom debounce
2012-01-21 20:23:00 -08:00
danielgrippi
7ef70b9090
collapse reshare text [ci skip]
2012-01-21 19:02:58 -08:00
danielgrippi
c3b9bb9a9a
expanding likes works again
2012-01-21 18:55:07 -08:00
danielgrippi
8b4f0473a7
mobile header gradient reflects the desktop gradient; added background texture to mobile
2012-01-21 15:19:06 -08:00
Steven Fuchs
9836860ca3
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
2012-01-20 12:23:45 -05:00
danielgrippi
c219cee97d
fix inf scroll issues in stream view
2012-01-19 17:01:45 -08:00
Maxwell Salzberg
aa449f3a2d
a couple of additions to the branch
2012-01-19 13:33:05 +01:00
Florian Staudacher
ad5a17776f
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-19 13:29:35 +01:00
danielgrippi
c82ac5f3e2
fix collapsing of posts [ci skip]
2012-01-18 12:40:33 -08:00
Maxwell Salzberg
b09e76a0ce
introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger
2012-01-17 17:34:42 -08:00
Steven Fuchs
aae5fe04ce
css for marking as unread, and hook for notification page to be part of it when called.
2012-01-17 19:21:25 -05:00
Florian Staudacher
81ae0c644c
start using new placeholders on login page
2012-01-18 01:17:20 +01:00
danielgrippi
339c47d782
moved stream logic into its own controller (StreamsController)
2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c
move all stream actions into PostController
2012-01-17 15:53:06 -08:00
Dennis Schubert
e0a63e624f
Fix my quick fix (use '.present?' instead of 'not .nil?')
2012-01-17 21:25:21 +01:00
Dennis Schubert
57697dea28
Quick fix: Fix 500 on /conversations when a author is missing. This is a temporary fix, see #2682
2012-01-17 21:10:45 +01:00
Maxwell Salzberg
5d01904231
fix bookmarklet. fixes #2605
2012-01-16 14:36:21 -08:00
danielgrippi
177f608276
fix oembed issues in backbone land
2012-01-15 15:56:34 -08:00
danielgrippi
91e3f5f6ff
remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models
2012-01-14 15:40:43 -08:00
Maxwell Salzberg
ca7632776f
prevent mobile comments from 500ing
2012-01-14 11:52:24 -08:00
Tray Torrance
ca07f5b9a3
Close #2606 and address other FF 3.x deficiencies.
2012-01-13 21:46:37 -08:00
Jonne Haß
e1edef9ff1
lets see how all this markdown in the title looks. Attempt to fix #2395
2012-01-13 22:09:22 +01:00
Dennis Collinson
adc0a0b244
don't display iteration of templates
2012-01-12 20:44:55 -08:00
Dennis Collinson
9b8afba9cf
metaprogram template addition
2012-01-12 19:41:39 -08:00
Dennis Collinson
dec3006b50
DH DC don't render feedback view on public posts
2012-01-12 17:47:03 -08:00
Maxwell Salzberg
2757cbb149
fix ssl problem with donate link
2012-01-12 14:49:54 -08:00
danielgrippi
1efce2cede
Revert "Merge pull request #2547 from stwf/unread_notifications"
...
This reverts commit c61e84bc50b88899ff2a
2012-01-11 12:11:00 -08:00
danielgrippi
bee8aa8bcd
remove unused files/methods
2012-01-11 02:26:12 -08:00
danielgrippi
0e5bb81d66
remove all references to the websocket. bang bang.
2012-01-10 12:28:19 -08:00
Daniel Grippi
c61e84bc50
Merge pull request #2547 from stwf/unread_notifications
...
Allow users to click on read notifications to mark them as unread
2012-01-10 10:46:26 -08:00
Ricky Elrod
4556323bda
Add the project name to the title of the Devise login page, so that
...
applications that require a unique name in the window title (like
KeePassX) can use auto fill, etc.
2012-01-10 11:23:13 -05:00
danielgrippi
779de03111
added alpha mark to asterisk in the header
2012-01-09 16:43:24 -08:00
danielgrippi
c11fdb0459
put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]
2012-01-08 23:43:17 -08:00
danielgrippi
f09da04c8a
add tooltips to stream faces [ci skip]
2012-01-08 17:43:58 -08:00
danielgrippi
c6f11f691d
don't block tiff extensions in our out-of-date js uploader [ci skip]
2012-01-08 17:23:04 -08:00
danielgrippi
665517abfc
use app.router.navagate for nav elements that don't expand (i.e. aspects, tags)
2012-01-08 14:41:43 -08:00
Sarah Mei
e0f8959647
Remove stray console.log. Not skipping CI because I think this may be causing the cucumber failures.
2012-01-08 03:24:11 -08:00
danielgrippi
07d81e0a85
added spinner keyframes to moz
2012-01-07 20:59:37 -08:00
danielgrippi
70737ddc9d
Revert "reference the root o_embed_cache on reshares"
...
This reverts commit 7020194a57
2012-01-07 20:27:06 -08:00
danielgrippi
7020194a57
reference the root o_embed_cache on reshares
2012-01-07 20:24:13 -08:00
danielgrippi
d5a4f9eb98
use content_view for comments (markdown, tagging)
2012-01-07 20:19:47 -08:00
danielgrippi
e928cc805a
fixed markdown issues with reshares; removed puts from specs
2012-01-07 17:33:16 -08:00
danielgrippi
687eb7ba0b
double check on photos
2012-01-07 15:48:40 -08:00
danielgrippi
d2807b5202
markdown for posts on front end, tags broken
2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776
fix all cukes but the tags feature [ci skip]
2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c
remove unusued javascript files; GC clearing from application/vanna controller
2012-01-07 14:24:27 -08:00
danielgrippi
3f7144f214
added hide post feature back to stream
2012-01-07 14:23:28 -08:00
danielgrippi
ae5fb67f71
long text truncation
2012-01-07 14:23:28 -08:00
danielgrippi
f72edbc039
added notification and unread mesasge count back to the header
2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c
added translations to templates; mock out the locale file in jasmine
2012-01-07 14:23:28 -08:00
Dennis Collinson
d5e9c5eebc
DG DC add stream faces to page party
2012-01-07 14:23:28 -08:00
Dennis Collinson
7ccc81b0a4
fix conversations cuke
2012-01-07 14:23:28 -08:00
Dennis Collinson
b582f45452
green jasmine, yo
2012-01-07 14:23:28 -08:00
danielgrippi
5e28c8f6ec
fix backing out of photo-only post cuke
2012-01-07 14:23:27 -08:00
danielgrippi
dbfb18e249
display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber
2012-01-07 14:23:27 -08:00
danielgrippi
dd85521701
fix header styling when not signed in; remove ilya's static page
2012-01-07 14:23:27 -08:00
danielgrippi
31fac53969
added blocks js model; load app.models.Post before any other model when loading assets
2012-01-07 14:23:27 -08:00
danielgrippi
85b5974fa9
removed top-level element delcarations from app templates
2012-01-07 14:23:27 -08:00
danielgrippi
64a90a30ef
only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream
2012-01-07 14:23:27 -08:00
danielgrippi
f804db36b8
DG DH; fix most of the cukes (7 failures left)
2012-01-07 14:23:26 -08:00
danielgrippi
1804b19ccc
DG DH; dry-d up appending/prepending posts to the stream's collection
2012-01-07 14:23:26 -08:00
danielgrippi
565a0b21f7
fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off)
2012-01-07 14:23:26 -08:00
danielgrippi
42276a73c8
remove old stream initialization from js pages; remove websocket js code
...
from the layout; rename templates to have a .jst extension
(JavaScriptTemplate?)
2012-01-07 14:23:26 -08:00
danielgrippi
3268726a9a
added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh)
2012-01-07 14:23:26 -08:00
danielgrippi
4fabbe93a5
fix ResharesController / StatusMessage controller spec; remove another js response
2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68
modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine
2012-01-07 14:23:26 -08:00
danielgrippi
0a4b4fb344
remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher
2012-01-07 14:23:26 -08:00
danielgrippi
02ca7a32f0
added reshare logic back (doesn't append it to the stream...)
2012-01-07 14:23:25 -08:00
danielgrippi
027bb3dee7
removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view
2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03
created publisher view; wip
2012-01-07 14:23:25 -08:00
danielgrippi
b120faa4f9
took some functions out of stream-element widget; refactored Header view; refactored tooltip logic in Post view
2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22
downcase namespacing of app
2012-01-07 14:23:25 -08:00
danielgrippi
fe4530f86b
fixed 500 on notifications#index
2012-01-07 14:23:25 -08:00
danielgrippi
52183b8cc4
fix name in header; 27 failures
2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879
fixed 14 cukes (all comments features)
2012-01-07 14:23:25 -08:00
Dennis Collinson
f5609f2182
App views base renders subviews like magic
2012-01-07 14:23:24 -08:00
danielgrippi
31d24c60c7
added spec for .like_action link being rendered; added comments div back to stream_element for now
2012-01-07 14:23:24 -08:00
danielgrippi
7f51bc02ef
grey left nav
2012-01-07 14:23:24 -08:00
danielgrippi
1b8f78e006
remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway
2012-01-07 14:23:24 -08:00
danielgrippi
828624f392
slightly fade in stream elements; made a better spinner for the stream (css3)
2012-01-07 14:23:24 -08:00
danielgrippi
193e5d61c5
adding some texture to the header to distinguish the branch
2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465
DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green
2012-01-07 14:23:24 -08:00
danielgrippi
67e56dce2c
backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget
2012-01-07 14:23:23 -08:00
danielgrippi
841cc29d25
add api block to photo; photos display in stream
2012-01-07 14:23:23 -08:00
danielgrippi
6911ed5d7d
expand comments working
2012-01-07 14:23:23 -08:00
danielgrippi
b94b5240a8
added block user functionality to the stream
2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d
remove js resposne for likes, do it in backbone with json responses instead
2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f
added api response for likes; cleaned up view logic; specify like collection url from parent model (Post)
2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb
don't use Diaspora widget system or stream.js when backbone is active;
...
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
2012-01-07 14:23:22 -08:00
danielgrippi
cd1d25dc30
remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts)
2012-01-07 14:23:22 -08:00
danielgrippi
dc82316f13
bind Twipsy in stream_element_view.js
2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977
comment and post deletion now works on the backbone stream
2012-01-07 14:23:22 -08:00
danielgrippi
46b1567622
added loader gif when 'more' is clicked in stream; fixed nsfw positioning
2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85
added more jasmine spec; NSFW wip
2012-01-07 14:23:22 -08:00
danielgrippi
cec2d27204
ported likes logic for the stream over from old branch
2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e
reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again
2012-01-07 14:23:22 -08:00
danielgrippi
414fb8d454
corrected template views; status message now includes oembed; updated post.rb api to supply oembed and object_url
2012-01-07 14:23:21 -08:00
danielgrippi
e6d4ec2dc8
added as::photo view
2012-01-07 14:23:21 -08:00
danielgrippi
34e3403e2e
jasmine green again; template switching in place, defaulting to displaying post text
2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe
make jasmine view tests work, load templates, party
2012-01-07 14:23:21 -08:00
danielgrippi
4883c70ae2
move templates into app/views/templates/_templates.haml
2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240
DC DG; test stream view WIP
2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e
DH DG; create comments via backbone
2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581
introduce comments
2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014
Use routers, remove some hacks
2012-01-07 14:23:21 -08:00
Daniel Grippi
dca3581ae2
added likes to the stream element underscore partial
2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591
add current user to body tag data field (hackity hack). add comment links to posts
2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad
serialize current user json into body tag for now
2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0
DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now).
2012-01-07 14:23:20 -08:00
danielgrippi
aa7343d759
add profile streams to backbone. this breaks hovercards, atm.
2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b
backbone all the streams, besides user. don't use the acts_as_api way for now.
2012-01-07 14:23:20 -08:00
danielgrippi
91ba6447d0
add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip
2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773
DG DH; pagination on backbone stream
2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11
DG DH; backbone stream now sort-of renders on multis_controller; wip
2012-01-07 14:23:20 -08:00
Maxwell Salzberg
91c21f5d92
MS SM; removed seemingly unused(?) layout file
2012-01-07 12:56:32 -08:00
Maxwell Salzberg
2422bdab46
MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes
2012-01-07 12:55:46 -08:00
Maxwell Salzberg
523a960d94
peace troll
2012-01-05 18:53:27 -08:00
Maxwell Salzberg
d9c2b0d4b5
make cdn jquery http/s agnostic
2012-01-04 23:57:28 -08:00
Maxwell Salzberg
fdea2f94ff
remove icky analytics code from layouts, move to middleware
2012-01-04 23:54:48 -08:00
Maxwell Salzberg
7cc6e3ed68
uncomment cdn line.. whoops
2012-01-04 22:19:37 -08:00
Jonne Haß
52c75a7ad4
Revert "Revert "auto follow back feature""
...
This reverts commit 6408105917
2012-01-04 13:49:56 +01:00
Maxwell Salzberg
34e4c027d0
small typo
2012-01-03 22:47:10 -08:00
Maxwell Salzberg
4e574c3fef
fixed loading jquery from the CDN, and the fallback to the local copy still works
2012-01-03 20:02:52 -08:00
Maxwell Salzberg
63cdd93afc
the websocket has been completely removed, and replaced for a stub until
...
we find a better way to reimpliment it in a more sane way
2012-01-03 18:39:54 -08:00
danielgrippi
6ab03d33b4
hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions)
2011-12-30 23:51:13 -05:00
Steven Fuchs
a7af886da2
add 'read' class ro read messages to match the 'unread' class associated with unread messages. This will keep us from attaching jquery functionality to notification types we may not know about.
2011-12-22 15:53:14 -05:00
danielgrippi
0f42c98a7b
merge Pistos's reshare branch into master
2011-12-20 14:42:18 -08:00
Pistos
f83e56e5f3
Added a counter cache for the number of reshares of a post.
2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c
Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary.
2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44
Always show "Reshare original" for link. Show number of reshares in the post_initial_info div.
...
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared. Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares". Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
2011-12-19 17:12:17 -05:00
Lennart Prelle
20a39714bf
added translation for close account
2011-12-15 15:35:30 +01:00
Jonne Hass
05be43e21a
fix #2504
2011-12-10 12:44:55 +01:00
Maxwell Salzberg
8f8769aab5
basic NSFW filtering for authors who say their post is nsfw
2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64
translated close account
2011-12-08 16:32:20 -08:00
danielgrippi
342593988b
MS DG; fixed close account cukes
2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5
basic page for deleting account with temporary text and cute cat picture
2011-12-08 16:32:20 -08:00
Maxwell Salzberg
2282fd35d1
kill no longer used youtube titles code with fire
2011-12-08 16:16:57 -08:00
Jonne Hass
a892ea41eb
refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471
2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f
Include "Looking For #link" under params[:q] blank else branch
2011-12-03 21:23:39 -02:00
Daniel Grippi
71354a1673
Merge pull request #2469 from geckoxx/comment_stream_new
...
better commented_posts_stream
2011-12-02 10:42:36 -08:00
Johannes Hackel
4b25545e82
fix sql error
2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c
change upload photo alt text
2011-12-01 10:22:35 +04:00
Pistos
aa0aaa2f92
Revert "Merge pull request #2428 from geckoxx/comment_stream"
...
This reverts commit 8a2756827331ef2d60f7
2011-11-30 22:22:32 -05:00
Johannes Hackel
23fa7a0a3e
like stream new
2011-11-29 17:27:09 +01:00
Daniel Grippi
161d9d527c
Merge pull request #2270 from fermionic/allow-photo-views-in-mobile
...
re-enable photo viewing on mobile
2011-11-28 11:03:13 -08:00
Daniel Grippi
a4027f3d22
Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2
...
Issue #2284 : simple fix
2011-11-28 09:32:41 -08:00
