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

777 commits

Author SHA1 Message Date
flaburgan
2c4dc830fc Fix aspect renaming after a regression caused by jquery upgrade, close #4822 2014-03-06 00:04:48 +01:00
Florian Staudacher
1f98e1c639 cleanup 'getting started' cukes a bit 2014-02-23 16:48:48 +01:00
Florian Staudacher
e2adaa07a2 should fix remaining failing cukes from captcha and removal of client-side-validations gem 2014-02-23 16:48:48 +01:00
Florian Staudacher
061ae52e4d captcha needs to be present, but can be bogus in test ENV 2014-02-23 16:48:48 +01:00
arlogn
405b9fd8b9 embedding youtube videos over https 
(cherry picked from commit 1563d088bc)
 2014-02-15 16:54:46 +02:00
Jonne Haß
3a616469f4 Merge pull request #4707 from goobertron/improved_new_password 
New reset password form

Conflicts:
	Changelog.md
 2014-02-10 01:35:37 +01:00
Steffen van Bergerem
a2b3917505 Add participants to conversations menu 2014-02-09 19:55:10 +01:00
flaburgan
b8bb7ae857 Fix tests 2014-02-09 17:42:28 +01:00
goobertron
2a145e67ab Update design of forgot_password and change_password forms 
Fix redirect to stream, make labels lower-case

Fix cuke
 2014-02-09 15:48:06 +00:00
goobertron
7bcea07b99 Standardise - code refs to 'messages' to 'conversations' 2014-02-09 15:44:12 +01:00
Florian Staudacher
6c9cce7cda Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https 2014-02-09 13:05:39 +01:00
arlogn
1563d088bc embedding youtube videos over https 2014-01-30 18:01:27 +01:00
Jonne Haß
eeec0eafe5 Don't rely on the hover to work when deleting a comment in a cuke 
Also reuse comment step for comment deletion cuke.
This effectively masks failures of the comment deletion cuke
until we find a real solution.
 2014-01-26 00:14:35 +01:00
Jonne Haß
8b8071925d Make toggle aspect call synchronous and bump capybaras wait timeout 
in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.
 2014-01-26 00:13:06 +01:00
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +01:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
goobertron
29a98ddc29 Remove duplicate test steps 2014-01-13 18:47:47 +00:00
goobertron
706b11b14d Now with passing Cucumber tests 2014-01-13 18:14:43 +00:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
flaburgan
6aced29bb6 Add expand the publisher test 2013-12-13 17:55:33 +01:00
Fabian Rodriguez
ea58324aa8 remove template picker 2013-12-04 20:08:54 -02:00
Jonne Haß
478159f1cd Merge pull request #4593 from Flaburgan/improve-mobile-design 
Improve notifications and conversations views design on mobile
 2013-11-20 12:05:28 -08:00
flaburgan
861b3d30f4 Fix tests 2013-11-16 13:48:33 -08:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
5598cd803a Merge pull request #4510 from diaspora/improve_tests2 
Improve tests2
 2013-09-14 14:47:58 -07:00
movilla
7d8f4578a4 add mobile test for comment mobile 2013-09-14 19:38:47 +02:00
Fabian Rodriguez
9d5d0aaf73 remove repeated step and stop using the publisher to create posts when is not necessary 2013-09-14 13:46:41 -03:00
Fabian Rodriguez
f341e1e0e6 remove commented test and fix typo 2013-09-14 13:46:41 -03:00
Fabian Rodriguez
7b65fdf77c add missing shoulds 2013-09-14 13:46:41 -03:00
Jonne Haß
d4e1cebe68 try something to stabilize features/desktop/oembed.feature 2013-09-04 15:57:41 +02:00
Florian Staudacher
5ff05139a3 fix failing cuke - blocking from profile page 2013-09-04 14:47:28 +02:00
Colin Dean
a4ce4404ff change bitcoin_wallet_id to bitcoin_address 
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.

Also adds convenience method to handle the deprecated variable.
 2013-08-31 20:16:23 -04:00
Nils Vogels
a3f3bcf6ef Adjusting the description of the 404 message, in order to avoid having 
to specify why users got a 404, and possibly leaking information while doing this

See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728

Adjusting travis breakage
 2013-08-30 14:42:19 +02:00
movilla
2b97f74015 error 500 when visit probile mobile and logged out. Fix #4458 2013-08-29 12:18:53 +02:00
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +02:00
Fabian Rodriguez
261ac786c1 avoid use :visible option in capybara finders 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
e9af8d55af reorganize cukes into desktop and mobile folders 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
cdfdf37a17 use #hover instead of execute_script hacks 2013-08-27 10:59:44 -03:00
Fabian Rodriguez
d489dfc8e3 remove unused steps 2013-08-27 10:59:43 -03:00
Fabian Rodriguez
c69853e0cf replace asserts with rspec equivalents 2013-08-27 10:59:43 -03:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
1b7bc02eee Merge pull request #4410 from rogerbraun/feature/spv-redesign 
New single post view

