Florian Staudacher
a2aff720a2
clear locale on each spec run, fix indentation
2014-02-23 17:13:01 +01:00
Florian Staudacher
dc1c156175
try to appease CI
2014-02-23 16:48:48 +01:00
Florian Staudacher
69a1718d08
fix comment spec, jasmine should be ok now
2014-02-23 16:48:48 +01:00
Florian Staudacher
e3b22ed95c
fix likes spec
2014-02-23 16:48:47 +01:00
Florian Staudacher
b27edcb2d1
fix search specs
2014-02-23 16:48:47 +01:00
Jason Robinson
5fe5507128
Add devise_lastseenable for user last seen tracking.
...
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
2014-02-22 23:22:46 +02:00
Jannik Streek
d603ff818c
added comment count to statistic to calculate posts/comments ratios
...
fixeds tests for comment count in statistics
added changelog entry and default entry
2014-02-21 12:25:23 +01:00
Jonne Haß
3ed4467155
Merge pull request #4765 from goobertron/jquery_source
...
Update JQuery source to jquery.com
Conflicts:
Changelog.md
2014-02-10 17:02:09 +01:00
Jonne Haß
2e8dc8fb61
move PasswordsController specs to the new appropiate location
2014-02-10 10:18:20 +01:00
goobertron
23e8bfa082
Update JQuery source to jquery.com
2014-02-09 17:36:35 +00:00
Jonne Haß
e402a4093d
Actually load a different section when requested in get_javascript_strings_for, add spec for changes in JS i18n helper
2014-02-09 16:00:16 +01:00
Richard
55efa82756
made a help view spec and cleaned up the views a bit.
2014-02-09 16:00:15 +01:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
Jonne Haß
17754f1da8
Merge pull request #4747 from Raven24/fix_aspect_stream
...
fix regression caused by updating backbone.js in aspect stream
2014-02-09 15:38:35 +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
Raphael Sofaer
300a7c1c31
Merge pull request #4737 from rsofaer/no_retries_for_bad_cert
...
Do not retry sending out posts on SSL errors. See #4728
2014-01-27 20:11:57 -08:00
Raphael Sofaer
de593f6e9f
Do not retry sending out posts on SSL errors. See #4728
...
Refactor HydraWrapper so the when-to-retry logic is in the worker
2014-01-27 15:45:45 -08:00
Florian Staudacher
09a840ea41
fix regression caused by updating backbone.js without updating changed parameters
2014-01-26 19:51:12 +01:00
Steffen van Bergerem
0f156cd9a4
Remove unused beta code
2014-01-24 09:01:30 +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
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
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
Jonne Haß
c11ddaa770
remove not_to raise_error deprecations
2014-01-13 12:25:38 +01:00
Jonne Haß
32b9caa08c
replace stub and mock deprecations with doubles
2014-01-13 12:25:38 +01:00
Jonne Haß
b5854d3172
remove outer (deprecated) describe blocks from shared examples
2014-01-13 12:25:38 +01:00
Jonne Haß
a0bbd899de
replace rspec_reset with obscure reset line stolen from rspec-mocks
2014-01-13 12:25:38 +01:00
Jonne Haß
7bb055932a
replace =~ array matching with match_array
2014-01-13 12:25:37 +01:00
Jonne Haß
525cd4cc02
fix stream helper spec for new rspec
2014-01-13 12:25:37 +01:00
Jonne Haß
01ecd9d054
do not overwrite rspec methods (receive)
2014-01-13 12:25:37 +01:00
Jonne Haß
df0bff6537
replace stub! with stub
2014-01-13 12:25:37 +01:00
Fabian Rodriguez
08acd6e5bf
bump Timecop
...
Time.now remains the same inside the block, outside of the block it
returns
2014-01-12 23:27:15 +01:00
Jonne Haß
42f790fa13
Merge pull request #4666 from jaywink/signup-form-error-redirect
...
Instead of redirect on signup form validation, render new
2014-01-11 14:08:18 -08:00
Jason Robinson
35ece9d65f
Instead of redirect on signup form validation, render new with submitted data.
2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b
Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$
2014-01-06 22:00:53 +02:00
Damien Monet
b849d6c641
Fix: remove location when publisher is cleared by user
2014-01-05 11:09:03 +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
Steffen van Bergerem
db382f6929
fix typo in lightbox spec
2013-12-08 15:02:41 +01:00
Fabian Rodriguez
d700c66deb
remove useless specs
2013-12-06 20:07:35 -02:00
Fabian Rodriguez
ea58324aa8
remove template picker
2013-12-04 20:08:54 -02:00
Fabian Rodriguez
6c8c4fc99e
remove template picker functionality
2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
2013-12-02 22:35:18 +02:00
Fabian Rodriguez
cfc247db75
remove PostViewerFeedback
2013-12-01 20:55:49 -02:00
Fabian Rodriguez
bf3ee8d7bb
remove PostViewer
2013-12-01 20:55:48 -02:00
Fabian Rodriguez
d7b8cb2997
remove #next_post_path and #previous_post_path from postpresenter
2013-12-01 20:55:48 -02:00
Fabian Rodriguez
92db8cb929
remove #next and #previous from posts_controller
2013-12-01 20:55:48 -02:00
Richard
ff07bddd1b
using status messages instead of popup and updated specs for publisher view.
2013-11-28 16:08:03 +11:00
Jonne Haß
eea9467846
refactor twitter service model
2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501
refactor ConversationsController, move query builing to User model
2013-09-30 01:44:57 +02:00
