Commit graph

3568 commits

Author SHA1 Message Date
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
2015-04-22 20:20:10 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:40:12 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Benjamin Neff
128cfb247c fix not_public page
body was rendered in the head
2015-04-20 22:32:32 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Jonne Haß
e274470d55 Replace default.html with a regular view
So we can correctly reference the images
2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages
Generate error pages on assets:precompile
2015-03-28 21:46:35 +01:00
Jonne Haß
e7d0a978ba Generate error pages on assets:precompile
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.

This works by instantiating ActionView and rendering
templates in a rake task.

Inspired by the errgent gem.
2015-03-27 11:15:59 +01:00
Dennis Schubert
b07ad67946 Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message
Add 'no contacts in this aspect yet' message
2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
Steffen van Bergerem
c9457ffd86 Add missing .container to admin pages, add note to changelog 2015-03-26 23:51:41 +01:00
SansPseudoFix
a97bfec39c add option pagination
center pagination

Fix pagination css

Symbols for previous and next

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Add responsive pagination

Fix broken pagination

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Fix broken pagination for mobile

Mobile pagination

Unify desktop and mobile background

change background color
2015-03-26 19:53:23 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page
Add ball.svg to /graphics
2015-03-26 00:32:41 +01:00
Sayed
e21afc6636 order-of-comments-on-the-mobile-version-is-reversed #5804 2015-03-21 15:20:57 +02:00
Jonne Haß
496a16d14d Merge pull request #5799 from svbergerem/invitation-input
Unify invite code and contacts page link style
2015-03-20 01:52:00 +01:00
Steffen van Bergerem
4a7781f1e7 Unify invite code and contacts page link style 2015-03-19 02:46:25 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Sayed
bf3d903c11 refactor mobile stream post_stats 2015-03-17 20:37:16 +02:00
Sayed
99f42cb643 fix missing reshares count on mobile stream 2015-03-17 01:14:22 +02:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +01:00
Augier
322ee30005 Tests with Jasmine 2015-03-15 14:52:49 +01:00
Steffen van Bergerem
caf7470e8e Various style fixes 2015-03-15 01:58:29 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error
display specific error messages for password change (issue #5549)
2015-03-14 03:25:08 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Giniouxe
efcff444fd Refactor registrations #5670 - Partial form 2015-03-13 16:16:45 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
1ff644c13e Fix mobile notifications 2015-03-12 22:45:04 +01:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls
Use entypo for control icons
2015-03-12 19:29:40 +01:00
Marcelo Briones
7be56849d9 DRY on avatars 2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Steffen van Bergerem
4f4dfc7554 Fix missing assets bug 2015-03-11 19:18:05 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
2015-03-11 17:05:14 +01:00
Steffen van Bergerem
be175e969e Fix mobile sign up with invitation 2015-03-11 10:52:42 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Steffen van Bergerem
d3c0259026 Remove unused aspect files 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
31d7904701 Remove unused blueprint invitations view 2015-03-09 17:57:49 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
56a79828bc using circled help icon 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
2fb594735e main stream widths with fluid container 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
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