FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-01-01 17:09:30 +01:00
parent 96704c06da 1d3848424d
commit ba0e39e99b
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TODO
View File

@ -1,27 +1,27 @@
Not done: Not done:
[001| 0%] user blocking (prohibits blocked user from asking question to that person and seeing their answers) [001| 0%] user blocking (prohibits blocked user from asking question to that person and seeing their answers)
[003| 0%] file uploads (for now only avatars, file uploads for embedding images in questions MAYBE LATER) [003| 50%] file uploads (for now only avatars, file uploads for embedding images in questions MAYBE LATER)
[006| 0%] privacy options (e.g. profile visible for members only, disable anonymous questions, opt-out from public timeline) [006| 0%] privacy options (e.g. profile visible for members only, disable anonymous questions, opt-out from public timeline)
[007| 0%] (?) keyboard shortcuts [007| 0%] (?) keyboard shortcuts
[008| 0%] make email work! [008| 0%] make email work!
[010| 0%] locales (these can wait for now) [010| 0%] locales (these can wait for now)
[012| 0%] (?) open source the entire thing – in late 2015 or 2016 maybe, after we got bought by fakelook. [012| 0%] (?) open source the entire thing – in late 2015 or 2016 maybe, after we got bought by fakelook.
[015| 0%] make a public accessible API (maybe even as an oauth provider?) [015| 0%] make a public accessible API (maybe even as an oauth provider?)
[016| 0%] WRYYYYte more specs [016| 5%] WRYYYYte more specs
[017| 0%] write "terms of service" and a privacy policy. [017| 0%] write "terms of service" and a privacy policy.
[018| 0%] that annoying "we use cookies" thing every website in the EU must? add [018| 0%] that annoying "we use cookies" thing every website in the EU must? add
[020| 0%] helper function for profile headings to resize on certain string length [020| 0%] helper function for profile headings to resize on certain string length
[021| 0%] deleting comments [021|100%] deleting comments
|----- restructure comment design |----- restructure comment design
[022| 0%] recommended follows [022| 0%] recommended follows
[023| 0%] disabling group-questions [023| 0%] disabling group-questions
[024| 0%] disabling questions from certain users [024| 0%] disabling questions from certain users
[025| 0%] answering options (sharing/nsfw/private) in inbox panels [025| 0%] answering options (sharing/nsfw/private) in inbox panels
[026| 0%] profile headers [026| 0%] profile headers
[027| 0%] moderation [027| 66%] moderation
|----- moderator user group |----- moderator user group √
|----- moderation panel |----- moderation panel √
|----- ability to report questions |----- ability to report questions ×
In Progress: In Progress:
[011| 75%] auto-posting to other services (twatter, fakelook) [011| 75%] auto-posting to other services (twatter, fakelook)

7
app/assets/javascripts/inbox.coffee
View File

@ -11,7 +11,7 @@
# GitHub issue #26: # GitHub issue #26:
del_all_btn = ($ "button#ib-delete-all") del_all_btn = ($ "button#ib-delete-all")
del_all_btn.removeAttr 'disabled' del_all_btn.removeAttr 'disabled'
del_all_btn[0].dataset.ibCount = 1 del_all_btn[0].dataset.ibCount = (Number del_all_btn[0].dataset.ibCount) + 1
error: (jqxhr, status, error) -> error: (jqxhr, status, error) ->
console.log jqxhr, status, error console.log jqxhr, status, error
showNotification "An error occurred, a developer should check the console for details", false showNotification "An error occurred, a developer should check the console for details", false
@ -40,9 +40,10 @@
console.log jqxhr, status, error console.log jqxhr, status, error
showNotification "An error occurred, a developer should check the console for details", false showNotification "An error occurred, a developer should check the console for details", false
complete: (jqxhr, status) -> complete: (jqxhr, status) ->
btn.button "reset"
if succ if succ
btn.prop "disabled", true # this doesn't really work like I wanted it to… # and now: a (broken?) re-implementation of Bootstrap's button.js
btn.html btn.data('resetText')
btn.removeClass 'disabled'
btn[0].dataset.ibCount = 0 btn[0].dataset.ibCount = 0

2
app/services/flavored_markdown.rb
View File

@ -6,7 +6,7 @@ class FlavoredMarkdown < Redcarpet::Render::HTML
end end
def wrap_mentions(text) def wrap_mentions(text)
text.gsub! /(^|\s)(@\w+)/ do text.gsub! /(^|\s)(@[a-zA-Z0-9_]{1,16})/ do
"#{$1}[#{$2}](#{show_user_profile_path $2.tr('@', '')})" "#{$1}[#{$2}](#{show_user_profile_path $2.tr('@', '')})"
end end
text text

4
app/views/static/about.html.haml
View File

@ -21,14 +21,14 @@
.media .media
.pull-left .pull-left
%a{href: show_user_profile_path('nilsding')} %a{href: show_user_profile_path('nilsding')}
%img.img-rounded.answerbox--img{src: gravatar_url('nilsding@nilsding.org')} %img.img-rounded.answerbox--img{src: User.find_by_screen_name('nilsding').profile_picture.url}
.media-body .media-body
%h4.entry-text.entry-about nilsding %h4.entry-text.entry-about nilsding
%h6.entry-subtext Backend, Server & Code %h6.entry-subtext Backend, Server & Code
.media .media
.pull-left .pull-left
%a{href: show_user_profile_path('pixeldesu')} %a{href: show_user_profile_path('pixeldesu')}
%img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu@outlook.com')} %img.img-rounded.answerbox--img{src: User.find_by_screen_name('pixeldesu').profile_picture.url}
.media-body .media-body
%h4.entry-text.entry-about pixeldesu %h4.entry-text.entry-about pixeldesu
%h6.entry-subtext Frontend Design & Layout %h6.entry-subtext Frontend Design & Layout