Commit graph

398 commits

Author SHA1 Message Date
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
0f156cd9a4 Remove unused beta code 2014-01-24 09:01:30 +01:00
Jonne Haß
0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments
[Ready to review & merge] Add permalinks for comments

Conflicts:
	app/assets/stylesheets/application.css.sass
2014-01-22 11:24:42 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
2014-01-20 10:03:45 +01:00
Ruxton
a3113cce7c Switched to using rails-timeago to make keeping on top of new versions of plugin easier 2014-01-20 09:33:35 +08: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
Lukas Matt
5c9a3aaf3e Added post report feature
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
flaburgan
c24d5193e4 Refactor conversations css + fix inconsistent height of conversations list bug 2013-12-15 01:15:44 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code
Drop spv old code
2013-12-11 07:41:51 -08:00
Fabian Rodriguez
80015e7ba8 move everything under post-viewer/ to single-post-viewer/ 2013-12-08 12:36:01 -02:00
Fabian Rodriguez
ea58324aa8 remove template picker 2013-12-04 20:08:54 -02:00
Fabian Rodriguez
cfc247db75 remove PostViewerFeedback 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
9be780468d remove PostViewerInteractions 2013-12-01 20:55:49 -02:00
Fabian Rodriguez
bf3ee8d7bb remove PostViewer 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
179cc9e8dd remove PostViewerAuthor 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
0702db137a remove PostViewerNav 2013-12-01 20:55:48 -02:00
Fabian Rodriguez
6eed63807d remove next and previous functionality from router 2013-12-01 20:55:48 -02:00
Richard
dbbead1587 removed double comment 2013-11-28 21:48:41 +11:00
Richard
1b83b6942b Merge branch 'develop' into feature/4509-image-upload-response-errors 2013-11-28 21:46:01 +11:00
Richard
ff07bddd1b using status messages instead of popup and updated specs for publisher view. 2013-11-28 16:08:03 +11:00
Richard
3671f09b1d checking file upload response error and giving an error alert if there is one. 2013-11-28 12:26:30 +11:00
flaburgan
bee2c63762 Change icon when adding, fix #4568 2013-11-07 12:55:50 -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
Florian Staudacher
39810e6196 decode URLs before processing them (fixes #4507) 2013-09-21 15:23:30 +02:00
Florian Staudacher
96f80c8cab cleanup jasmine tests
and added changelog entry for bugfix #4005
2013-09-19 23:22:49 +02:00
PallaviTS
5caa46cc83 fixing commenting
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
2013-09-19 23:22:48 +02:00
Jonne Haß
72e421b38f Merge pull request #4480 from Raven24/publisher_backbone
Publisher - now with even more Backbone
2013-09-04 16:52:30 +02:00
Florian Staudacher
b2ff1878e3 move ui feedback into success callback 2013-09-04 14:47:28 +02:00
sjain1107
5223a2d906 Adding ignore user icon
Adding ignore user icon

Added jquery

Changed profile.js
2013-09-04 14:47:23 +02:00
Florian Staudacher
41c0880a9d add jasmine specs for uploader, minor changes 2013-09-03 23:18:19 +02:00
Florian Staudacher
bedfacecfd fix jasmine tests 2013-09-03 23:18:18 +02:00
Florian Staudacher
4da696253a implement publisher uploader as backbone view 2013-09-03 23:18:18 +02:00
Florian Staudacher
4090f134f2 port 'getting started' to a backbone view, revert filename changes 2013-09-03 23:18:18 +02:00
Florian Staudacher
9560a8ec61 create actual backbone view for publisher aspect selection 2013-09-03 23:18:18 +02:00
Florian Staudacher
253ab23f5e publisher: extract services into subview 2013-09-03 23:18:18 +02:00
Jonne Haß
5eb5057864 Merge pull request #4351 from netom/3711_fix_stream_render_time
Batch insert new posts to stream
2013-09-01 19:36:07 +02:00
Srihari Sriraman
f53aa3e0e5 Highlighting the currently active stream in the leftNavBar
- This gives the user the sense of what he/she is currently viewing
- The hover/selected are the same right now. Needs to change.
- Need to find a more meaningful place for `markSelected`

Moved markSelected to app.views.Stream

- Removes duplication
- All streams create this view, and this seems to do some setup on
  initializing, which is a good place to markNavSelected

Changing highlight on hover to 'black' instead of the blue

- The blue was a little intruisive
- Also fixes the vertical alignment issue

Changing the background to bluebg on hover
2013-09-01 19:32:01 +02:00
Fábián Tamás László
18c22a5e4c Batch insert new posts to stream 2013-09-01 10:16:09 +02:00
Jonne Haß
0cdfc7cfbd Make I18n systems more robust against missing keys in pluralization data
Should make situations like #4468 less frequent
2013-08-30 19:31:48 +02:00
Steffen van Bergerem
6bc16bcdba Fix preview with more than one mention 2013-08-29 20:36:49 +02:00
Srihari Sriraman
3131eb920b Collapsing aspects_list and followed_tags when they aren't active
- Each time a stream is rendered, other lists are emtied
- Using Backbone.history.fragment to detect active stream
- hideInactiveStreamLists is best pushed into a before/after filter

Added tests for hideInactiveStreamLists
2013-08-29 14:51:54 +02:00
Srihari Sriraman
0bcc62f07f Disable 'Mark all as read' for notifications when everything is read
- This action needn't be performed when all notifications are read,
  hence disabling it is a good practice
- Added a link-disabled-color
- Used css pointer-events to disable clicking on the link

Preventing default on click for the mark_all_read_link

- avoiding the use of pointer-events
- setting up disabled only for mark_all_read_link

Moved disabling of the link to a global handler

- Added disabled class to the button in /notifications when all are read
- Styled the disabled button
- Adding disabled class after completion of ajaxRequest
2013-08-29 12:12:26 +02:00
Srihari Sriraman
cbaaf86bae Single click selects the invite link
- Earlier, triple-clicking or drag & select had to be performed to select
- Should consider a copy button

Moving away from the inline onClick handler

It didn't feel right to be writing js in a helper.

Refactoring setupInviteLinks into a sidebar Backbone View
2013-08-28 20:40:28 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +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
Steffen van Bergerem
0de0d8855c fix weird bug with comment_box focus 2013-08-22 09:56:36 +02:00
Roger Braun
328fb7113f Staying consistent 2013-08-22 09:56:36 +02:00