Florian Staudacher
36e92b322f
fix hovercard aspect selectio z-index by moving it out of the stream element
...
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
selector is clicked
2014-09-01 19:39:23 +02:00
Jonne Haß
5da86def06
bump handlebars_assets
2014-09-01 11:44:34 +02:00
Jonne Haß
d4a2d5708c
Hide welcome to diaspora after all popovers are closed
...
As a side effect stabilizes signs up cuke
2014-08-31 21:29:46 +02:00
Steffen van Bergerem
854dcf04db
Display new conversation form on conversations/index
2014-08-31 18:02:37 +02:00
Jonne Haß
7c28921ec7
Merge pull request #5138 from svbergerem/bootstrap-tags-view
...
Port tags page to Bootstrap
2014-08-28 23:12:32 +02:00
Jonne Haß
462198799b
Dynamic asset paths everywhere
...
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
2014-08-28 21:04:29 +02:00
Steffen van Bergerem
3f3087c77f
Port tags page to Bootstrap
2014-08-28 18:02:02 +02:00
flaburgan
1dbce6d84d
Improve profile page design on mobile
2014-08-27 14:17:05 +02:00
Jonne Haß
f1ab434b18
Merge pull request #5153 from svbergerem/redesign-contacts-page
...
Redesign contacts page
2014-08-27 10:01:41 +02:00
Flaburgan
2151b4f791
Add jasmine tests
2014-08-27 00:03:49 +02:00
flaburgan
3d793679e0
Add visibilit icons in publisher dropdown aspect
2014-08-26 22:47:41 +02:00
Steffen van Bergerem
ff84ee0485
Small style changes, add tests
2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09
Add contacts search and port aspect membership save/destroy to backbone
2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883
Display all contacts in the contact list
2014-08-26 21:41:02 +02:00
Steffen van Bergerem
6461135bfd
Redesign contacts page
2014-08-26 19:18:32 +02:00
Jonne Haß
39379421dc
Merge pull request #5165 from jaideng123/5106-scrolling_in_notifications
...
Fixed notifications dropdown on bootstrap pages
2014-08-26 17:00:56 +02:00
jaideng123
83e677401f
Fixed bootstrap pages
2014-08-26 09:51:36 -05:00
Jonne Haß
00de34ba38
Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications
...
Increased the number of notifications shown in drop down bar to 15
Conflicts:
Gemfile.lock
2014-08-26 02:06:55 +02:00
Jonne Haß
9e5ac86a36
Merge branch 'release/0.4.1.0' into develop
2014-08-26 01:50:58 +02:00
lyzellis
8c90fea1e1
changes hovercard background color to grey on hover
2014-08-26 01:50:36 +02:00
Jonne Haß
3b3a44b39b
Merge pull request #5158 from khall/issue_5044
...
Fix for issue 5044
2014-08-26 01:18:39 +02:00
khall
1d0446fcab
Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week
2014-08-25 15:50:53 -07:00
jaideng123
b70f306ff5
Integrated Perfect Scrollbar into notifications dropdown
2014-08-25 15:33:25 -05:00
khall
049e504ad3
Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does.
2014-08-24 21:37:39 -07:00
khall
a9fd16db3e
Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.
2014-08-24 13:28:57 -07:00
Jonne Haß
2619beb157
Merge pull request #4481 from diaspora/rails4
...
Port to Rails 4
2014-08-24 13:42:31 +02:00
Jonne Haß
52d5a1cd1a
Merge pull request #5141 from svbergerem/mark-read-link-notifications
...
Change mark read link on notifications page
2014-08-24 13:32:32 +02:00
Jonne Haß
cf3d6293dc
Merge pull request #5130 from wegotcoders/4948-add-linebreaks
...
line breaks have been added to long headings
2014-08-24 13:25:22 +02:00
Jonne Haß
2c6e9a9786
try working around precompilation bug by committing generated sprites, not nice but luckily they don't change often
2014-08-24 01:02:35 +02:00
Steffen van Bergerem
c18df1c32f
Change mark read link on notifications page
2014-08-23 17:42:19 +02:00
Jonne Haß
5068be90e8
reduce cuke failures
...
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
2014-08-23 16:47:57 +02:00
Florian Staudacher
adf7aa98dd
port router specs, don't test backbone - our own code is enough
2014-08-23 16:38:58 +02:00
Florian Staudacher
c81379d38f
port some more JS specs to jasmine 2.0... still a lot to do
2014-08-23 16:38:57 +02:00
Jonne Haß
dfa0245f4b
make assets:precompile work
2014-08-23 16:34:00 +02:00
Steffen van Bergerem
d682821f2d
Refactor css
2014-08-23 15:45:45 +02:00
Jonne Haß
c4970b485f
Merge pull request #5131 from wegotcoders/3801_delete_own_photos
...
3801 delete own photos
2014-08-23 10:52:29 +02:00
damzcodes
ab71205261
line breaks have been added in correct stylesheet
2014-08-19 14:51:42 +01:00
Daniel Sun
13419066d4
refactor authorIsCurrentUser to user model as isAuthorOf
...
Dried up authorIsCurrentUser in views.js
removed authorIsCurrentUser, now called from views.js
remove authorIsCurrentUser from views.js
2014-08-19 10:37:57 +01:00
op48
844fe9d6b9
Allow users to delete own photos from gallery
...
Added delete label to photos in gallery
added an event to delete photos of current user
Added css for hiding/revealing the delete label
Included the photo stylesheet
Added cucumber test for deleting your own photos
Removed wip
2014-08-19 10:11:06 +01:00
Steffen van Bergerem
9e32eb370a
Remove unused js code for login page
2014-08-19 09:25:48 +02:00
Jonne Haß
8654e1b3ad
remove unused variable in i18n.js [ci skip]
2014-08-18 21:09:57 +02:00
Jonne Haß
b582e1f707
i18n.js: Add interface to retrieve entire sections
...
And make use of that in HelpView
2014-08-18 21:06:52 +02:00
damzcodes
c58a56c5fe
line breaks have been added to long headings
2014-08-18 14:06:07 +01:00
Jonne Haß
ae24495c7d
Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts
...
Remove ignored peoples posts without refresh (II)
2014-08-18 11:35:56 +02:00
Jason Robinson
e58f0b2ad4
Terms of service and privacy policy feature.
...
If enabled, terms of service link will be shown in sign up page.
2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056
refactor global event broker and user blocking from stream posts
2014-08-17 14:05:56 +02:00
Steffen van Bergerem
022bc1007d
Remove unused code
2014-08-16 11:47:31 +02:00
Jonne Haß
92a6fc9eb5
Add fallback system to frontend I18n system
...
Load the default locale and fall back to it on missing key
and interpolation errors
2014-08-15 13:53:28 +02:00
Jonne Haß
0127852936
Merge pull request #5112 from svbergerem/login-redesign
...
Redesign login page
Conflicts:
Changelog.md
2014-08-15 11:44:05 +02:00
Jonne Haß
691594e0fd
Merge pull request #5119 from svbergerem/people-search-fix-aspect-membership
...
Fix aspect membership dropdown on people search page
2014-08-15 03:22:54 +02:00
Steffen van Bergerem
0d064cbefe
Redesign login page
2014-08-15 00:46:20 +02:00
Steffen van Bergerem
ae3dec0167
Fix aspect membership dropdown on people search page
2014-08-15 00:16:11 +02:00
Błażej Pankowiak
7ff0776d59
Move color to it's real home
2014-08-14 21:54:24 +02:00
Błażej Pankowiak
ede042f6cd
Make new aspect popup Bootstrap compatible
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
f085436160
Port aspect edit pane to Bootstrap
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
2424301112
Port Community Spotlight to Bootstrap
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
19bcf103aa
Style selected aspect
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
64537f8763
Center remove buttons vertically
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
d0cbde2394
Style aspect controls
2014-08-14 21:09:58 +02:00
Błażej Pankowiak
0ad658f98c
Port main Contact page to Bootstrap
2014-08-14 21:09:57 +02:00
Pablo Cuadrado
a74a02929d
max-width for profile avatar
2014-08-14 04:53:20 -03:00
Pablo Cuadrado
83b1682750
removed border in tags, checkboxes centered inside the well classes
2014-08-14 04:53:20 -03:00
Pablo Cuadrado
9e34887712
profile edit page ported to bootstrap
2014-08-14 04:49:49 -03:00
Pablo Cuadrado
855597541a
user account edit page fully ported to bootstrap
2014-08-14 04:49:49 -03:00
op48
66fcfcfcbc
Ignoring validation for last poll answer input
...
last input field is only deleted if there are more than three input fields and the last one is empty
poll is validated only if the last input is empty, and the first three have been filled
Removed duplicate remove last answer.
Dont need to check that the last value is populated as we are ignoring last value
Fixing poll step
Placeholder text edited
Fixed translations for poll answer placeholder text
Removed numbers on publisher option
Removed numbers in placeholder for poll answers
2014-08-13 13:40:14 +01:00
Florian Staudacher
163b76ae3d
Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts
...
Conflicts:
Changelog.md
2014-08-13 14:30:28 +02:00
op48
aa11f7c261
Poll answers are added dynamically on keypress
...
Removed add option button
poll option can be added dynamically & last option removed if empty upon submission
Poll answer can be added dynamically by losing focus
poll option can be added dynamically & last option removed if empty upon submission
refractored to avoid repetition of publisher:sync event
poll option can be added dynamically & last option removed if empty upon submission
Added a missing semicolon
2014-08-11 10:42:11 +01:00
Błażej Pankowiak
255b8c02a2
Set top margin only on the body element
2014-08-07 00:15:17 +02:00
Jonne Haß
0421d9336a
Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts
...
added keyboard shortcut help topic
2014-08-03 20:12:15 +02:00
Faldrian
9636f372a4
inserted line breaks and wrote a test for app.views.Content.smallPhotos
2014-08-03 17:17:12 +02:00
Faldrian
7a4dbc8b67
fixed ugly comment
2014-08-03 16:00:11 +02:00
Faldrian
a3811f767c
style fixes for prev / next buttons
2014-08-03 15:53:38 +02:00
Faldrian
172bc80ec1
thumbnails scroll to currently selected image smoothly
2014-08-03 15:32:57 +02:00
Faldrian
f9215ce7dd
images are shown in a single row and can be scrolled using buttons on sides
2014-08-03 14:41:12 +02:00
Faldrian
9d02b0a586
remove first thumbnail; duplicate of big photo
2014-08-03 12:47:44 +02:00
Faldrian
a2a37742e4
added keyboard shortcut help topic
2014-08-01 22:13:55 +02:00
Jonne Haß
ddb80ad366
Merge pull request #5077 from svbergerem/bootstrap-people-search
...
Port people search to Bootstrap
Conflicts:
app/assets/stylesheets/application.css.sass
2014-07-30 19:07:35 +02:00
Jonne Haß
6c6efd6e9a
Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments
...
Bugfix remove bootstrap for spv comments Issue #4425
2014-07-30 19:02:10 +02:00
Steffen van Bergerem
f615ad3115
Port people search to Bootstrap
2014-07-20 18:21:13 +02:00
lyzellis
bdc5c1f958
changes border color to dark grey and removes box shadow for textareas and text inputs on focus
2014-07-18 17:27:41 -07:00
Utah Kate Newman
a282a37a8c
revised argument order and changed colors to color variables defined in colors.css.scss
2014-07-08 17:45:52 -07:00
Jonne Haß
fe1d1bd7a8
Merge pull request #5056 from arlogn/login-podname-size-flexible
...
Flexible font-size for huge text in sign_in page
2014-07-07 09:03:48 +02:00
arlogn
2394c3df39
flexible font-size for sign_in podname huge text
2014-07-06 19:18:21 +02:00
Błażej Pankowiak
a9b0412982
Remove text shadow from the button
2014-07-06 13:03:26 +02:00
Błażej Pankowiak
0d0ed4db28
Port Getting Started page to Bootstrap
2014-07-04 18:06:49 +02:00
Utah Kate Newman
7f2b3d3bf3
replaces blue comment box border and box shadow with gray border and no box shadow
2014-07-02 16:31:29 -07:00
Florian Staudacher
13b716a449
allow admins to close user accounts from the backend
...
* thanks to @maxwell for the initial work on this
port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu
some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying
add changelog entry
2014-07-01 23:33:15 +02:00
Jonne Haß
5a3d329703
Merge pull request #5049 from kpcyrd/aspect-edit-fix
...
Fix broken aspect-edit sidebar update
Conflicts:
app/assets/javascripts/aspect-edit-pane.js
2014-07-01 14:49:53 +02:00
Jonne Haß
12c507d6a2
Merge pull request #5048 from kpcyrd/fix-5031
...
Fix self-xss issue in contact-group-rename
2014-07-01 14:44:41 +02:00
Jonne Haß
f86b19efee
Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix
...
[4703] Minor style fix for user menu
2014-07-01 14:17:04 +02:00
Pablo Cuadrado
45d04a44ea
added title_header key for the Help header, only for EN lang so far
2014-07-01 06:19:29 -03:00
Pablo Cuadrado
14fbd7b205
help page ported to bootstrap
2014-07-01 05:56:49 -03:00
kpcyrd
6833ca46bb
Fix broken aspect-edit sidebar update
2014-07-01 00:33:17 +02:00
kpcyrd
20ffa8fa13
Fix another self-xss issue
2014-07-01 00:12:26 +02:00
kpcyrd
fb4898c4fa
Fix self-xss issue in contact-group-rename
2014-06-30 21:32:46 +02:00
Pablo Cuadrado
4232d830ee
left padding added, unnecesary cursor pointer removed
2014-06-29 18:24:54 -03:00
Pablo Cuadrado
7aa1028cbe
minor style fix for user menu
2014-06-29 15:12:30 -03:00
Hincu Petru
1d09978440
Fix hidding of poll publisher for close action
2014-06-25 10:54:00 +00:00
Hincu Petru
653612b74d
Remove posts for ignored person
2014-06-25 08:56:12 +00:00
Jason Robinson
126ced4383
Fix broken bookmarklet if params have encoded linefeeds.
...
Closes #4994
2014-06-22 11:48:24 +03:00
