Commit graph

722 commits

Author SHA1 Message Date
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