Commit graph

760 commits

Author SHA1 Message Date
op48
844fe9d6b9 Allow users to delete own photos from gallery
Added delete label to photos in gallery

added an event to delete photos of current user

Added css for hiding/revealing the delete label

Included the photo stylesheet

Added cucumber test for deleting your own photos

Removed wip
2014-08-19 10:11:06 +01:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
Błażej Pankowiak
b085c98b67 Update features to play nice with Bootstrap 2014-08-14 23:26:59 +02:00
op48
66fcfcfcbc Ignoring validation for last poll answer input
last input field is only deleted if there are more than three input fields and the last one is empty

poll is validated only if the last input is empty, and the first three have been filled

Removed duplicate remove last answer.

Dont need to check that the last value is populated as we are ignoring last value

Fixing poll step

Placeholder text edited

Fixed translations for poll answer placeholder text

Removed numbers on publisher option

Removed numbers in placeholder for poll answers
2014-08-13 13:40:14 +01:00
op48
aa11f7c261 Poll answers are added dynamically on keypress
Removed add option button

poll option can be added dynamically & last option removed if empty upon submission

Poll answer can be added dynamically by losing focus

poll option can be added dynamically & last option removed if empty upon submission

refractored to avoid repetition of publisher:sync event

poll option can be added dynamically & last option removed if empty upon submission

Added a missing semicolon
2014-08-11 10:42:11 +01:00
Jonne Haß
d34c932f53 try to make hovercards cuke even more stable 2014-06-01 12:15:20 +02:00
Jonne Haß
3c01eb5dc4 Detect whether the stream has loaded more reliably in the hovercards cuke 2014-05-27 08:44:35 +02:00
Jonne Haß
f650808828 Merge pull request #4758 from bronislav/feature/4724-remove-own-hovercard-popup-in-reshares
[WIP] Fix hovercard in reshares
2014-05-24 17:56:33 +02:00
Jonne Haß
9537c45d2a Merge pull request #4916 from hpetru/validate-poll-answer
I added the validation to poll question and poll answer

Conflicts:
	app/assets/javascripts/app/views/publisher_view.js
2014-05-24 17:42:18 +02:00
Jonne Haß
ecb1b80e24 Render flash message content with .text
.html does not escape any html input in these, leading to XSS
attack vectors.

Thanks to A Kai (@sixhundredns) for reporting the related issues.
2014-05-24 16:08:32 +02:00
Florian Staudacher
7680165b14 cleanup some publishing/posting cukes, hopefully stabilizing them 2014-04-22 03:28:06 +02:00
Florian Staudacher
19687c32a4 fix race condition in cukes 2014-04-21 21:01:27 +02:00
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer
Fix mobile drawer
2014-04-12 21:46:54 +03:00
flaburgan
86e71cd1b6 fix registration test 2014-04-11 20:25:58 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording
Update cukes to be text-independent
Update changelog
2014-04-08 00:28:25 +01:00
Hincu Petru
57de031f6b I added the validation for blank to poll question and poll answer 2014-04-07 17:17:41 +00:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Hincu Petru
f356ae7216 Add poll in post preview 2014-04-04 11:45:33 +00:00
Jonne Haß
9eb2339368 Merge pull request #4894 from hpetru/4893-poll-in-spv
Add poll for single post view
2014-04-03 20:36:34 +02:00
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00:00
Jonne Haß
8d20be6f65 Looks like I didn't pay enough attention while hitting that green button, sorry
Merge branch 'master' into develop
2014-04-02 08:58:21 +02:00
Jannik Streek
a9843ae996 added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +02:00
Jonne Haß
b207077405 Merge pull request #4859 from hpetru/4848-aspect-memberships-in-notification-dropdown
Fixed jQuery evenets in notifications-badge
2014-03-31 13:58:11 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00:00
Jonne Haß
7ef5595e52 Try silly things to make mentions_from_profile_page.feature:38 more stable 2014-03-30 20:54:05 +02:00
Jonne Haß
bc46ee437c Stabilze aspect_navigation.feature:18
... again
2014-03-30 20:18:58 +02:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Sean Brant
9efccb797c Fixes typos 2014-03-10 18:27:16 -05:00
Anton Ilin
68f2ce56fa Check user name presence instead
It seems that loading of stream is not completed before trying to activate hovercard.
I do not want to add explicit pause to the scenarion. Let's check link presence before activating hovercard.
2014-03-07 14:45:02 +02:00
Anton Ilin
81278fa61a Make feature consistent with other features.
Actually, I just trying to make this feature pass.
2014-03-07 11:28:02 +02:00
Anton Ilin
870f2e2ae8 Make step name more logical 2014-03-07 11:20:46 +02:00
Anton Ilin
e2ce10a9b2 Use capybara hover method in the hovercard steps
Let's use methods provided by capybara whenever possible.
2014-03-07 11:20:46 +02:00
Anton Ilin
0d9cf0fd6b Tests for hovercard in reshares
Coverage with tests is necessary for every feature
2014-03-07 11:20:46 +02:00
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