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
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
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ß
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
58886a6b30
Improve notifications and conversations views design
2013-11-16 03:06:25 -08:00
flaburgan
76b151eb7d
Fix avatar display on mobile profile
2013-11-16 01:57:37 -08:00
flaburgan
1833edfd67
Add actions to contacts/index.html page
2013-11-12 19:10:00 -08:00
flaburgan
0f2773053e
refactor mobile header, close #4579
2013-11-09 23:21:32 -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
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
Srihari Sriraman
c379fb351e
Removing the conflicting green in colors
...
- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
colors that aren't used
2013-09-23 09:48:45 +05:30
Srihari Sriraman
91d9d5aea5
Removing the comment regarding the source of the lines
...
MrZyk pointed out that this information is preserved in git.
2013-09-22 15:31:27 +05:30
Srihari Sriraman
034361154f
Moving colors in variables.scss to colors.scss
...
- Fixed the conflicting red color
- Currently using the darker red
2013-09-22 14:40:56 +05:30
Florian Staudacher
39810e6196
decode URLs before processing them ( fixes #4507 )
2013-09-21 15:23:30 +02:00
Fabian Rodriguez
abc06686ce
Merge pull request #4523 from Flaburgan:improve-getting-started
...
Conflicts:
Changelog.md
2013-09-19 19:37:54 -03:00
Jonne Haß
ac13e79225
Merge pull request #4529 from Flaburgan/fix-timeago-color
...
Change .timeago color and align notification, fix #4502
2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707
Merge pull request #4522 from fubik/transparent_background
...
Add a white background to images displayed in the lightbox
Conflicts:
Changelog.md
2013-09-19 23:27:57 +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
flaburgan
126e7bdc9c
Refactor getting_started page, test if facebook is available, fix #4520
2013-09-18 22:06:47 -07:00
flaburgan
fcad95109f
Change .timeago color and align notification, fix #4502
2013-09-17 14:50:32 -07:00
Titouan Lorieul
b53c207477
Add a white background to ALL the images in the navigation bar of the lightbox
2013-09-16 18:35:38 +02:00
Titouan Lorieul
1aca1e1e51
Add a white background to the images shown in the navigation bar of the lightbox
2013-09-16 14:18:37 +02:00
Marek Marecki
0b37e9f736
Fix issue #4499 : changed :width in .item_count to :min-width
2013-09-14 09:35:15 +02:00
Titouan Lorieul
8bad0673b3
Add a white background to images shown in the lightbox
...
Fixes issue #4475
2013-09-13 09:47:57 +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
Jonne Haß
99657947a9
Merge pull request #4487 from arlogn/word-wrap-on-single-post-view
...
Prevent overflow of strings too long on single page view
2013-09-01 19:23:07 +02:00
Fábián Tamás László
18c22a5e4c
Batch insert new posts to stream
2013-09-01 10:16:09 +02:00
arlogn
1b295a88e5
Prevent overflow of strings too long on single page view
2013-09-01 01:41:37 +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
Srihari Sriraman
5bd5f9198d
Refactored the colors palette a little more
...
- Introduced text-dark-grey = #666666
- Converted text colors #777777 and #555555 to text-dark-grey
- Removed header-grey in favor of text-grey
- Included colors in a couple of files where it was missing
- Categorized the colors in the palette based on the contexts of usage
2013-08-30 17:58:39 +05:30
Srihari Sriraman
4348fc070d
Add border-dark-grey
...
Substituting -grey for #999
Moving #888 text color to -grey
Adding border-dark-grey
Removing border-dark-grey from places where it isn't appropriate
2013-08-30 10:32:02 +02:00
Jonne Haß
27f671814b
Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv
...
Fix size of images in the SPV
2013-08-29 21:37:10 +02:00
Steffen van Bergerem
6bc16bcdba
Fix preview with more than one mention
2013-08-29 20:36:49 +02:00
Steffen van Bergerem
642946bd5b
Fix size of images in the SPV
2013-08-29 20:05:12 +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
Jonne Haß
e194a07f18
Merge branch 'develop' of github.com:diaspora/diaspora into develop
...
Conflicts:
Changelog.md
2013-08-28 20:43:01 +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
svbergerem
fa7a03e9a7
Fix style in profile sidebar / contacts
2013-08-28 13:07:01 +02:00
Srihari Sriraman
a6dc845f59
First stab at extracting a color palette
...
- Pulled out the existing palette in _mixins
- Took a stab at naming greys after their usage count in contexts
- Replaced #a40802 with #a80000, since they are very close and $red was already in the palette
Missed importing 'colors' in a couple of places
Removing a redefined in favor of in colors.css.scss
Fixing missed imports #2
Renamed $background to $background-white
Explicitly calling out the color of the background, since we have many
background colors
2013-08-28 10:25:04 +02:00
