Commit graph

15388 commits

Author SHA1 Message Date
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
Steffen van Bergerem
8beadf5400 Merge pull request #5391 from Flaburgan/unify-not-connected-pages
Unify disconnected pages
2015-02-19 00:45:15 +01:00
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
Jonne Haß
7de66abce9 Merge pull request #5682 from svbergerem/opacity-transition-post-controls
Add opacity transition for post controls
2015-02-18 18:38:23 +01:00
Steffen van Bergerem
7d485ce6a6 Add opacity transition for post controls 2015-02-18 18:16:10 +01:00
Steffen van Bergerem
b4ab31d6f9 Merge pull request #5680 from jhass/strip_formatting_chars
Strip Unicode format characters prior post processing
2015-02-18 03:26:50 +01:00
Jonne Haß
6a5a407e49 Strip Unicode format characters prior post processing 2015-02-17 23:29:05 +01:00
Steffen van Bergerem
c03eb0c191 Merge pull request #5675 from SansPseudoFix/5586-fix-overflow-code-mobile
fix code overflow in mobile comments #5586
2015-02-17 13:09:56 +01:00
SansPseudoFix
0c49219ca7 Global prevent for overflow in mobile view 2015-02-17 13:00:39 +01:00
Steffen van Bergerem
a47f7c2556 Merge pull request #5666 from jhass/editorconfig
Editorconfig
2015-02-17 04:55:16 +01:00
Jonne Haß
34187c9d42 Merge pull request #5679 from svbergerem/update-jasmine-ajax
Update jasmine-ajax
2015-02-17 04:42:38 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Jonne Haß
ce618b3a51 Merge pull request #5677 from svbergerem/notifications-year-style
Style improvements for the year on the notifications page
2015-02-16 22:26:50 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Jonne Haß
278ca84ec2 Merge pull request #5676 from svbergerem/notifications-add-year
Add year to notifications page
2015-02-16 18:44:48 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Jonne Haß
3149ab7125 Merge pull request #5672 from svbergerem/bootstrap-stream-improvements
Bootstrap stream: add spinner and improve comment box
2015-02-16 12:59:41 +01:00
Steffen van Bergerem
4da6b075ad Bootstrap stream: fix interaction buttons 2015-02-16 06:23:34 +01:00
Steffen van Bergerem
f1836580db Bootstrap stream: add spinner and improve comment box 2015-02-16 04:56:35 +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
Jonne Haß
e801c859a8 Merge pull request #5671 from giniouxe/5662-privacy-button-text
Issue #5662 Fix text on change button
2015-02-15 20:38:52 +01:00
Giniouxe
e2866a12ea Issue #5662: Fix text on change button 2015-02-15 20:42:55 +01:00
Jonne Haß
9dbf6b82a8 Merge pull request #5655 from svbergerem/contacts-page-add-invitations
Add invitation link to contacts page
2015-02-15 16:00:20 +01:00
Jonne Haß
0af6fabfc7 Merge pull request #5650 from svbergerem/improve-hovercards-cuke
Make the hovercards cuke more reliable
2015-02-15 15:58:47 +01:00
Jonne Haß
f326b58d31 Merge pull request #5664 from svbergerem/remove-people-last_post
Remove last_post from PeopleController
2015-02-15 15:58:02 +01:00
Jonne Haß
e05ae411eb Merge pull request #5667 from svbergerem/help-section-routing
Add routes for help sections
2015-02-14 22:19:37 +01:00
Steffen van Bergerem
c5468f072f JSHint: Add spyOn as a global variable 2015-02-14 19:44:00 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Jonne Haß
bfa31df813 add editorconfig 2015-02-14 17:07:56 +01:00
Jonne Haß
f980eba0a3 add a missing translation 2015-02-14 12:43:48 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails
profile photos as thumbnails
2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Steffen van Bergerem
d96229fddc Disable SCSS linter 2015-02-13 20:37:41 +01:00
Jonne Haß
84cfaa1cfb Merge pull request #5659 from Zauberstuhl/link_to_remote_profile
Add the ability to link remote user profiles
2015-02-13 20:35:14 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile
related to diaspora/jsxc#77
2015-02-13 19:23:26 +01:00
Jonne Haß
b910adc52b Merge pull request #5663 from svbergerem/pending-specs
Green pending specs for evil query spec tag stream
2015-02-13 13:46:08 +01:00
Jonne Haß
8a0f9352a2 Merge pull request #5661 from svbergerem/bump-markdownit-sanitizer
Bump markdown-it-sanitizer
2015-02-13 13:45:16 +01:00
Steffen van Bergerem
55cb2dd30a Green pending specs for evil query spec tag stream 2015-02-13 12:30:53 +01:00
Steffen van Bergerem
2193ff2b58 Remove last_post from PeopleController 2015-02-13 12:25:50 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
e9179e33ea bump spring 2015-02-13 00:32:50 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Jonne Haß
a5d9d779ff Merge pull request #5653 from goobertron/changelog_typo
Fix typo in Changelog
2015-02-11 21:39:33 +01:00
goobertron
5cad9b3c6c Ahem! 2015-02-11 20:30:09 +00:00