nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13731 commits 4 branches 0 tags 121 MiB
Commit graph

6716 commits

Author SHA1 Message Date
movilla
33ecc50fbc Mobile buttons are only clickable when scrolled to the top 2013-04-05 19:16:15 +02:00
embs
4ef37c64be Add explanation to services index page. Closes #3064 2013-04-04 15:51:11 -03:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Steffen van Bergerem
a693a0970b added hotkeys to navigate in stream 2013-04-02 19:24:20 +02:00
Bruno Machado
29af94ce4e Remove unnecessary dotted CSS borders. Closes #2940 2013-04-01 15:53:27 -03:00
Jonne Haß
704113f896 replace remaining Postzord::Dispatcher.build(self, profile).post with call to the new method 2013-03-31 16:52:18 +02:00
movilla
8375433788 * Remove unnecessary navigation bar to access mobile site 
* Re-add flash warning to registrations mobile
* Remove excess :css
* Fix littles css errors
 2013-03-30 23:09:45 +01:00
Tom Scott
cdc4e869d1 Merge pull request #3841 from tubbo/fix-close-buttons 
Align close button images

Sorry this took so long to merge in guys, I had this weird feeling that I had already done so. Looks like the 'X' button is coming after the custom popover HTML so this looks OK to merge in.
 2013-03-30 06:29:19 -07:00
Tom Scott
8a7f6c9fdf Merge pull request #4067 from movilla/multiphoto 
Add multiphoto for mobile post. Close #4053
 2013-03-30 06:26:07 -07:00
Tom Scott
af8485f47f Merge pull request #4074 from L3MNcakes/feature/3975-send-profile-update 
Issue #3976: Send a profile update alongside a sharing notification
 2013-03-30 06:07:16 -07:00
movilla
b257939f7e Add multiphoto for mobile post 2013-03-30 10:59:06 +01:00
Juan Manuel Azambuja
c10aefb30f Fix email icon on right section 2013-03-28 11:16:18 -03:00
Juan Manuel Azambuja
d68aac88f8 Add inline-block directive to social_media_icons on publisher 2013-03-28 10:52:10 -03:00
Marcelo Casiraghi
b0f76f1764 Fix confirmation at getting_started page 2013-03-25 23:09:38 -03:00
L3MNcakes
8eed16c245 Issue #3976: Send a profile update alongside a sharing notification 
Issue #3976: Send a profile update alongside a sharing notification
 2013-03-24 06:04:47 +00:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
3fc3b249e7 End the require mess 
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
 2013-03-21 23:37:53 +01:00
Jonne Haß
1a58f9cf29 Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop 
Conflicts:
	Changelog.md
 2013-03-18 20:59:39 +01:00
movilla
bf2bd5a97c Hide comment button in the mobile view when not signed in 2013-03-18 20:15:55 +01:00
movilla
3990bebcf4 Fix mobile view of deleted reshares 2013-03-18 16:52:37 +01:00
Jonne Haß
e51443b3ef Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views 
delete unused javascript views
 2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja
06dc53749a delete unused javascript views 2013-03-15 14:39:34 -03:00
Jonne Haß
8f6ae75423 Merge pull request #4039 from marpo60/diaspora_with_sprites 
Add Sprites to Diaspora!
 2013-03-15 09:44:27 -07:00
Fabián Rodríguez
0a3e242e79 fix reshares in single post-view 2013-03-11 22:45:25 -03:00
Juan Manuel Azambuja
2556f08b89 [Sprites] update sprites after develop merge 2013-03-11 20:16:16 -03:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
8686cb4fcb [Sprites] social media logos sprite usage 2013-03-11 19:27:35 -03:00
Juan Manuel Azambuja
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Florian Staudacher
0de68fb713 Merge pull request #4029 from MrZYX/4027-unicode-tags 
decode tag name before passing it into TagFollowingAction
 2013-03-11 05:51:54 -07:00
Jonne Haß
1761fc35a7 Merge pull request #4031 from movilla/test_mobile 
Add some tests for mobile page
 2013-03-10 09:14:06 -07:00
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
 2013-03-10 15:02:18 +01:00
Jason Robinson
affa713616 If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706 2013-03-10 08:15:12 +02:00
Jonne Haß
3c29007c39 Merge pull request #4051 from Flaburgan/clean-delete-validation 
Remove duplicate sentence from delete account confirmation pop up
 2013-03-09 05:50:19 -08:00
