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

546 commits

Author SHA1 Message Date
Saritha
f27c0483ca Feature spec for change password on mobile website 
Fix #6372
 2015-10-28 15:05:34 +05:30
Steffen van Bergerem
20385701d2 Move interactions.scss 2015-10-06 10:30:11 +02:00
Steffen van Bergerem
ff99db1fd3 Change conversation page style 2015-09-27 23:11:19 +02:00
Steffen van Bergerem
a5ca78bc87 Fix post preview with location 2015-09-27 03:03:28 +02:00
Jonne Haß
9842841c18 Merge branch 'stable' into develop 2015-08-29 19:55:09 +02:00
Steffen van Bergerem
34319758ed Improve posts from ... page cukes 
closes #6367
 2015-08-29 19:55:03 +02:00
Jonne Haß
1dee542933 Merge branch 'stable' into develop 2015-08-29 17:01:14 +02:00
Jonne Haß
bf92a7441e Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API 2015-08-29 15:58:08 +02:00
augier
3a5406a6e1 Styling of mobile header compilant with desktop version 2015-08-28 20:30:07 +02:00
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Steffen van Bergerem
eddfa7cb5c Merge pull request #6309 from AugierLe42e/left-navbar-polishing 
Left and right navbar polishing
 2015-08-23 11:29:51 +02:00
augier
450bf4f4ba Refactor and minor styling 2015-08-23 09:59:12 +02:00
augier
281d1a9161 Rebasing and fixing tests 2015-08-11 18:12:02 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Jonne Haß
22a8997c47 Merge branch 'stable' into develop 2015-08-01 20:05:29 +02:00
theworldbright
b3242500b0 Disable ambiguous regex for step definitions 
Signed-off-by: theworldbright <kent@kentshikama.com>

closes #6272
 2015-08-01 20:05:24 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Dennis Schubert
e0782437b8 Merge branch 'stable' into develop 2015-07-03 05:26:01 +02:00
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136 
closes #6146
closes #6136
 2015-07-03 05:25:22 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Steffen van Bergerem
d6d1e38ba1 Stabilize mobile close account cukes 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
e890ffa698 Merge branch 'stable' into develop 2015-06-19 22:20:57 +02:00
Faldrian
12678bde53 Added cucumber step to add multiple posts in one step 
closes #6118
 2015-06-19 22:19:29 +02:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Steffen van Bergerem
b7f4feacce Fix failing notification cukes 2015-06-04 18:05:44 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
85087123f0 remove travis hax ... works on here ... I hope on travis too 
closes #5964
 2015-05-18 03:23:39 +02:00
Jonne Haß
4a7c358be9 Merge branch 'stable' into develop 2015-05-05 01:39:52 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
234e205602 Merge branch 'stable' into develop 2015-05-04 03:38:44 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e Activity stream keeping retracted participations 2015-04-10 21:46:42 -03:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
0856eb8f86 Merge pull request #5788 from AugierLe42e/fix-search-element-selection 
Fixes #5787
 2015-03-16 23:36:51 +01:00
Augier
571685d590 Fix the broken searchbar (#5787) 2015-03-16 22:07:51 +01:00
goobertron
2b6ca180ce Add tests for liking and unliking posts 2015-03-14 14:50:35 +00:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3 Use handlebars helpers wherever possible 2015-03-12 16:20:32 +01:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Steffen van Bergerem
53714c4699 Fix notification for new conversations 2015-02-19 13:39:25 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Jonne Haß
0af6fabfc7 Merge pull request #5650 from svbergerem/improve-hovercards-cuke 
Make the hovercards cuke more reliable
 2015-02-15 15:58:47 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Steffen van Bergerem
3db305264e Make the hovercards cuke more reliable 2015-02-10 20:48:51 +01:00
goobertron
42cd2337be Amend all text strings in en locales to use sentence case 
Adapt cukes to work with new capitalisation rules
 2015-01-31 17:44:57 +00:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
flaburgan
3ff298606f Add menu mobile and drawer navigation tests 2014-12-28 18:49:03 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Steffen van Bergerem
b3f7acb91b Fix SlowFinderErrors 2014-12-03 22:31:02 +01:00
Steffen van Bergerem
9a047749fc Fix delete a photo cuke 2014-12-02 23:56:54 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
1c0cf98958 Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown 
Notifications Dropdown infinite scrolling
 2014-10-14 13:37:55 +02:00
Steffen van Bergerem
42a3e702e6 Fix poll for Bootstrap publisher 2014-10-11 19:18:13 +02:00
jaideng123
bd24d6bebe Added cucumber test for notifications dropdown 2014-10-06 13:55:46 -05:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Jonne Haß
291a2f31df Merge branch 'release/0.4.1.0' into develop 2014-09-01 19:40:40 +02:00
Florian Staudacher
36e92b322f fix hovercard aspect selectio z-index by moving it out of the stream element 
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
  selector is clicked
 2014-09-01 19:39:23 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
goobertron
a90627467b Add sign-up tests for mobile, minor adjustments to other mobile tests 2014-08-30 18:35:10 +01:00
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
Jonne Haß
ccd7c670b3 Merge pull request #5170 from khall/issue_5149a 
Issue 5149a

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
 2014-08-27 18:20:56 +02:00
khall
b7c68031fa Last rspec fix brought to you by jhass 2014-08-26 17:12:58 -07:00
khall
875895f2d0 Convert specs to RSpec 3.0.4 syntax with Transpec 
This conversion is done by Transpec 2.3.6 with the following command:
    transpec features

* 19 conversions
    from: obj.should
      to: expect(obj).to

* 1 conversion
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2014-08-26 17:11:44 -07:00
khall
de3e0bd91a Updating cucumber features 2014-08-26 17:11:44 -07:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Jonne Haß
caa5067721 don't make loading an assertion, just try waiting for it 2014-08-24 22:59:22 +02:00
Jonne Haß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
Jonne Haß
5068be90e8 reduce cuke failures 
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
 2014-08-23 16:47:57 +02:00
Jonne Haß
33c3b38f2f replace deprecated finder and finder_options syntax 2014-08-23 16:34:00 +02:00
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
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ß
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
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
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
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00:00
Jannik Streek
a9843ae996 added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01: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
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
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
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
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
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
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
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
7b65fdf77c add missing shoulds 2013-09-14 13:46:41 -03: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
Fabian Rodriguez
261ac786c1 avoid use :visible option in capybara finders 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
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +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
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ß
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
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
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
Juan Manuel Azambuja
de7044c602 Fix select & deselect all aspects check image 2013-04-21 21:38:03 -03: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
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ß
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