Andreas N
|
053a2d695c
|
I think this is causing some problems with the design
|
2015-01-14 19:30:48 +01:00 |
|
Andreas N
|
1497f97395
|
attempt to center input
|
2015-01-14 15:44:27 +01:00 |
|
nilsding
|
d7350838ba
|
Merge branch 'master' into groups
|
2015-01-13 23:13:38 +01:00 |
|
nilsding
|
5f3feaa4e6
|
MAXIMUM SASS™
|
2015-01-13 22:55:45 +01:00 |
|
Andreas N
|
1b0b505ec9
|
another try
|
2015-01-13 22:37:02 +01:00 |
|
Andreas N
|
1c40721688
|
hopefully
|
2015-01-13 22:34:48 +01:00 |
|
Andreas N
|
9e1de238da
|
please
|
2015-01-13 22:32:23 +01:00 |
|
Andreas N
|
20f01094b5
|
stupid overrides
|
2015-01-13 22:15:18 +01:00 |
|
Andreas N
|
bb7cb3ded0
|
change the primary color to purple
|
2015-01-13 22:10:45 +01:00 |
|
Andreas N
|
e834a1ae29
|
change the primary color to purple
|
2015-01-13 22:03:43 +01:00 |
|
nilsding
|
3d34f916c9
|
Merge branch 'master' into navbar-color
Conflicts:
app/assets/stylesheets/application.css.scss
|
2015-01-13 21:56:00 +01:00 |
|
nilsding
|
0ee58e0d20
|
it doesn't make much sense changing the variables after loading bootstrap
|
2015-01-13 21:54:56 +01:00 |
|
Andreas N
|
40a5689a4b
|
cool new navbar colours
|
2015-01-13 21:53:47 +01:00 |
|
Andreas N
|
c1e6945bff
|
cool new navbar colours
|
2015-01-13 21:27:39 +01:00 |
|
nilsding
|
14eb6b035b
|
Revert "got rid of nprogress"
This reverts commit 3574993746.
|
2015-01-13 19:49:43 +01:00 |
|
nilsding
|
a05d763b75
|
selecting the group from the ask followers modal works now.
|
2015-01-13 15:45:32 +01:00 |
|
nilsding
|
1bb369aa7d
|
implemented basic functionality of YE OLDE BANHAMMER!
|
2015-01-12 22:44:13 +01:00 |
|
nilsding
|
3574993746
|
got rid of nprogress
|
2015-01-12 15:53:14 +01:00 |
|
nilsding
|
bc826f07fe
|
moved Piwik code to its own file
|
2015-01-10 18:53:25 +01:00 |
|
Andreas N
|
bbfba492ae
|
change the line height for answers
|
2015-01-09 22:03:58 +01:00 |
|
Andreas N
|
e2564f4d37
|
pretty much the worst issue I ever caused
|
2015-01-09 21:59:26 +01:00 |
|
Andreas N
|
16cb29852f
|
fix shit
|
2015-01-09 21:57:30 +01:00 |
|
Andreas N
|
3e88abe36d
|
updated answerbox design
|
2015-01-09 21:44:41 +01:00 |
|
ix
|
054ece5aed
|
its not a button ok
|
2015-01-07 19:59:42 +01:00 |
|
ix
|
66734193b0
|
pressing ctrl/meta + m toggles the question box
|
2015-01-07 19:58:43 +01:00 |
|
ix
|
26c21e6a27
|
fixed being unable to use cmd+enter on macs
|
2015-01-07 00:52:19 +01:00 |
|
ix
|
f76603a071
|
manual merge??
|
2015-01-06 18:59:52 +01:00 |
|
ix
|
221025fef7
|
fixed tooltip loading on loading more questions/answers
|
2015-01-06 18:56:43 +01:00 |
|
Andreas N
|
4b114b0cab
|
fixed badge size
|
2015-01-06 15:35:16 +01:00 |
|
Andreas N
|
0d784aee47
|
finish implementing new badge design
|
2015-01-06 15:32:14 +01:00 |
|
Andreas N
|
17afe26171
|
added new profile badge display
|
2015-01-06 15:26:24 +01:00 |
|
Andreas N
|
11cd8b59f8
|
fix broken labels
|
2015-01-05 00:50:27 +01:00 |
|
nilsding
|
cdfe5564d6
|
made C-RET work again
|
2015-01-03 22:36:51 +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
|
f53ca1b449
|
the new answer is now shown
|
2015-01-03 19:14:26 +01:00 |
|
nilsding
|
88b71d8f31
|
added render of the answerbox to the response
|
2015-01-03 18:56:06 +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
|
7be7de11cd
|
moved answering code from inbox_controller.rb to answer_controller.rb
|
2015-01-03 18:40:39 +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
|
ca222f86c8
|
fix profile-text margin
|
2015-01-03 04:32:26 +01:00 |
|
Andreas N
|
c871f63f8a
|
brighter gray
|
2015-01-03 04:01:25 +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 |