nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15572 commits 4 branches 0 tags 121 MiB
Commit graph

7612 commits

Author SHA1 Message Date
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile 
Fix code overflow spv and profile
 2014-12-02 22:44:08 +01:00
SansPseudoFix
6d681f8306 Fix code overflow 
new file:   app/assets/stylesheets/new_styles/_code.scss
 2014-12-02 16:51:50 +01:00
Steffen van Bergerem
d742f23cd5 Content shouldn't exceed the profile sidebar 2014-12-02 02:03:15 +01:00
Steffen van Bergerem
4cc1b40443 Only remove photos from view when destroyed on server 2014-12-01 00:36:56 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
taro-k
b01026f9b8 pre-fill tag page form with the tag #4234 2014-11-30 14:15:45 +01:00
Steffen van Bergerem
b275b2edbc Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden 
A temporary fix for mention modal #5329
 2014-11-30 13:48:24 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url 
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
 2014-11-29 23:46:45 +01:00
SansPseudoFix
90b9f227d8 A temporary fix for mention modal #5329 
A temporary fix for mention modal #5329

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss
 2014-11-29 17:36:46 +01:00
Faldrian
29f55f42b6 truncate long opengraph description to 250 chars in mobile and stream view 2014-11-29 17:18:01 +01:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Jonne Haß
544501a0e6 Merge pull request #5418 from svbergerem/publisher-counter-style-fix 
Fix character count placement for publisher
 2014-11-29 16:11:45 +01:00
Laurent PERON
9661d00ec8 issue #5430 : message added 2014-11-28 10:31:47 +01:00
Steffen van Bergerem
389edbe3aa Don't display undefined handle in search widget 2014-11-27 16:57:32 +01:00
Jonne Haß
49dfc27011 Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process 
Optimize jsxc login process and bump jsxc version
 2014-11-24 23:01:03 +01:00
Steffen van Bergerem
77b627dbe9 Merge pull request #5419 from SansPseudoFix/add-handle-search-terms 
Add handle search terms
 2014-11-24 18:09:02 +01:00
Lukas Matt
ef29de8176 Configure form element and move xmpp config 2014-11-24 17:19:57 +01:00
Lukas Matt
0d4da2fba8 Login function deprecated 
related to diaspora/jsxc#50
 2014-11-24 17:19:30 +01:00
Lukas Matt
44bc48ad5e Remove debug output on default 2014-11-24 17:19:09 +01:00
SansPseudoFix
322ca4dac0 display handle for search bar 
fix margin and color

hidden overflow for long handle and names

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss

add min width 300px

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss
 2014-11-24 13:17:57 +01:00
Steffen van Bergerem
8cb6e242bf Fix character count placement for publisher 2014-11-23 18:36:05 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
6a034f172b Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint 
fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error
 2014-11-22 19:00:55 +01:00
Jonne Haß
32c5508f3d Merge pull request #5408 from Zauberstuhl/show_roster_minimized 
Display chat box minimized on default
 2014-11-22 18:58:16 +01:00
Jonne Haß
9b49df80a5 Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster 
Chat: add extra padding for the roster
 2014-11-22 18:57:51 +01:00
Steffen van Bergerem
8f956383bd Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden 
Issue #5251: fix hidden overflow
 2014-11-22 16:38:16 +01:00
SansPseudoFix
66b76024ed Issue #5251: fix hidden overflow 
modified:   app/assets/stylesheets/getting-started.css.scss

	modified:   app/assets/stylesheets/getting-started.css.scss
 2014-11-22 15:01:20 +01:00
Steffen van Bergerem
472d65cb61 Chat: add extra padding for the roster 2014-11-21 23:29:06 +01:00
Lukas Matt
5fee67e5e7 Display chat box minimized on default 
Currently it slides in if you login. with time it is annoying
 2014-11-21 21:56:27 +01:00
Praveen Arimbrathodiyil
6378af5417 remove execution permissions from images and css 2014-11-20 23:38:36 +05:30
Faldrian
328a515dbe fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error 2014-11-16 18:19:32 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Lukas Matt
e40cf25177 Swap aspect chat privilege title 2014-11-13 14:38:23 +01:00
Lukas Matt
ea11133084 Include the chat front-end if chat is enabled 
* add jsxc helper file
 2014-11-13 11:34:21 +01:00
Lukas Matt
735b10cc63 Chat privilege checkbox 
* add to contacts header for later modification
* add to aspect creation box
 2014-11-13 11:30:12 +01:00
Lukas Matt
24e1732256 Implement token authentication 
* create a new token on a new session
* delete the current token on session exit
 2014-11-13 11:27:56 +01:00
