Andreas N
|
f158acff3f
|
added delete button to moderationbox
|
2014-12-28 20:13:45 +01:00 |
|
nilsding
|
7bfa5132dd
|
added link to the reported object
|
2014-12-28 20:05:30 +01:00 |
|
nilsding
|
ce280fffa1
|
reporting things via ajax works now
|
2014-12-28 19:55:50 +01:00 |
|
nilsding
|
3f24542410
|
added git info for development rails env
|
2014-12-28 19:45:49 +01:00 |
|
nilsding
|
90fe42e643
|
Merge remote-tracking branch 'origin/master' into moderation
Conflicts:
app/models/user.rb
|
2014-12-28 19:29:01 +01:00 |
|
nilsding
|
5829d4f1ef
|
removed unnecessary p tag
|
2014-12-28 19:11:36 +01:00 |
|
nilsding
|
0e4d744478
|
added Markdown to answers
|
2014-12-28 19:06:49 +01:00 |
|
Andreas N
|
05002b8d10
|
added floating ask your followers button
|
2014-12-27 19:18:55 +01:00 |
|
nilsding
|
35e956e692
|
dropdown is now left
|
2014-12-27 18:14:31 +01:00 |
|
Andreas N
|
33694d3820
|
hiding block-button for now
|
2014-12-27 18:12:50 +01:00 |
|
Andreas N
|
d0000f0754
|
block-sized action button
|
2014-12-27 18:10:04 +01:00 |
|
Andreas N
|
8a6d661216
|
added actions for user profile
|
2014-12-27 18:07:25 +01:00 |
|
Andreas N
|
2e048d9472
|
add text for no comments
|
2014-12-27 16:38:07 +01:00 |
|
nilsding
|
cd289a32c4
|
removed report comment thing
|
2014-12-27 16:18:02 +01:00 |
|
nilsding
|
e75284dba0
|
added some view logic
|
2014-12-27 16:14:57 +01:00 |
|
Andreas N
|
84806a8001
|
copy-pasted comment section for moderation
|
2014-12-27 16:09:04 +01:00 |
|
Andreas N
|
56441a4967
|
more fix.
|
2014-12-27 16:03:09 +01:00 |
|
nilsding
|
642d88da07
|
,
|
2014-12-27 15:56:34 +01:00 |
|
nilsding
|
1a131d8c47
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:50:59 +01:00 |
|
Andreas N
|
edeff57293
|
Fixxed!
|
2014-12-27 15:50:36 +01:00 |
|
nilsding
|
5c5edbab13
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:40:07 +01:00 |
|
Andreas N
|
be44301874
|
I hope this finally fixes it ;_;
|
2014-12-27 15:39:45 +01:00 |
|
nilsding
|
27aa704511
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:38:16 +01:00 |
|
Andreas N
|
018a377c24
|
finally
|
2014-12-27 15:38:06 +01:00 |
|
nilsding
|
f1298a416f
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:31:44 +01:00 |
|
Andreas N
|
9522bfa8f0
|
I should probably put that in the right file
|
2014-12-27 15:31:34 +01:00 |
|
nilsding
|
8a23ce0cf3
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:28:10 +01:00 |
|
nilsding
|
4e81467163
|
hhhh
|
2014-12-27 15:28:01 +01:00 |
|
Andreas N
|
2e2c2dac58
|
trying to fix dropdowns
|
2014-12-27 15:27:39 +01:00 |
|
Andreas N
|
1700bfb0f5
|
update comment design again
|
2014-12-27 15:22:30 +01:00 |
|
Andreas N
|
f8d8c13fb9
|
update comment design
|
2014-12-27 15:15:35 +01:00 |
|
Andreas N
|
c7c10b43b9
|
Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
|
2014-12-27 15:13:05 +01:00 |
|
Andreas N
|
395d1691f8
|
update comment design
|
2014-12-27 15:12:57 +01:00 |
|
nilsding
|
260d5cddd7
|
updated delete button
|
2014-12-27 14:59:48 +01:00 |
|
nilsding
|
1a43ae0054
|
UND NACH RECHTS, RECHTS, RECHTS, IMMER NACH RRRECHTS
|
2014-12-27 02:34:01 +01:00 |
|
Andreas N
|
2c8cd5bc3e
|
fix broken dropdown
|
2014-12-27 02:29:57 +01:00 |
|
Andreas N
|
bdd3cd5afc
|
Added button for report/delete actions
|
2014-12-27 02:26:51 +01:00 |
|
Andreas N
|
92af469aa4
|
Merge branch 'master' into moderation
|
2014-12-27 02:12:32 +01:00 |
|
nilsding
|
64d50ad9b4
|
fox'd
|
2014-12-27 01:55:09 +01:00 |
|
nilsding
|
a37cd95f46
|
Merge branch 'master' into notifications-tooltips
|
2014-12-27 01:46:34 +01:00 |
|
nilsding
|
9fe8be1db8
|
Merge branch 'master' of git.rrerr.net:justask/justask
Conflicts:
app/views/shared/_answerbox.html.haml
|
2014-12-27 00:40:02 +01:00 |
|
nilsding
|
c817f32b18
|
j
|
2014-12-27 00:39:03 +01:00 |
|
Andreas N
|
20c173442d
|
remove that button
|
2014-12-27 00:37:42 +01:00 |
|
Andreas N
|
4961a44d59
|
add collapsed view for single answerbox
|
2014-12-27 00:33:45 +01:00 |
|
nilsding
|
d31bfa6d8b
|
added a few placeholders
|
2014-12-27 00:19:55 +01:00 |
|
pixeldesu
|
32ace00f84
|
forgot the extra profile pages
|
2014-12-26 15:32:53 +01:00 |
|
nilsding
|
cb003ce36d
|
added link to moderation panel in navbar
|
2014-12-26 14:09:07 +01:00 |
|
pixeldesu
|
40dc6a140d
|
fix margin if content is empty
|
2014-12-26 13:48:20 +01:00 |
|
pixeldesu
|
e900b794d3
|
increased sidebar size on profile
|
2014-12-26 13:45:29 +01:00 |
|
nilsding
|
9e918fa3dc
|
added moderator to users
|
2014-12-26 13:34:01 +01:00 |
|
pixeldesu
|
f403a0a2f8
|
added tabs, moderation box view and comment display
|
2014-12-25 23:47:11 +01:00 |
|
pixeldesu
|
32623ec2f2
|
added basic mod page
|
2014-12-25 23:14:45 +01:00 |
|
pixeldesu
|
2107ec6270
|
init moderation controller
|
2014-12-25 23:00:33 +01:00 |
|
nilsding
|
b927b3bc87
|
orrrr
|
2014-12-25 15:16:57 +01:00 |
|
nilsding
|
4e2cfd5188
|
???
|
2014-12-25 15:16:10 +01:00 |
|
nilsding
|
de1ef57a8a
|
dose that work
|
2014-12-25 15:13:52 +01:00 |
|
Andreas N
|
9440eafbe8
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-25 14:27:24 +01:00 |
|
Andreas N
|
4f777968e5
|
readded links to questions on user profile
|
2014-12-25 14:26:35 +01:00 |
|
Andreas N
|
a09c01cc44
|
fixed text display for anon questionbox
|
2014-12-25 14:22:49 +01:00 |
|
nilsding
|
22838ebfda
|
Meymeys
|
2014-12-21 23:10:26 +01:00 |
|
Andreas N
|
7429aca044
|
remove br
|
2014-12-21 23:09:16 +01:00 |
|
nilsding
|
98e9fe098f
|
Meymeys
|
2014-12-21 23:07:56 +01:00 |
|
Andreas N
|
40b0097149
|
more fix
|
2014-12-21 23:07:01 +01:00 |
|
Andreas N
|
6201b7043b
|
how to stupid fix
|
2014-12-21 23:05:53 +01:00 |
|
nilsding
|
b01e1791d4
|
Merge remote-tracking branch 'origin/inbox'
|
2014-12-21 23:04:43 +01:00 |
|
Andreas N
|
23af34494e
|
add share on Twitter button
|
2014-12-21 23:01:21 +01:00 |
|
nilsding
|
2169a86615
|
added a count
|
2014-12-21 15:36:57 +01:00 |
|
nilsding
|
dc0b105b46
|
added .panel-title
|
2014-12-21 14:28:33 +01:00 |
|
nilsding
|
7a18790241
|
added disable attribute if there are no questions in the inbox
|
2014-12-21 14:11:35 +01:00 |
|
nilsding
|
1ba34c59d0
|
added "delete all questions" button thing
|
2014-12-21 13:41:57 +01:00 |
|
Andreas N
|
55f1680c18
|
hide delete inbox for now
|
2014-12-20 16:15:59 +01:00 |
|
Andreas N
|
000fa09a5e
|
restructure inbox design
|
2014-12-20 14:37:14 +01:00 |
|
Andreas N
|
ba9b6d1e12
|
add link to question/answer in question display
|
2014-12-20 02:14:27 +01:00 |
|
Andreas N
|
5aa6248cb1
|
icon bar animation shows up when you have new notifications
|
2014-12-20 01:37:05 +01:00 |
|
Andreas N
|
368949a031
|
fix design stuff
|
2014-12-20 00:03:07 +01:00 |
|
Andreas N
|
5d19a975f3
|
indentation is my best friend
|
2014-12-19 23:38:09 +01:00 |
|
Andreas N
|
b074abad4d
|
fuck panel-body
|
2014-12-19 23:35:54 +01:00 |
|
Andreas N
|
7543da2701
|
move profile things into something different
|
2014-12-19 23:33:42 +01:00 |
|
Andreas N
|
bdff6f4110
|
the journey of fixes has finally an end
|
2014-12-19 23:05:45 +01:00 |
|
Andreas N
|
a764632538
|
more fixes and updates
|
2014-12-19 23:03:03 +01:00 |
|
Andreas N
|
c1f0388da4
|
I reached the end of the file, fixing this I finally did it
|
2014-12-19 22:58:06 +01:00 |
|
Andreas N
|
20796654f5
|
more fix
|
2014-12-19 22:57:08 +01:00 |
|
Andreas N
|
f7e35a3977
|
fix stuff
|
2014-12-19 22:56:16 +01:00 |
|
Andreas N
|
e9985ed0aa
|
how about new template
|
2014-12-19 22:52:12 +01:00 |
|
Andreas N
|
75bca2430b
|
added links to pages
|
2014-12-19 22:37:04 +01:00 |
|
Andreas N
|
46c9ccc0ac
|
question page added
|
2014-12-19 22:34:24 +01:00 |
|
Andreas N
|
e483714f44
|
fix headings
|
2014-12-19 22:11:49 +01:00 |
|
Andreas N
|
0f1e0ef3f9
|
fixed missing profile-header
|
2014-12-19 21:49:48 +01:00 |
|
pixeldesu
|
ae27f06df6
|
added tooltips to notification links
|
2014-12-16 16:54:33 +01:00 |
|
pixeldesu
|
c3905791b6
|
move answer link to 'answered by username' section
|
2014-12-16 16:14:42 +01:00 |
|
nilsding
|
a30e6509b5
|
fixed things
|
2014-12-15 07:47:56 +01:00 |
|
nilsding
|
5da0778131
|
fixed link
|
2014-12-14 15:58:39 +01:00 |
|
nilsding
|
1c01ced3c8
|
fixed link
|
2014-12-14 15:49:44 +01:00 |
|
nilsding
|
da537971d1
|
added item
|
2014-12-14 15:48:19 +01:00 |
|
pixeldesu
|
cf78d4758a
|
rounded images
|
2014-12-14 15:44:17 +01:00 |
|
pixeldesu
|
3bcd67d1a4
|
rounded image was missing
|
2014-12-14 15:42:54 +01:00 |
|
pixeldesu
|
91711b24fe
|
add a bit of margin to smiles section
|
2014-12-14 15:41:08 +01:00 |
|
nilsding
|
3eec44f422
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/users-smiled' into notifications
|
2014-12-14 15:29:32 +01:00 |
|
nilsding
|
b0a2072f96
|
made notification tabs work
|
2014-12-14 15:24:59 +01:00 |
|
pixeldesu
|
d963191bd0
|
added smile display to answerbox
|
2014-12-14 15:22:37 +01:00 |
|
nilsding
|
c9d57e235f
|
added route for notifications
|
2014-12-14 15:17:52 +01:00 |
|
nilsding
|
dec91d474d
|
added notification_count
|
2014-12-14 15:15:15 +01:00 |
|
nilsding
|
43474a6c92
|
"commented on your answer"
|
2014-12-14 15:10:23 +01:00 |
|
nilsding
|
154c360e15
|
"smiled your answer"
|
2014-12-14 15:06:10 +01:00 |
|
nilsding
|
c9b5947e6b
|
"followed you"
|
2014-12-14 14:58:29 +01:00 |
|
nilsding
|
2549d94f31
|
made a few things prettier
|
2014-12-14 14:41:44 +01:00 |
|
nilsding
|
ab9347f053
|
notifications work now!
|
2014-12-14 14:34:51 +01:00 |
|
pixeldesu
|
156d92e946
|
fixed typo...or wrong word
|
2014-12-14 13:52:18 +01:00 |
|
pixeldesu
|
1997d36b2f
|
how about I look into how to change the dropdown first
|
2014-12-13 19:48:31 +01:00 |
|
nilsding
|
1870acdd3a
|
fluid
|
2014-12-13 18:24:50 +01:00 |
|
nilsding
|
e1d250cadd
|
change wording
|
2014-12-13 18:20:25 +01:00 |
|
pixeldesu
|
103103764b
|
how about this thing
|
2014-12-13 18:04:52 +01:00 |
|
nilsding
|
de69e84e5a
|
Haml::SyntaxError
|
2014-12-13 18:03:27 +01:00 |
|
pixeldesu
|
3173d70aac
|
added new frontpage design
|
2014-12-13 17:52:58 +01:00 |
|
nilsding
|
935acb7335
|
added layouts/messages to setting views
|
2014-12-13 16:03:18 +01:00 |
|
nilsding
|
a2dae7c5d4
|
checked state is best state
|
2014-12-13 15:49:19 +01:00 |
|
nilsding
|
82277847b9
|
Merge branch 'omniauth'
|
2014-12-13 15:40:50 +01:00 |
|
nilsding
|
013d1d44b7
|
the checkbox should now share to services
|
2014-12-13 15:17:50 +01:00 |
|
pixeldesu
|
461d48556b
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-13 00:55:07 +01:00 |
|
pixeldesu
|
aa1686121a
|
add profile header display
|
2014-12-13 00:55:00 +01:00 |
|
pixeldesu
|
6e154bc462
|
added checkbox for Twitter sharing
|
2014-12-13 00:01:54 +01:00 |
|
nilsding
|
3cd5739ce9
|
added link to Sidekiq::Web
|
2014-12-12 23:58:35 +01:00 |
|
nilsding
|
9168d908dd
|
aw yeah
|
2014-12-12 22:37:52 +01:00 |
|
nilsding
|
c91fbe43b1
|
added Services view.
|
2014-12-12 21:54:17 +01:00 |
|
nilsding
|
f24433d84e
|
added Services controller
|
2014-12-12 21:43:09 +01:00 |
|
pixeldesu
|
c4bdc8fd3e
|
design updates
|
2014-12-12 19:01:34 +01:00 |
|
nilsding
|
54ec828e5b
|
display_all
|
2014-12-12 18:54:17 +01:00 |
|
nilsding
|
4d944e1684
|
Karim abused this too much
|
2014-12-12 18:49:34 +01:00 |
|
pixeldesu
|
a0f883f062
|
hide left sidebar links on smallest screen size
|
2014-12-12 17:48:19 +01:00 |
|
pixeldesu
|
61f9224302
|
how many navs do we need inside a navbar
|
2014-12-12 17:44:04 +01:00 |
|
pixeldesu
|
7c9df66ae7
|
moved public timeline
|
2014-12-12 17:43:32 +01:00 |
|
pixeldesu
|
38c08970c8
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-12 16:50:23 +01:00 |
|
pixeldesu
|
ba7df144d4
|
fix top margin
|
2014-12-12 16:49:15 +01:00 |
|
nilsding
|
ebd0719599
|
foxed about page
|
2014-12-12 16:45:39 +01:00 |
|
pixeldesu
|
3f8fb96975
|
update about page things
|
2014-12-12 16:31:50 +01:00 |
|
nilsding
|
f4ee900ae6
|
slkegjlkd
|
2014-12-11 18:00:24 +01:00 |
|
nilsding
|
40399c8dc1
|
pixel broked it
|
2014-12-11 17:56:52 +01:00 |
|
pixeldesu
|
1d320fd847
|
added navbar toggle animation
|
2014-12-11 15:49:01 +01:00 |
|
nilsding
|
27867a9284
|
added navbar entry for public timeline
|
2014-12-11 06:51:26 +01:00 |
|
nilsding
|
f679bdd659
|
added some panel
|
2014-12-11 06:44:25 +01:00 |
|
nilsding
|
2251a21872
|
added public timeline
|
2014-12-11 06:39:35 +01:00 |
|
pixeldesu
|
0e52a9aef8
|
attempt to fix overlapping comment count
|
2014-12-10 21:16:18 +01:00 |
|
nilsding
|
93540e0969
|
added placeholder.
thank you #based quad
|
2014-12-10 20:38:54 +01:00 |
|
nilsding
|
c8154c1fc2
|
added Piwik tracking
|
2014-12-10 19:54:27 +01:00 |
|
nilsding
|
217683de6c
|
update about page (muh shekels)
|
2014-12-10 19:50:49 +01:00 |
|
pixeldesu
|
9e03ca64e9
|
added gravatar info to settings page
|
2014-12-10 19:38:09 +01:00 |
|
pixeldesu
|
31f520ed4b
|
fix more stuff
|
2014-12-10 19:14:24 +01:00 |
|
pixeldesu
|
2a9db637a0
|
how about no centered text
|
2014-12-10 19:11:06 +01:00 |
|
pixeldesu
|
aa32861f7f
|
new display to generate more questions
|
2014-12-10 19:09:44 +01:00 |
|
nilsding
|
06112b0cce
|
added link to Kontrollzentrum in the navbar for admins
|
2014-12-10 18:23:25 +01:00 |