Flaburgan
98da6a3978 Remove duplicate sentence from delete account confirmation pop up 2013-03-09 14:15:11 +01:00
Jonne Haß
60bd29aa68 decode tag name before passing it into TagFollowingAction, fixes #4027 2013-03-08 13:47:55 +01:00
Florian Staudacher
f8513c2005 Merge pull request #3944 from MrZYX/modular_layouts 
Modular layouts
 2013-03-08 02:50:43 -08:00
embs
e7daa978e3 Show timestamp when hovering on comment time-ago string. Closes #4042 2013-03-08 00:33:19 -03:00
pestrada
18aeeb052b reset comment box height after posting a comment 
refactor create comment method
 2013-03-07 12:55:03 -06:00
Jonne Haß
55cb070ac9 add header to sign up page 2013-03-06 19:01:07 +01:00
Jonne Haß
ffc6c1102e dry up and modularize layouts 2013-03-06 19:00:34 +01:00
Marcelo Dominguez
88e76448b6 Avoid unnecessarily redirect 2013-03-03 23:10:53 -02:00
Marcelo Dominguez
e2ad0cbb81 Remove whitespaces 2013-03-03 23:10:31 -02:00
Jonne Haß
ad16451e1f Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout 
fade long tag names - refs diaspora/diaspora#3899
 2013-03-02 12:20:15 -08:00
aaronf
cd78aa5a65 fade long tag names - refs diaspora/diaspora#3899 2013-03-02 13:57:30 -06:00
Jonne Haß
ccedb6eff0 delegate parent_author to the target of a RelayableRetraction 2013-02-28 17:01:58 +01:00
Jonne Haß
df1abefc1c Merge pull request #4015 from movilla/upload_photo_1 
Fix css and js error with upload photo mobile
 2013-02-27 17:11:04 -08:00
movilla
9b2d3c66bf fix css and js error with upload photo mobile 2013-02-28 01:09:40 +01:00
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
pestrada
3f3409a0a5 avoid posting empty comments 
fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
 2013-02-25 18:27:46 -06:00
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +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
Jonne Haß
1f4787aa6d Merge pull request #3980 from L3MNcakes/feature/facebook_delete 
Feature/facebook delete
 2013-02-18 11:17:51 -08:00
L3MNcakes
1120cba5f0 Issue #3939: Posts to Facebook do not delete 2013-02-18 18:21:59 +00:00
Jonne Haß
35ba082ab5 Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop 
Conflicts:
	Changelog.md
 2013-02-17 15:48:34 +01:00
Jonne Haß
40b10dc0d9 Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop 
Conflicts:
	Changelog.md
 2013-02-17 15:47:20 +01:00
Jonne Haß
4264804343 Merge pull request #3984 from movilla/frienliar_new_conversation 
Friendlier new conversation mobile
 2013-02-17 06:44:59 -08: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
movilla
ce76f12591 friendlier new-conversation mobile 2013-02-16 22:53:43 +01:00
movilla
dfcc8e7c80 Overflow info_author mobile web 2013-02-16 14:51:51 +01:00
movilla
4d6110246e Overflow name author mobile post 2013-02-15 17:44:54 +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
movilla
4343914cdb Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post 2013-02-04 21:31:48 +01:00
Ruxton
60f5173c77 Spec coverage for changelog_url and adjustment to behaviour 2013-02-04 11:00:57 +08: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
Jonne Haß
865152be90 Merge pull request #3949 from movilla/gettins_started 
Add Getting_Started page mobile. Close #3854
 2013-02-02 08:00:16 -08:00
movilla
27813ec5dd Excessive padding with select aspect in mobile publisher 2013-02-02 16:41:14 +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
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice 
Issue #3672: Reshare alert box is appearing twice
 2013-01-31 11:13:13 -08:00
Jonne Haß
1aa8b6e9f2 do not display the publisher on the profile photos page 2013-01-31 19:25:30 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03: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
8b4aab0780 change #count to #size in notifications_helper to reduce queries 2013-01-29 10:01:09 -02:00
Fabián Rodríguez
d4d3bf8af6 fix translation in contacts_helper 2013-01-29 10:01:08 -02:00
Fabián Rodríguez
649844ea6a Refactor contacts/index 2013-01-29 10:01:08 -02:00
Fabián Rodríguez
4fa04e88ac don't join the tags table here, it makes the query slower 2013-01-28 18:57:26 -02:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Jonne Haß
6653684f64 Merge pull request #3920 from asphxia/3906-left-side-panel-ui-changes 
Side panel ui changes
 2013-01-27 08:24:47 -08:00
