Commit graph

3542 commits

Author SHA1 Message Date
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
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