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
Jonne Haß
976b21ab05
Merge pull request #4702 from goobertron/new_logos
...
Updated image branding (issue #4444 )
2014-02-09 14:47:40 +01:00
Jonne Haß
ecd8a8200b
Merge pull request #4754 from svbergerem/small-improvements-spv
...
SPV small improvements
2014-02-09 14:26:41 +01:00
Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
Steffen van Bergerem
318d190404
SPV small improvements
2014-01-30 22:12:51 +01:00
Steffen van Bergerem
655fbfcd79
Fix timeago on mobile devices. Fix missing space
2014-01-30 10:15:14 +01:00
Steffen van Bergerem
fe01734a3d
fix timeago
2014-01-29 03:24:10 +01:00
Dennis Schubert
1f76a9a354
Merge pull request #4739 from MrZYX/stabilize_cukes
...
Stabilize cukes
2014-01-26 14:39:43 -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
763fb95947
Fix css for keyboard navigation
2014-01-26 04:31:11 +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
Jonne Haß
f9c230dd31
Merge pull request #4738 from svbergerem/remove-unused-spv-files
...
Remove unused beta code
2014-01-24 04:19:22 -08:00
Steffen van Bergerem
0f156cd9a4
Remove unused beta code
2014-01-24 09:01:30 +01:00
Steffen van Bergerem
7519fcc255
Remove unused cubbies code
2014-01-24 08:58:47 +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
goobertron
19c9c0f394
new version of white2x
2014-01-19 14:53:52 +00:00
goobertron
2fb5098be2
Submitted new images with blurred edges
2014-01-19 14:42:34 +00:00
goobertron
97b5c723af
Updated image branding and files with refs to them
2014-01-18 13:03:59 +00: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
Steffen van Bergerem
580068ed7c
Remove background from badges in header
2014-01-14 15:00:36 +01:00
Jonne Haß
7c9460d5b0
Merge pull request #4667 from Flaburgan/fix-markdown-display
...
Fix markdown indication in the publisher when the user upload an image
2014-01-06 02:22:21 -08:00
Damien Monet
b849d6c641
Fix: remove location when publisher is cleared by user
2014-01-05 11:09:03 +01:00
flaburgan
f758163f2e
Fix markdown indication in the publisher when the user upload an image
2014-01-04 15:58:20 +01:00
Jonne Haß
2734471feb
Merge pull request #4653 from svbergerem/3119-change-more-comments-link
...
Change more comments link
2014-01-02 01:14:33 -08:00
Steffen van Bergerem
55b967caf9
remove participants popover + improve conversations menu
2014-01-01 21:58:56 +01:00
Steffen van Bergerem
ef128575ae
Change more comments link
2013-12-30 13:20:58 +01:00
arlogn
ae3b50080c
Fix spinner overlapping in webkit search box ( #4446 ) and replace deprecated pseudo class :-moz-placeholder
2013-12-29 17:16:56 +01:00
Steffen van Bergerem
a96611c259
use bootstrap labels
2013-12-16 00:46:55 +01:00
Steffen van Bergerem
24310fe5a9
change layout
2013-12-15 20:14:55 +01:00
Steffen van Bergerem
5ab777f8cb
remove unused code
2013-12-15 18:01:32 +01:00
Steffen van Bergerem
c24cfb432d
fix facebox in conversations view
2013-12-15 14:20:47 +01:00
Steffen van Bergerem
c11b744a7f
port conversations view to bootstrap
2013-12-15 13:01:24 +01:00
flaburgan
c24d5193e4
Refactor conversations css + fix inconsistent height of conversations list bug
2013-12-15 01:15:44 +01:00
flaburgan
923a4f2ab4
Add indication about markdown formatting in the publisher
2013-12-13 16:02:39 +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
8cf4e4a7fb
remove old templates
2013-12-08 11:39:36 -02:00
Fabian Rodriguez
933c3b01ca
remove old styles
2013-12-07 12:03:26 -02:00
Fabian Rodriguez
f3f8d36b9d
remove wallpaper-mood template
2013-12-06 20:07:37 -02:00
Fabian Rodriguez
ea58324aa8
remove template picker
2013-12-04 20:08:54 -02:00
Jonne Haß
1ce027eb2c
Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors
...
Feature/4509 image upload response errors
2013-12-02 00:10:25 +01:00
Jonne Haß
d18bbd8405
Merge pull request #4604 from Flaburgan/refactor-mobile-publisher
...
Refactor mobile publisher
2013-12-02 00:07:08 +01: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