Conflicts:
	app/assets/stylesheets/application.css.sass
 2013-08-22 10:37:25 +02:00
Roger Braun
d7aaaea86e Fix specs for new single post view. 2013-08-22 09:56:35 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
Jonne Haß
9793827f20 fix features/profile_photos.feature:17 I broke 2013-08-19 15:47:41 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
mokus
babcc1e66b update profile_photo test and selenium version to make tests pass on firefox 23 2013-08-19 12:49:39 +02:00
carolina
f3817b996e Modify photos unless condition and loop through thumbnails and test 2013-08-19 12:49:39 +02:00
carolina
fd05d30f20 Add tests for photo link in profile side bar 2013-08-19 12:49:39 +02:00
Jonne Haß
a1f4c4b1d0 wild shot at stabilizing features/aspect_navigation.feature:18 by making sure all aspects are deselected after deselecting all aspects 2013-08-18 12:05:05 +02:00
movilla
d1c679cc22 remove comments from the mobile site. Close #4225 2013-08-16 22:14:52 +02:00
movilla
73825ab94a Remove post from the mobile site 2013-08-16 20:44:22 +02:00
movilla
795a7a5751 mobile error 500 if a reshared (original) post will be deleted. 2013-08-16 12:07:14 +02:00
movilla
152c08963a fix mobile search tags 2013-08-12 16:01:26 +02:00
Bender Bending Rodríguez
7086055f4e Bitcoin donations 2013-08-11 15:31:05 +02:00
Jonne Haß
45e4817a58 expect the ajax request updating the profile name in features/signs_up.feature 2013-08-11 11:20:29 +02:00
Jonne Haß
bf9996b25d lets see if page.should have_no_css actually waits for the element to disappear 2013-08-11 10:06:42 +02:00
Steffen van Bergerem
8a8fb10b18 auto expand post preview 2013-08-06 20:48:27 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
Jonne Haß
274faebdd1 another attempt at stabilizing features/signs_up.feature 2013-08-04 17:01:12 +02:00
Jonne Haß
5026eccc6a Refactor and reorder backbone app initialization, fixes hovercards 
Also added cucumber feature for hovercards
 2013-08-01 12:52:16 +02:00
Jonne Haß
46ab67beed stabilize features/reshare_mobile.feature 2013-07-31 19:05:54 +02:00
Jonne Haß
3ae2d2e43c stabilize features/signs_up.feature 2013-07-31 17:00:13 +02:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Tamas Laszlo Fabian
37505c5ece Fixed timago tooltip in conversations 
Fixed timeago errors

Added cucumber stuff to test timeago at inbox

Show localized date/time in tooltip

Remove title attributes
 2013-07-07 14:43:47 +02:00
Antoine D
8e2633f8b3 Improve participants link style in conversation, close #4236 
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
 2013-06-28 00:41:44 +02:00
Florian Staudacher
653f7566df fix failing conversations cuke 2013-06-05 01:07:05 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Steffen van Bergerem
7f596cfd36 Fix #4157: post preview from tag pages 2013-05-25 12:39:01 +02:00
Steffen van Bergerem
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
movilla
5839d304db Fix reactions link on mobile broken 2013-04-25 13:55:57 +02:00
Juan Manuel Azambuja
de7044c602 Fix select & deselect all aspects check image 2013-04-21 21:38:03 -03:00
movilla
c1479b36ca Correction typos for changelog and activity mobile feature 2013-04-13 22:24:07 +02:00
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more 
Conflicts:
	Changelog.md
 2013-04-13 12:53:31 +02:00
Juan Manuel Azambuja
5a85fd71f1 close issues #4017 and 4107 by including jquery.textchange 2013-04-09 16:21:19 -03:00
movilla
bc87b501f2 Fix show more post in my activity mobile page. Close #4108 2013-04-08 00:04:42 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02: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
movilla
b257939f7e Add multiphoto for mobile post 2013-03-30 10:59:06 +01:00
Marcelo Casiraghi
b0f76f1764 Fix confirmation at getting_started page 2013-03-25 23:09:38 -03: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
movilla
3990bebcf4 Fix mobile view of deleted reshares 2013-03-18 16:52:37 +01:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01: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
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
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03: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
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
movilla
e0d0d0f668 Fixed removing images from publisher on the profile and tags pages 2013-02-21 22:19:24 +01: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ß
ff10ffe43c update feature to match overriden translation 2013-01-31 19:31:38 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00