Lukas Matt
ae582e4543 Add toggle_chat_privilege to aspect controller 2014-11-13 11:24:07 +01:00
Lukas Matt
38a238eb36 Set chat-flag for every aspect manually 
On default none is permitted to chat with you.
You have to set extra privilege for an aspect.
 2014-11-13 11:21:21 +01:00
Lukas Matt
50a7541d14 Include jsxc deps and initialize the client on login 2014-11-13 11:17:19 +01:00
Jonne Haß
e68704890e make sure to import perfect scrollbar plugin before our own mixins 
otherwise it overrides the border-radius mixin with an incompatible one
 2014-11-09 20:31:24 +01:00
Jonne Haß
30de98cf3e Merge pull request #5335 from svbergerem/paginate-contacts 
Paginate contacts
 2014-11-09 19:04:07 +01:00
Jonne Haß
404a286588 Merge pull request #5355 from Chocobozzz/header-logo-hover 
Replace the black header logo with the white logo on hover
 2014-11-09 18:55:59 +01:00
Jonne Haß
c7c57d40f5 Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix 
Feature/3098 publisher imageupload layouterror fix
 2014-11-09 18:52:13 +01:00
Dennis Schubert
4c98445f1c Fix presenters instead of modifying the getters 2014-11-09 07:47:40 -08:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
5bcd5087bf Add Camo for remote images 2014-11-09 02:17:43 +01:00
Dennis Schubert
db2560d7fc Add Camo for OpenGraph images 2014-11-09 01:36:16 +01:00
Dennis Schubert
89ad5b96ad Add Camo for a profiles bio and location 
yes, we do have Markdown there. But please don't tell anyone.
 2014-11-08 23:12:55 +01:00
Dennis Schubert
0a619749f2 Add Camo for profile images 2014-11-08 23:12:55 +01:00
Dennis Schubert
613f2d1142 Add Camo for comments 2014-11-08 23:12:55 +01:00
Dennis Schubert
92cd4e6b78 Use camo for Markdown images 
just a quick proof of concept
 2014-11-08 05:14:18 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01:00
Florian Staudacher
2c8bbd3343 Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into roymckenzie-body-classes 2014-11-07 16:39:33 +01:00
Faldrian
d928c69e36 Fix: displaying more than one row of image attachments broke publisher 2014-11-07 16:37:52 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Chocobozzz
e411a344f4 Commit the new branding sprite 2014-10-21 17:14:25 +02:00
Paul Hill
ac4607d75c LibreJS should work with most of the site 2014-10-21 02:48:18 +01:00
Chocobozzz
1aff0d8c2c Add header logo when hoovered (white logo) 2014-10-18 22:24:05 +02:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
ef71c57190 Merge pull request #5342 from AugierLe42e/sass-to-scss 
Refactor application.css and bootstrap-headerfix.css
 2014-10-14 19:42:31 +02:00
Jonne Haß
f532efeac5 Merge pull request #5276 from svbergerem/reshare-absolute-root 
Reshare the absolute root of a post

Conflicts:
	Changelog.md
 2014-10-14 19:40:35 +02:00
Augier
cdf4fc05df Refactored the two last sass files in scss. #3796 2014-10-14 17:47:52 +02:00
Jonne Haß
4e6eacbeb1 Update _.template calls to undscore.js 1.7 2014-10-14 15:04:01 +02:00
Jonne Haß
1c0cf98958 Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown 
Notifications Dropdown infinite scrolling
 2014-10-14 13:37:55 +02:00
Jonne Haß
e5b20106c6 Merge pull request #5279 from svbergerem/overflow-long-names-tag-page 
Hidden overflow for long names on tag pages

Conflicts:
	Changelog.md
 2014-10-14 13:30:22 +02:00
Jonne Haß
a7c702d631 Merge pull request #5308 from Flaburgan/add-network-key-to-statistics 
Add network key to statistics.json

Conflicts:
	Changelog.md
 2014-10-14 13:25:16 +02:00
Jonne Haß
0a20d6a2b7 Merge pull request #5316 from gdpelican/feature/allow-nil-http-agent 
Allow nil HTTP user agent
 2014-10-14 13:22:28 +02:00
Jonne Haß
8a63f6f1f7 Merge pull request #5317 from gdpelican/feature/strip-search-query 
Feature/strip search query
 2014-10-14 13:19:36 +02:00
Jonne Haß
b9cad8485d Merge pull request #5318 from gdpelican/feature/fix-missing-password-translation 
Fix missing password translations
 2014-10-14 13:17:57 +02:00
