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

3570 commits

Author SHA1 Message Date
Pablo Cuadrado
ba9bb619e4 using container instead of container fluid for the stream, we can manage this 
better when migrating to Bootstrap 3
 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
7f2ee4bf3d dropping blueprint option on publisher 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b2e3866217 removing blueprint classes from new aspect modal 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
Steffen van Bergerem
0434599bd0 Contacts page: 'Start a conversation' button should depend on number of contacts in aspect 2015-02-19 20:22:07 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account 
Lock account #5564
 2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
Steffen van Bergerem
b3558d0db1 Fix captcha and box-shadow 2015-02-18 22:45:46 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Giniouxe
e2866a12ea Issue #5662: Fix text on change button 2015-02-15 20:42:55 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago 
Fix timeago for notifications, add 'no notifications yet' message
 2015-02-10 12:20:09 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation 
Technical limitations of how old one can be on D* #5373
 2015-02-09 02:28:15 +01:00
Akash Agrawall
6b105274af Technical limitation of how old one can be on D* 5373 2015-02-09 06:19:09 +05:30
Jonne Haß
3114b04a08 Merge pull request #5635 from svbergerem/remove-unused-files 
Remove unused files, fix syntax in jasmine tests
 2015-02-07 23:43:48 +01:00
Jonne Haß
63363340f6 Merge pull request #5623 from AugierLe42e/fix-mobile-login-view 
[Mobile] Does not display the header on sing_in page
 2015-02-07 21:30:03 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00
Augier
4be1e2b38e Does not display the header on sing_in page 2015-02-04 23:45:13 +01:00
flaburgan
b8aaad6318 Hide sign up button when registration are disabled 2015-02-01 14:01:44 +01:00
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01:00
Augier
f14ad5ce35 Fixes the header problem rendering statistics page 2015-01-25 13:24:19 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
Jonne Haß
cd6475d572 Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight 
5560 Hide community spotlight setting if not enabled
 2015-01-21 05:38:25 +01:00
Sakshi Jain
8b1f0453a1 5560 Hide community spotlight setting if not enabled 2015-01-20 10:31:31 +05:30
James Kiesel
7bbd9138de Fix bad email formatting 2015-01-20 16:51:08 +13:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
Jason Robinson
5c810a8a2e Merge pull request #5489 from collimarco/solved5482 
Solved #5482
 2015-01-17 03:39:03 +02:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu 
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
 2015-01-06 14:35:37 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Marco Colli
1ac2e728f4 Solved #5482 2014-12-20 11:05:12 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
3000d86d57 Merge pull request #5475 from svbergerem/tag-page-improve-wording 
Improve wording for tagged people on tag page
 2014-12-17 16:46:09 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Jonne Haß
6836af89ad Correctly implement OpenGraph tags 
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
 2014-12-08 02:25:09 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Laurent PERON
9661d00ec8 issue #5430 : message added 2014-11-28 10:31:47 +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
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
Jonne Haß
30de98cf3e Merge pull request #5335 from svbergerem/paginate-contacts 
Paginate contacts
 2014-11-09 19:04:07 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01:00
Faldrian
d928c69e36 Fix: displaying more than one row of image attachments broke publisher 2014-11-07 16:37:52 +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
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01: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ß
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
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
James Kiesel
1400228757 Fix missing password translations 2014-10-11 00:41:52 +13: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
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Roy McKenzie
1df8f0cf20 Added classes to the body for easier page specific styling. 2014-10-04 17:58:39 -07: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
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +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
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
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
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +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
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