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