Jonne Haß
b4e4b7f007 Merge pull request #5325 from gdpelican/feature/fix-change-password-error-message 
Show error message on invalid reset password attempt
 2014-10-14 13:09:02 +02:00
Jonne Haß
e135301642 Merge pull request #5331 from roymckenzie/feature/admin-show-recent-weekly-users 
Most recent new users show on Weekly User Stats admin page
 2014-10-14 13:07:33 +02:00
Jonne Haß
0419174570 Merge pull request #5334 from svbergerem/fix-bootstrap-poll 
Fix poll for Bootstrap publisher
 2014-10-14 13:03:19 +02:00
flaburgan
20d2b8fc5e Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02:00
Jason Robinson
13de3f318e Merge pull request #5296 from 'deepy/develop' into develop 2014-10-12 22:41:42 +03:00
Steffen van Bergerem
8cc5847aec Paginate contacts 2014-10-11 22:21:31 +02:00
Steffen van Bergerem
42a3e702e6 Fix poll for Bootstrap publisher 2014-10-11 19:18:13 +02:00
Roy McKenzie
258959e1c2 Updated Weekly User Stats page to show the most recent week. Page should show most recent information 2014-10-10 19:12:37 -07:00
James Kiesel
e2e502ea68 Show error message on invalid reset password attempt 2014-10-11 10:47:00 +13:00
Steffen van Bergerem
715f451ed4 only collapse empty comment box 2014-10-10 20:05:28 +02:00
James Kiesel
1400228757 Fix missing password translations 2014-10-11 00:41:52 +13:00
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
James Kiesel
206ec99f8f Strip search query of leading & trailing whitespace 2014-10-09 23:34:11 +13:00
James Kiesel
2d44107b5d Allow nil HTTP user agent 2014-10-09 23:08:33 +13:00
flaburgan
476f694bca Remove one border-bottom on the photo page 2014-10-08 19:40:06 +02:00
Sandip Trivedi
215fc1c96b Replaced jquery.idle-timer.js vendored asset with a bower package #5194 2014-10-08 00:00:14 -04:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Steffen van Bergerem
4cfe3d7005 Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menu 
Feature/4901 hoverable left menu
 2014-10-07 22:21:05 +02:00
Jonne Haß
518186a538 Merge pull request #5299 from strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package 
Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194
 2014-10-07 14:40:47 +02:00
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Sandip Trivedi
2af32220a5 Replaced jquery.placeholder.js vendored asset with a bower package #5194 2014-10-07 00:46:24 -04:00
Jonne Haß
803c257ecf Merge pull request #5297 from strivedi183/5194-replace_jquerytextchangejs_vendored_asset_with_bower_package 
Replaced jquery.textchange.js vendored asset with a bower package #5194
 2014-10-07 02:43:06 +02:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
jaideng123
bd24d6bebe Added cucumber test for notifications dropdown 2014-10-06 13:55:46 -05:00
flaburgan
82a8673a36 Add margin to reshare 2014-10-06 20:00:07 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Roy McKenzie
1df8f0cf20 Added classes to the body for easier page specific styling. 2014-10-04 17:58:39 -07:00
Alex Nordlund
acc7377e5f Removed setting for statistics, showing both instead. 2014-10-05 01:45:48 +02:00
Alex Nordlund
03f3c74cee Moved services to a JSON list. 
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
 2014-10-05 01:07:30 +02:00
Steffen van Bergerem
65e9e1c744 Hidden overflow for long names on tag pages 2014-10-04 22:58:57 +02:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jason Robinson
309e690a66 Fix services in statistics.json. 
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
 2014-10-03 23:54:42 +03:00
Jonne Haß
1959f0d939 Merge branch 'hotfix/0.4.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-10-03 17:14:55 +02:00
Jonne Haß
a5ca738e91 Fix XSS issue in poll questions 
closes #5274
 2014-10-03 17:12:11 +02:00
