Skip to content
This repository was archived by the owner on Apr 17, 2018. It is now read-only.

Realnames #96

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Realnames #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed22f70
Merge branch 'master' of https://github.com/tricycle/lesswrong
LucasSloan Jul 9, 2013
3a61c26
Merge branch 'master' of https://github.com/tricycle/lesswrong
LucasSloan Jan 6, 2014
300ada3
Merge branch 'master' of https://github.com/tricycle/lesswrong
LucasSloan Apr 15, 2014
d3078f7
New feature - real names. Add a real name in preferences and user fa…
LucasSloan Apr 22, 2014
fec33b9
New feature - real names. Add a real name in preferences and user fa…
LucasSloan Apr 22, 2014
1a2f01c
Merge branch 'realnames' of https://github.com/PotatoDumplings/lesswr…
LucasSloan Apr 22, 2014
bdba277
Allow real names to use full Unicode character set.
LucasSloan May 6, 2014
2dff67e
Removed unnecessary Account commit.
Jul 26, 2014
e3dea7f
Move realname error checking into a multiple boolean, not multiple if…
LucasSloan Dec 22, 2014
30b9399
Clear the realname field to remove a realname.
LucasSloan Jan 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Merge branch 'master' of https://github.com/tricycle/lesswrong 
Conflicts:
	r2/r2/public/static/main.css
	r2/r2/public/static/main.js
  • Loading branch information
@LucasSloan
LucasSloan committed Jul 9, 2013
commit ed22f700d7b1efc7fccc45f831878fc3338da298
3 changes: 3 additions & 0 deletions r2/r2/public/static/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,10 @@ div.message div.message div.message div.message div.message div.message div.mess
.new-comment,
div.comment div.new-comment {
border: 5px solid #eed1ee !important;
<<<<<<< HEAD
/* padding: 10px 0 10px 10px !important; */
=======
>>>>>>> 83ffb6762b46878ecca867619bc3195dc1f1ccb0
padding: 0 0 0 10px !important;
margin-right: 0 !important;
}
Expand Down
4 changes: 4 additions & 0 deletions r2/r2/public/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ $(document).ready(function() {
// Button tooltips
$('div.tools div.vote a, div.tools div.boxright a.edit, div.tools div.boxright a.save, \
div.boxright a.hide, div.comment-links ul li a, \
<<<<<<< HEAD
div.boxright img, .CC_info, div.boxright a, \
=======
div.boxright img, div.tools a.license, \
>>>>>>> 83ffb6762b46878ecca867619bc3195dc1f1ccb0
.userinfo .score, .userinfo .monthly-score, .votes').qtip({
position: {
my: 'bottom center',
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.