Ivan K
549aa29cf1 fix #2339: set unicode-bidi property to prevent username to overlay the pubdate 2013-01-27 18:49:42 +06:00
Asphyxia
6ee921235e Side panel ui changes 2013-01-27 08:04:33 -03:00
Jonne Haß
946121f672 Merge pull request #3827 from diasp/feature/1338-links-sidebar 
Show links in sidebar #1338
 2013-01-26 04:09:22 -08:00
Diaspora Europe
6d4e577676 show links in sidebar #1338 2013-01-26 11:59:15 +01:00
Diaspora Europe
e8d86f09bb resize full scaled image to a specific width #3793 2013-01-26 11:36:01 +01:00
movilla
5d3e9f5c3d Excesive padding with "user-controls" in single post view 2013-01-25 17:34:23 +01:00
Jonne Haß
cb640b91b3 Merge pull request #3880 from Ruxton/feature/oembed_providers 
Oembed Update - Added instagram, better display for rich/photo
 2013-01-25 07:50:24 -08:00
Jonne Haß
ed2258a294 Merge pull request #3849 from asphxia/feature/3806-overflow-comment-textarea 
Issue #3806: Overflow comment textarea
 2013-01-25 03:24:34 -08:00
malavbhavsar
4629afb1f5 Fix services index view. 2013-01-24 23:00:53 -05:00
Asphyxia
f2c67b0d8a Overflow comment textarea 2013-01-24 22:52:14 -03:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Asphyxia
7f34c7af7a Issue #3874: Distorted profile thumbnail 2013-01-21 22:43:48 -03:00
Asphyxia
1af0f4bf2d Issue #3828: Unify hide and ignore options 2013-01-18 16:08:02 -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
Asphyxia
284c40b4da Issue #3840: Fix extra blank on streams 2013-01-18 15:25:01 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
0f499e7c2e make publisher work with backbone 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
ed4020b9b3 Update stream's title and publisher's dropdown on aspect selection 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
8d202e481b fix aspect's select_all deselect_all 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
53ba55c9ca adds stream_aspect class 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
3f314cc7bb remove streams-aspects 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
f978a75b8c bootstrap my_aspects data 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
e9031a7bf3 add toSentence support in aspects 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
30a2f0bc33 remove aspect-navigation.js 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
a3162d76dd little refactor in streams_controller 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
2eba28266b remove server side rendering of aspects 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
4a07602ad3 add aspects route to backbone router 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
572e6b5639 render aspects client side 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
62fc9880f9 add aspects_list handlebar template 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
00ef2ce1c0 add aspect\'s handlebar template 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
28b3acf36e add aspects_list_view 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
a9d93beca8 Add aspect_view 2013-01-16 19:33:18 -02:00
Fabián Rodríguez
ae1317dbc0 Add Aspect model and collection to backbone 2013-01-16 19:33:18 -02:00
Diaspora Europe
ac3b2bc99f pod version in footer and updated link to changelog #3705 2013-01-15 16:45:10 +01:00
Tom Scott
51db25e333 Fix .close img looking off-center. 2013-01-13 23:47:15 -05:00
Tom Scott
e5d027e29e Merge pull request #3839 from asphxia/feature/3837-hovercard-causes-horizontal-scrollbar 
Hovercard no longer causes horizontal scrollbar to appear. Fixes #3837.
 2013-01-13 20:41:32 -08:00
Asphyxia
bcc11b3c41 Issue #3837: Hovercard causes horizontal scrollbar to appear 2013-01-14 00:04:36 -03:00
Tom Scott
575e314cc4 Merge pull request #3834 from asphxia/3833-popups-overlap-header 
Fix popovers overlapping the header topbar on scroll.
 2013-01-12 07:50:45 -08:00
Asphyxia
df8f46b5af fix .popover overlapping header 2013-01-12 10:51:31 -03:00
Asphyxia
cd6bd0e28f fix after sign-up popups overlaping header 2013-01-12 07:41:16 -03:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Jonne Haß
beb32ce91f hovercards everywhere (comments, likes, top left sidebar stream summary thingy...) 
Say a word if you think it's getting too much...
 2013-01-01 22:59:12 +01:00
Jonne Haß
fde28e9bea display hovercards in reshares and on the linked name 2012-12-30 15:17:48 +01:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +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
Florian Staudacher
2c7f2d6fbb Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment 
[ci skip]
Conflicts:
	Changelog.md
 2012-12-07 17:47:19 +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
