Andreas N
|
8ff2be24f2
|
fixed rake task wording
|
2015-01-04 23:09:30 +01:00 |
|
nilsding
|
9e0abc342a
|
redirect to login page
|
2015-01-03 22:48:59 +01:00 |
|
nilsding
|
59b431513b
|
made privacy_allow_stranger_answers work
|
2015-01-03 22:37:10 +01:00 |
|
nilsding
|
cdfe5564d6
|
made C-RET work again
|
2015-01-03 22:36:51 +01:00 |
|
nilsding
|
997430f909
|
opting-out of the public timeline works now
|
2015-01-03 22:30:40 +01:00 |
|
nilsding
|
09b6a6bc10
|
made that stuff work
|
2015-01-03 22:27:14 +01:00 |
|
nilsding
|
175e113af1
|
an error is now raised if the user does not want to receive anonymous questions
|
2015-01-03 22:06:23 +01:00 |
|
nilsding
|
bc94a729a6
|
users now can enable/disable some privacy settings
|
2015-01-03 21:58:56 +01:00 |
|
nilsding
|
b3348dbfff
|
added a few privacy options to users
|
2015-01-03 21:43:19 +01:00 |
|
nilsding
|
fd4e66bb75
|
Merge branch 'master' into privacy
|
2015-01-03 20:28:20 +01:00 |
|
nilsding
|
f1c0bc5a4c
|
Merge branch 'sweetalert'
|
2015-01-03 19:54:42 +01:00 |
|
Andreas N
|
30189ae6b8
|
fixed overlay z-index
|
2015-01-03 19:53:22 +01:00 |
|
nilsding
|
7d9a0b720d
|
even more fixes
|
2015-01-03 19:49:47 +01:00 |
|
nilsding
|
0485be8eb9
|
report user also now has sweetalert
|
2015-01-03 19:45:14 +01:00 |
|
nilsding
|
d183a79493
|
fixed sweetalert for use with Turbolinks, changed wording
|
2015-01-03 19:43:51 +01:00 |
|
nilsding
|
81becddbd5
|
added pagination to answers
|
2015-01-03 19:24:51 +01:00 |
|
nilsding
|
f53ca1b449
|
the new answer is now shown
|
2015-01-03 19:14:26 +01:00 |
|
nilsding
|
9dc98a3e4e
|
users may not not answer their own question
|
2015-01-03 19:08:09 +01:00 |
|
nilsding
|
aec3e1c800
|
if a question was answered, all occurrences of it in the inbox are now gone
|
2015-01-03 19:02:56 +01:00 |
|
nilsding
|
72140be316
|
moved answer thing to the bottom
|
2015-01-03 19:02:06 +01:00 |
|
Andreas N
|
e22dd08f75
|
Merge remote-tracking branch 'origin/master'
|
2015-01-03 18:57:39 +01:00 |
|
Andreas N
|
a259c19ef0
|
how about some updated design for this
|
2015-01-03 18:57:30 +01:00 |
|
nilsding
|
88b71d8f31
|
added render of the answerbox to the response
|
2015-01-03 18:56:06 +01:00 |
|
nilsding
|
e37907f948
|
removed unnecessary puts
|
2015-01-03 18:42:24 +01:00 |
|
nilsding
|
f4d63ae4e3
|
users now can answer other people's questions
|
2015-01-03 18:41:10 +01:00 |
|
Andreas N
|
f5a469bafa
|
fix alert text for destroying answers
|
2015-01-03 18:40:56 +01:00 |
|
nilsding
|
496ff61a65
|
added User#answered?
|
2015-01-03 18:40:56 +01:00 |
|
nilsding
|
7be7de11cd
|
moved answering code from inbox_controller.rb to answer_controller.rb
|
2015-01-03 18:40:39 +01:00 |
|
nilsding
|
c4c6cb62d8
|
removed redundant line
|
2015-01-03 18:13:18 +01:00 |
|
nilsding
|
8aee9bd69e
|
added User#answer, moved some code from inbox.rb to answer.rb
|
2015-01-03 18:09:56 +01:00 |
|
Andreas N
|
9d3b8cced4
|
replaced alerts with sweetAlert
|
2015-01-03 17:36:55 +01:00 |
|
Andreas N
|
ac9738d058
|
added sweetalert scripts
|
2015-01-03 16:54:10 +01:00 |
|
Andreas N
|
c6e7170e7b
|
added sweetalert styles
|
2015-01-03 16:51:57 +01:00 |
|
Andreas N
|
4fc98d5980
|
added sweetalert-rails
|
2015-01-03 16:51:00 +01:00 |
|
Andreas N
|
82924cfbec
|
fix profile size indifference
|
2015-01-03 15:23:43 +01:00 |
|
Andreas N
|
ca222f86c8
|
fix profile-text margin
|
2015-01-03 04:32:26 +01:00 |
|
Andreas N
|
a09cb9431f
|
revert 'fixed button layout on mobile devices'
|
2015-01-03 04:29:43 +01:00 |
|
Andreas N
|
0881f4a999
|
fixed button layout on mobile devices
|
2015-01-03 04:25:25 +01:00 |
|
Andreas N
|
efee32a024
|
Merge remote-tracking branch 'origin/master'
|
2015-01-03 04:22:22 +01:00 |
|
Andreas N
|
d06802fd41
|
fixed button layout on mobile devices
|
2015-01-03 04:22:10 +01:00 |
|
nilsding
|
98af66be63
|
Merge remote-tracking branch 'origin/master'
|
2015-01-03 04:01:52 +01:00 |
|
nilsding
|
ddae3c6278
|
crapkit sucks
|
2015-01-03 04:01:42 +01:00 |
|
Andreas N
|
c871f63f8a
|
brighter gray
|
2015-01-03 04:01:25 +01:00 |
|
nilsding
|
85c32346b0
|
Merge branch 'master' of 10.2.0.1:justask/justask
|
2015-01-03 03:56:22 +01:00 |
|
Andreas N
|
639fa43a5a
|
fix indentation
|
2015-01-03 03:56:14 +01:00 |
|
Andreas N
|
1c7b064dbd
|
removed this shit
|
2015-01-03 03:54:30 +01:00 |
|
Andreas N
|
6bf1c6bb01
|
changed background color
|
2015-01-03 03:52:50 +01:00 |
|
nilsding
|
9869a46fef
|
Revert "attempt fix for #39"
This reverts commit 16f319a0a6.
|
2015-01-03 03:50:54 +01:00 |
|
Andreas N
|
15605682b2
|
fix
|
2015-01-03 03:47:48 +01:00 |
|
Andreas N
|
34a5b56555
|
added follow button to dim view
|
2015-01-03 03:43:32 +01:00 |