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
Steffen van Bergerem
3d4bdfb665
Drop number of followers from tags page
2014-01-21 14:49:05 +01:00
Florian Staudacher
5c059b2925
fix regression in conversations causing an infinite recursion ( fix #4715 )
2014-01-20 22:00:26 +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
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b
Merge pull request #4688 from ivanzotov/develop
...
Fix after_create to after_commit
2014-01-15 11:47:23 -08: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
Ivan Zotov
a4ce6e267a
Fix after_create to after_commit
2014-01-14 22:35:29 +04:00
Steffen van Bergerem
580068ed7c
Remove background from badges in header
2014-01-14 15:00:36 +01:00
goobertron
706b11b14d
Now with passing Cucumber tests
2014-01-13 18:14:43 +00:00
goobertron
a1ac848d62
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
2014-01-12 20:02:33 +00: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
Jonne Haß
7608319787
Merge pull request #4665 from svbergerem/fix-500-conversations
...
fix bug in conversations view causing server error
2014-01-08 23:55:09 -08:00
arlogn
31177e6bdb
bookmarklet publisher more usable mobile
2014-01-09 02:33:47 +01:00
Jonne Haß
ca9e2e24ea
Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable
...
bookmarklet publisher more usable
2014-01-07 11:29:50 -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
maruf
c17a474142
Simple captcha for signup page
2014-01-06 22:00:37 +02: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
arlogn
61bfbc82e0
bookmarklet publisher more usable
2014-01-06 01:07:05 +01: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
Steffen van Bergerem
2e50a16567
fix bug in conversations view causing server error
2014-01-04 01:54:45 +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
Jonne Haß
5d83402dc3
Merge pull request #4628 from jaywink/4627-twitter-truncation-problem
...
Fix posting to Twitter by correctly catching over limit exception
2013-12-22 14:14:30 -08:00
Steffen van Bergerem
a96611c259
use bootstrap labels
2013-12-16 00:46:55 +01:00
Steffen van Bergerem
206e3f9422
fix mobile
2013-12-15 23:40:08 +01:00
Jason Robinson
e665ebdab1
Fix posting to Twitter by correctly catching over limit exception ( #4627 ). Also when doing a retry, make smaller cuts to max characters
2013-12-15 22:01:09 +02: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
Fabian Rodriguez
c12a45556d
fix #2645
...
* refactor a bit #weekly_user_stats
* pass 0 instead of "" to i18n
* use the first week if none is provided
2013-12-13 19:32:04 -02:00
flaburgan
6aced29bb6
Add expand the publisher test
2013-12-13 17:55:33 +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
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
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
Jonne Haß
4b1255fa8d
Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile
...
[Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication
Conflicts:
Changelog.md
2013-12-02 00:04:37 +01:00
Jonne Haß
8baa06e477
Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix
...
Add lightbox html to unauthenticated header
Conflicts:
Changelog.md
2013-12-01 23:58:00 +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
Fabian Rodriguez
0702db137a
remove PostViewerNav
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
Fabian Rodriguez
6eed63807d
remove next and previous functionality from router
2013-12-01 20:55:48 -02:00
flaburgan
748599a9dd
Refactor mobile publisher
2013-11-29 12:30:20 +01: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
7a50e79cfa
Fix aspect dropdown on contacts page
2013-11-27 13:07:31 -08:00
Jonne Haß
05fa086caa
replace ugly 'followed by' grammar assumption at tags#show with proper version
2013-11-20 23:47:50 +01:00
Jonne Haß
478159f1cd
Merge pull request #4593 from Flaburgan/improve-mobile-design
...
Improve notifications and conversations views design on mobile
2013-11-20 12:05:28 -08:00
Fabian Rodriguez
d8618f8700
Merge pull request #4591 from Flaburgan/avatar-profile-mobile
...
Fix avatar display on mobile profile
2013-11-18 18:17:34 -08:00
flaburgan
e1fb8200dd
Move 'mark all as read' button under the title
2013-11-18 18:02:22 -08:00
flaburgan
85eb584e66
Remove useless :page_title indication from people/show
2013-11-16 15:40:03 -08:00
flaburgan
58886a6b30
Improve notifications and conversations views design
2013-11-16 03:06:25 -08:00
flaburgan
a02b0519c9
Fix "more picture" indication (+n) on mobile by adding a link on the indication
2013-11-16 02:06:45 -08:00
flaburgan
76b151eb7d
Fix avatar display on mobile profile
2013-11-16 01:57:37 -08:00
Raphael Sofaer
a07d3616a5
Add lightbox html to unauthenticated header
2013-11-15 14:33:46 -08:00
flaburgan
1833edfd67
Add actions to contacts/index.html page
2013-11-12 19:10:00 -08:00
Jonne Haß
859cd83e38
Merge pull request #4583 from Flaburgan/refactor-mobile-header
...
Refactor mobile header, close #4579
Conflicts:
Changelog.md
2013-11-10 23:55:55 +01:00
flaburgan
0f2773053e
refactor mobile header, close #4579
2013-11-09 23:21:32 -08:00
movilla
1fcd675b3e
getting started page mobile error 500. Fix #4534
2013-11-09 19:25:32 -02:00
Fabian Rodriguez
146044bd36
Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv
...
force comments sort order in mobile spv
2013-11-07 18:16:52 -08:00
Erwan Guyader
0afdb134f8
force comments sort order in mobile spv
2013-11-07 17:19:23 -08:00
flaburgan
bee2c63762
Change icon when adding, fix #4568
2013-11-07 12:55:50 -08:00
flaburgan
3df0fdc09b
Improve the management of the contacts visibility settings in an aspect
2013-11-07 12:55:35 -08:00
Steffen van Bergerem
d5c3079623
refactor publisher css
2013-11-07 17:12:35 +01:00
flaburgan
47645dd985
Put the stream first in the left menu
2013-11-04 17:46:45 -08:00
Florian Staudacher
1c4ad0986c
refactor message creation (conversations)
2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e
refactor conversations_controller#create
2013-10-10 21:42:46 +02: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
Dennis Schubert
6e62a99732
Merge pull request #4542 from Raven24/empty_publishing
...
avoid publishing empty posts
2013-09-25 13:49:52 -07: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