Brent Bartlett
f9564af0ba moved hoverable class from <li> to <a> 2014-10-02 17:02:15 -07:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
jaideng123
2b6ac9261b Notifications Dropdown now infinite scrolls 2014-09-29 16:30:36 -05:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
9520d06c7b Handle already deleted items gracefully in receive local batch job 2014-09-20 15:26:31 +02:00
Jonne Haß
d6f5368474 Handle already deleted photos gracefully in process photo job 2014-09-20 15:13:14 +02:00
Jonne Haß
4b754b51f9 Discard dispatch jobs of already deleted records 2014-09-20 13:39:31 +02:00
Jonne Haß
5133458d30 Start converting IDN emails 2014-09-20 04:05:57 +02:00
taro@diasporajp
93c6159c56 fix locale of invitation email subject #5231 2014-09-19 16:56:55 +09:00
Florian Staudacher
926556c145 fix profile badge too much margin [ci skip] 2014-09-18 22:30:57 +02:00
jaideng123
b448f92c61 Fixed deformation of getting started popovers 2014-09-17 21:13:22 -05:00
Florian Staudacher
6e1bd7216d fix /u/[username] route 2014-09-18 00:23:43 +02:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Florian Staudacher
a5da2ca48c small fixes and more jasmine specs 2014-09-15 01:37:24 +02:00
Florian Staudacher
10609c3692 fix jasmine and add some specs for direction detection 2014-09-15 01:37:23 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +02:00
Florian Staudacher
e4ee28885a make photos page work with backbone 2014-09-15 01:37:23 +02:00
Florian Staudacher
1f724dd123 * add a (hash)tag helper for handlebars 
* re-add stream on profile page
* more controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc * refactored text direction detector into helper (also for handlebars) 
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
9a16560d8d * rename profile header view to make name more accurate 
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
 2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483 * create a handlebars view for the profile header 
* unblock the user via ajax
 2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61 * cleanup people_controller#show, add people_controller#stream for json 
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
 2014-09-15 01:37:23 +02:00
Florian Staudacher
d00d69814e port profile page to backbone.js 2014-09-15 01:37:23 +02:00
Jonne Haß
619bc3f537 A reshares root may be already gone when generating the notification 2014-09-07 10:47:47 +02:00
Jonne Haß
777e3123d6 Try fetching missing parent of relayables 
* Extract post fetching logic from Reshare into
  its own module
* raise proper error message when fetching fails
* raise proper error message when parent is still missing

We can't skip fetch failures or missing parents and
still need to retry them in case we're sent the parent
later on
 2014-09-07 10:47:47 +02:00
jaideng123
642e5ab45b Fixed Open Graph db insertion 2014-09-06 14:49:34 -05:00
Jonne Haß
01e0127287 Ignore embedded photos if invalid 
For example if they're already present
Also refactor StatusMessage XML specs
 2014-09-06 04:52:18 +02:00
Jonne Haß
476376dcb0 Don't retry Diaspora::AuthorXMLAuthorMismatch 
They're not healable and seem to only occur on
Friendica posts
 2014-09-06 03:26:07 +02:00
Jonne Haß
4e5fa6cc7e Merge branch 'release/0.4.1.0' into develop 2014-09-03 15:53:58 +02:00
Jonne Haß
2d9c6a945d Don't let the dropdown indicator flow into the user name in the user 
menu
 2014-09-03 15:53:01 +02:00
Jonne Haß
d4dc20f59c Merge branch 'release/0.4.1.0' into develop 2014-09-03 11:17:04 +02:00
Jonne Haß
12dc9cbc23 prevent user menu from moving 2014-09-02 01:17:18 +02:00
Jonne Haß
291a2f31df Merge branch 'release/0.4.1.0' into develop 2014-09-01 19:40:40 +02:00
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ß
6445487936 Merge pull request #5193 from svbergerem/conversations-redirect-new 
Redirect conversations/new to conversations
 2014-09-01 18:39:22 +02:00
Steffen van Bergerem
ba0bccbef1 Redirect conversations/new to conversations 2014-09-01 17:11:56 +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ß
1515848120 Merge branch 'release/0.4.1.0' into develop 
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
 2014-08-30 20:09:08 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json 
jQuery autoSuggest uses .html to insert it into the DOM
 2014-08-30 20:06:03 +02:00
Steffen van Bergerem
0ca59e828a Rounded contact search input 2014-08-29 14:45:16 +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
Jonne Haß
806de6a9ba Merge pull request #5084 from Flaburgan/profile-mobile-improvements 
Improve profile page design on mobile
 2014-08-27 17:48:59 +02:00
Flaburgan
b83295b4e4 Polish conversation view 2014-08-27 14:40:58 +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ß
e3dc82bdcd Merge branch 'release/0.4.1.0' into develop 2014-08-26 19:12:14 +02:00
Steffen van Bergerem
5a4697e254 Remove validation.js from mobile sign in page (fix regression) 2014-08-26 19:11:59 +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ß
541d5580e0 Fix loading issues in rails_admin 
Properly declare Admin module and explicitly list models to be
display in rails_admin
 2014-08-26 02:57:47 +02: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
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040 
Fix for issue 5040
 2014-08-26 01:16:41 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +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