Flaburgan
aee6068412 Resize deletelabel and ignoreuser images to align them 2012-12-02 13:20:24 +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ß
bf698f3882 Do not strip "markdown" in links when posting to services, fix #3765 2012-11-26 14:16:43 +01:00
David McMullin
0873ae9ab7 improve behaviour of deselect all 2012-11-25 17:38:19 +00:00
David McMullin
f6b32fd13a rename the JS so the magic can return 2012-11-25 17:38:19 +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ß
c59bb35087 Merge pull request #3754 from marpo60/housekeeping 
Housekeeping2
 2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor 
Housekeeping
 2012-11-22 01:06:05 -08:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
Fabián Rodríguez
232539cdf9 remove unused helpers 2012-11-21 18:26:17 -02:00
Sean Tilley
a5050273ca Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications 
Fix notifications for private messages between local users, fixes #2321
 2012-11-19 13:48:17 -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
Jason Robinson
6cf6f1dd7d Fix notifications for private messages between local users, fixes #2321 2012-11-11 23:35:19 +02:00
movilla
764aa579cd fix css error with intivation people block in search results 2012-11-11 15:38:03 +01:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
Jason Robinson
48a332f871 Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts. 2012-11-09 00:04:49 +02:00
Sean Tilley
7dfa6299ec Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream 
Conflicts:
	Changelog.md
 2012-11-07 21:04:52 -06:00
Braulio Martinez
36c7c00550 Remove unused posts#new action from Backbone 2012-11-07 23:15:38 -02: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
4056c0da9e remove unused method #can_add? 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
76c48f3c9c privatize non-action controller method 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
3d061d92c6 remove unused templates 2012-11-06 21:39:35 -02:00
Fabián Rodríguez
48bb6ad25c remove old experimental leftovers 2012-11-06 21:39:35 -02:00
Fabián Rodríguez
1d1b66f8cc remove unused helper 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
movilla
5a2b22ff0c reshares_count come back! 2012-11-06 21:05:48 +01: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
Jonne Haß
cc7f5d9626 Merge pull request #3708 from movilla/invitacion_search 
Fix Invite link box shows on search results page even if invites have been turden off - Fix #3707
 2012-11-06 08:58:24 -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
7fafabdb60 Only include url to post for twitter when post exceeds maximum length or contains photos 2012-11-03 23:25:19 +02:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02: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
e943a1cab6 Fix overflow button in mobile reset password 2012-10-31 23:31:24 +01: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
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here. 
Also, add some specs and add it to the changelog.
 2012-10-24 00:27:45 +02:00
Jonne Haß
4b5b7fc77f Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting" 
This reverts commit b0fc95764d, reversing
changes made to 0057e9ed46.
 2012-10-21 22:12:36 +02:00
Sean Tilley
b0fc95764d Merge pull request #3655 from denschub/feature/fix-followhq-setting 
Change 'unless' to 'if' because 'unless' is wrong here. [ci skip]
 2012-10-21 12:55:01 -07:00
Sean Tilley
4b372cfca9 Merge pull request #3669 from DeadSuperHero/feature/remove-alpha-logo 
Remove Alpha logo from branding [ci skip]
 2012-10-19 11:49:38 -07:00
Sean Tilley
e2a2767a74 remove alpha from branding 2012-10-19 13:47:27 -05:00
Florian Staudacher
2694c930a5 Merge pull request #3645 from Raven24/fix-link-regex 
simplify link regex and fix #3553
 2012-10-19 02:24:24 -07:00
Jonne Haß
107b7b1cba let closelabel.png and loading.gif respect the asset host 2012-10-16 16:56:08 +02:00
Gonzalo
7e0c8bdf68 Remove unreachable line of code 2012-10-15 20:25:10 -02:00
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02:00
Dennis Schubert
7dc629179b Change 'unless' to 'if' because 'unless' is wrong here. 2012-10-12 00:59:42 +02:00
Fabián Rodríguez
82082005ba redirect users back on registration failure 2012-10-11 19:47:04 -02:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Florian Staudacher
ded69477ba replace the monstrous link regex with a slightly less complicated one, 
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
 2012-10-11 23:39:44 +02:00
movilla
928a8a02d8 Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false 2012-10-10 16:49:45 +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
Jonne Haß
8febcfac9c Merge pull request #3635 from movilla/fix_checkbox_select_profiles 
Edit Profile issue with misaligned elements - Fix #3599
 2012-10-08 06:51:04 -07:00
movilla
509aa3116d Edit Profile issue with misaligned elements - Fix 3599 2012-10-08 15:25:17 +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
a9bec8a4ee Merge branch 'hotfix/oembed-selector' into develop 
fix for the click event handler on oembed-ed content
 2012-10-03 19:12:48 +02:00