Jonne Haß
ef214d7681 bump http_accept_language 2014-08-25 22:06:28 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02: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
41dc950a06 Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well 2014-08-24 19:02:11 -07:00
khall
6d56a6fbac Updating with jhass's code change. Still looking into Travis failure... 2014-08-24 16:01:59 -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ß
13f50eeee6 do not touch the own model in an after commit hook 
That just recurses endlessly, fixes #5146
 2014-08-24 16:03:17 +02: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ß
feb45a6291 Merge pull request #5135 from goobertron/tos2 
Minor formatting changes to ToS
 2014-08-24 13:30:51 +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ß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +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
Jonne Haß
0a70a125be Remove deprecation warning in blueprint view 2014-08-24 01:02:35 +02:00
goobertron
0f2929a0ce Add strong codes for pod name 2014-08-23 19:40:02 +01:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +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
Jonne Haß
d070f19243 make rspec and jasmine pass with the new code 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ß
1b3a2185eb Fix and simplify current_page? check on profile page 2014-08-23 16:38:57 +02:00
Jonne Haß
cb13d30a02 Directly query photos when doing an update_all 
For some reason it doesn't correctly set the bind variables
when called through an association with non-standard
keys. Probably a Rails bug.
 2014-08-23 16:38:57 +02:00
Jonne Haß
35b17d8c4f Do not call self-modifying Enumerable methods on AR::Relation objects 2014-08-23 16:38:57 +02:00
Jonne Haß
da9c1db14f before_action 2014-08-23 16:38:57 +02:00
Niall Paterson
f33038f105 updated before_filters to before_actions as recommended for rails 4 2014-08-23 16:34:01 +02:00
Jonne Haß
244388fcb5 make aspect membership controller specs green 2014-08-23 16:34:01 +02:00
Jonne Haß
645a427798 Fix account deleter by not relying on protected_atrributes 2014-08-23 16:34:01 +02:00
Jonne Haß
dc12479070 Filter :id in User.build for now 
Rails 4 seem to allow setting the id through supplied parameters
The controllers ported to strong_parameters should guard against
attacks over this vector, but I didn't want to remove the specs
that test this here
 2014-08-23 16:34:01 +02:00
Jonne Haß
76c6d95a0e replace deprecated disable_with option 2014-08-23 16:34:01 +02:00
Jonne Haß
09f0665225 replace deprecated usages for all 2014-08-23 16:34:01 +02:00
Jonne Haß
cc8a614c29 Remove attr_accessible from OpenGraphCache 2014-08-23 16:34:01 +02:00
Jonne Haß
2f1193fa36 Fix "prepared statements" errors 
See https://coderwall.com/p/45ombq
 2014-08-23 16:34:00 +02:00
Jonne Haß
dfa0245f4b make assets:precompile work 2014-08-23 16:34:00 +02:00
Jonne Haß
a9e107364a make status message controller spec pass and deprecation free 2014-08-23 16:34:00 +02:00
Jonne Haß
2cca5745c9 remove deprecated scoped 2014-08-23 16:34:00 +02:00
Jonne Haß
cb195f4d55 access connection through class 2014-08-23 16:34:00 +02:00
Jonne Haß
2f54d4f17d remove conditions on association deprecation warnings 2014-08-23 16:34:00 +02:00
Jonne Haß
89afb616cf replace deprecated scope syntax and unify it 2014-08-23 16:34:00 +02:00
Jonne Haß
33c3b38f2f replace deprecated finder and finder_options syntax 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
Steffen van Bergerem
987c982bb5 Fix mobile sign in page regression 2014-08-21 22:19:14 +02:00
goobertron
c8e5b326e5 Minor formatting changes to ToS 2014-08-21 11:36:21 +01: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ß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02: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
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
Jonne Haß
fa9c079955 Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json 
Service have been added to /statistics.json
 2014-08-18 11:20:26 +02:00
Jonne Haß
d3b901801c Merge pull request #5111 from jaywink/user-mailer 
Rake task to send mails to users
 2014-08-18 11:18:25 +02:00
jaideng123
c68eeb70fb Added the button changing effect + the ability to read all of a type to mobile 2014-08-17 15:51:37 -05:00
jaideng123
406397988b Made wording more clear, refactored read_all 2014-08-17 11:16:30 -05:00
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -05:00
Jason Robinson
a4eafe8a87 Allow sending emails with custom subject via Notifier.admin 2014-08-17 18:02:16 +03: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
damzcodes
de069962b3 Service have been added to /statistics.json 
Services have been added to /statistics.json

tidying up

edits
 2014-08-15 14:02:03 +01: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