Florian Staudacher
bf82fc17fe fix oembed onclick behavior + specs 2012-10-03 19:05:17 +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
Marek Lewandowski
125e45cdba Force user to authenticate instead of raising error 2012-09-29 16:57:34 +02:00
Jonne Haß
531c5b0c32 Merge pull request #3616 from movilla/css_problem_viewer_post 
css error in post-viewer after update bootstrap
 2012-09-29 06:44:20 -07:00
movilla
aa8c89a0e4 css error in post-viewer after update bootstrap 2012-09-29 15:19:39 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02: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ß
7a478704d5 just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Florian Staudacher
9d391d5885 Merge pull request #3597 from devendram/diaspora-refactoring-1 
refactored user model (using scope instead of class methods) + rspec tests
for daily, monthly, yearly activities
 2012-09-23 09:36:35 -07:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup 
traslation popup ignore user => /stream
 2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Devendra
a2fa083c3e added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives 2012-09-22 01:56:34 +05:30
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ß
8674f5aea2 Merge branch 'hotfix/redis_url' into develop 2012-09-18 15:55:32 +02:00
Jonne Haß
2f9dbdbd86 use self instead of AppConfig to query redis_url inside AppConfig 2012-09-18 15:52:57 +02:00
Jonne Haß
3e44808cb2 Merge pull request #3587 from movilla/image_profile_post 
images disappeared user profiles in the publication (/post/) for not having class in css
 2012-09-17 15:43:00 -07:00
movilla
bacb99cd18 images disappeared user profiles in the publication (/ post) for not having class in css 2012-09-17 23:41:46 +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
8193978fd2 in 'standalone' mode, the close button is hidden 
... publisher is embedded into something, that has its own close button
 2012-09-17 20:46:33 +02:00
Florian Staudacher
452de1b866 fix remaining cukes and some cleanup 2012-09-17 20:35:38 +02:00
Florian Staudacher
1002fe088d split up the various parts of the publisher, 
should probably rather be backbone-subviews ... ?
 2012-09-16 17:38:58 +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ß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
9e264b5258 hotfix typo, thanks david 2012-09-15 18:28:43 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization 
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
 2012-09-15 18:23:22 +02:00
Jonne Haß
f1631084d3 Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr 
css modification on the number of characters twiter, facebook and tumblr...
 2012-09-14 08:28:58 -07:00
movilla
426fe1ab7d css modification on the number of characters twiter, facebook and tumblr -.counter- 2012-09-14 16:45:03 +02:00
Jonne Haß
4bada36bf1 do not redirect admin to his profile upon sign in 2012-09-14 15:01:19 +02:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
2de0213d6f Revert "Removed a couple missed "new_styles" assets." 
This reverts commit e323d6134e.
 2012-09-12 12:55:57 +02:00
Jonne Haß
2b729059c9 was too long awake last commit, here are the files back we still need 2012-09-12 12:55:57 +02:00
Hans Fase
e323d6134e Removed a couple missed "new_styles" assets. 2012-09-12 04:05:33 -04:00
Jonne Haß
7ec2f8f419 finish beta striping 
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
 2012-09-12 07:51:19 +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
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
movilla
10eb26ad2d With mobile click "show" in #nsfw-posts links to top of page Fix: #3564 2012-09-11 16:42:55 +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
Jeremy Huffman
c8f8f6741a let profile tag entry grow to size of input box 
use auto so line-breaks work better
 2012-09-07 23:24:41 -04:00
Jonne Haß
edc9d75df7 remove deprecation warning about outdated render call 2012-09-07 01:55:53 +02:00
Jonne Haß
81442f0f2a Erb::Util.h now escapes ' which it didn't before 
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
 2012-09-06 21:12:49 +02:00
Florian Staudacher
9f27eba174 Merge pull request #3539 from movilla/404_blank_page_mobile 
Fix #3428 blank page 404 on mobile
 2012-09-06 10:05:09 -07:00
movilla
b0ecc57631 Fix uncomfortable overflow mobile post 2012-09-05 16:51:27 +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
Maxwell Salzberg
8b7934006e Merge pull request #3491 from fermionic/issue-3420-remote-comments-dont-delete 
Give relayable retractions a chance to propagate locally before deleting the target
 2012-08-30 13:04:59 -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
Maxwell Salzberg
c3f073b520 Merge pull request #3511 from movilla/placeholder_friendly_mobile_search 
Add placeholder search mobile[ci skip]
 2012-08-26 23:26:50 -07:00
movilla
b1815c8e9a Add placeholder search mobile 2012-08-25 03:45:02 +02:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07: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