Andreas N
|
050d94e8d7
|
update group membership modal
|
2015-01-14 15:35:53 +01:00 |
Andreas N
|
42534982d6
|
move icons
|
2015-01-14 14:20:04 +01:00 |
Andreas N
|
03eb5ad738
|
Merge remote-tracking branch 'origin/master'
|
2015-01-14 14:17:33 +01:00 |
Andreas N
|
3fe879768f
|
updated sharing section
|
2015-01-14 14:17:24 +01:00 |
nilsding
|
0c97ae60d4
|
finally got rid of that .each
|
2015-01-14 07:50:27 +01:00 |
nilsding
|
642be7996d
|
added Fontawesome icon
|
2015-01-14 07:32:43 +01:00 |
nilsding
|
c99fe89235
|
added group memberships modal
|
2015-01-14 07:07:40 +01:00 |
nilsding
|
f907c4b5a8
|
returning 404 if group was not found
|
2015-01-13 23:21:16 +01:00 |
nilsding
|
d7350838ba
|
Merge branch 'master' into groups
|
2015-01-13 23:13:38 +01:00 |
Andreas N
|
f350f2806a
|
change theme-color
|
2015-01-13 22:57:50 +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 |
Andreas N
|
3316ccb7bc
|
fix indentation
|
2015-01-13 19:06:26 +01:00 |
Andreas N
|
e0871a661b
|
fix sharing settings
|
2015-01-13 19:04:27 +01:00 |
Andreas N
|
1ed216df25
|
update sharing settings
|
2015-01-13 18:59:58 +01:00 |
nilsding
|
a05d763b75
|
selecting the group from the ask followers modal works now.
|
2015-01-13 15:45:32 +01:00 |
nilsding
|
9b0b2df18e
|
added %select to the ask followers modal
|
2015-01-13 14:50:28 +01:00 |
nilsding
|
a8ed21942e
|
added group_timelines
|
2015-01-13 13:23:12 +01:00 |
nilsding
|
eaa4096af5
|
Merge branch 'master' into groups
Conflicts:
db/schema.rb
|
2015-01-13 07:05:11 +01:00 |
nilsding
|
65e514c55d
|
added sharing to Tumblr
|
2015-01-13 00:12:48 +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
|
38e5550241
|
strip blank spaces
|
2015-01-12 13:08:10 +01:00 |
nilsding
|
9de917fb23
|
closes GitHub issue #57
|
2015-01-12 13:00:00 +01:00 |
nilsding
|
011150ba17
|
added a lock icon
|
2015-01-12 07:08:06 +01:00 |
nilsding
|
f93624fa2c
|
added groups route thing
|
2015-01-12 06:57:43 +01:00 |
nilsding
|
d1a6c512c4
|
finally corrected that model thing.
|
2015-01-12 06:41:44 +01:00 |
nilsding
|
5e26d72d91
|
finally commited the stuff I wrote 4 hours ago
|
2015-01-10 23:29:04 +01:00 |
nilsding
|
bc826f07fe
|
moved Piwik code to its own file
|
2015-01-10 18:53:25 +01:00 |
Andreas N
|
01ac598c20
|
android sure has weird preferences
|
2015-01-10 13:58:19 +01:00 |
Andreas N
|
460f5c377d
|
more tries to fix
|
2015-01-10 13:56:39 +01:00 |
Andreas N
|
7937bff707
|
let's see if we can fix this
|
2015-01-10 13:50:08 +01:00 |
Andreas N
|
1a9df6da6c
|
added new favicons
|
2015-01-10 13:43:02 +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
|
77259d8cef
|
Merge remote-tracking branch 'origin/master'
|
2015-01-09 21:54:18 +01:00 |
Andreas N
|
273624f679
|
updated answerbox design
|
2015-01-09 21:52:09 +01:00 |
Andreas N
|
3e88abe36d
|
updated answerbox design
|
2015-01-09 21:44:41 +01:00 |
nilsding
|
6fcbee55c4
|
added forbidden user names (including case insensitivity!)
|
2015-01-09 14:12:52 +01:00 |
nilsding
|
081a9ee4a8
|
vittu
|
2015-01-08 22:54:10 +01:00 |
nilsding
|
03ac252dca
|
fixed fuckup
|
2015-01-08 22:53:29 +01:00 |
Andreas N
|
7882ccbc03
|
how about design update
|
2015-01-08 22:50:59 +01:00 |
nilsding
|
d97763eda0
|
Revert "Le Funny Emoji Meme Face x--DD"
This reverts commit 5118ba9761 .
|
2015-01-08 22:34:50 +01:00 |
nilsding
|
5118ba9761
|
Le Funny Emoji Meme Face x--DD
|
2015-01-08 22:28:56 +01:00 |
nilsding
|
c2811e65ce
|
fixed indentation
|
2015-01-08 18:23:03 +01:00 |
nilsding
|
181a6b72b0
|
pagination for notifications
|
2015-01-08 18:22:27 +01:00 |
nilsding
|
6b28c35d4a
|
the pointy face should work again????
|
2015-01-08 18:10:20 +01:00 |
nilsding
|
ce7f896e0c
|
added Group model
|
2015-01-08 13:16:13 +01:00 |
Andreas N
|
52791b737b
|
added link to FAQ page
|
2015-01-07 22:06:21 +01:00 |
Andreas N
|
4a8eee158d
|
fixed faq page
|
2015-01-07 21:57:46 +01:00 |
Andreas N
|
546bc67bba
|
fixed faq page
|
2015-01-07 21:52:56 +01:00 |
Andreas N
|
6ca96aaa71
|
fixed faq page
|
2015-01-07 21:50:44 +01:00 |
Andreas N
|
0d4a271299
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2015-01-07 21:37:22 +01:00 |
Andreas N
|
4161002da0
|
added faq page
|
2015-01-07 21:30:52 +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
|
d8f964bda2
|
added en language to layout (for screenreaders)
|
2015-01-07 16:02:02 +01:00 |
nilsding
|
ddfba921c9
|
removed %p tag
|
2015-01-07 13:59:04 +01:00 |
nilsding
|
a8d533cef7
|
markdown for comments and in the bio
|
2015-01-07 07:02:07 +01:00 |
ix
|
90cff830a2
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2015-01-07 00:52:41 +01:00 |
ix
|
26c21e6a27
|
fixed being unable to use cmd+enter on macs
|
2015-01-07 00:52:19 +01:00 |
nilsding
|
0916628c43
|
added link to bug tracker
|
2015-01-07 00:36:09 +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
|
1b4eb15152
|
tooltips for smiles
|
2015-01-06 17:33:02 +01:00 |
Andreas N
|
4b114b0cab
|
fixed badge size
|
2015-01-06 15:35:16 +01:00 |
Andreas N
|
7b37676be2
|
Merge remote-tracking branch 'origin/master'
|
2015-01-06 15:32:25 +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 |
nilsding
|
3567ba6190
|
numbers
|
2015-01-05 10:16:00 +01:00 |
Andreas N
|
11cd8b59f8
|
fix broken labels
|
2015-01-05 00:50:27 +01:00 |
Andreas N
|
fcf7d430eb
|
updated about page even more
|
2015-01-05 00:32:58 +01:00 |
Andreas N
|
e1563da2f3
|
updated about page
|
2015-01-05 00:10:35 +01:00 |
Andreas N
|
124d588b39
|
added kyr to team display
|
2015-01-05 00:02:13 +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
|
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
|
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 |
Andreas N
|
16f319a0a6
|
attempt fix for #39
|
2015-01-03 03:12:01 +01:00 |
Andreas N
|
c71061c5a3
|
even more design updates
|
2015-01-03 02:14:49 +01:00 |
Andreas N
|
c74f4086eb
|
even more design updates
|
2015-01-03 02:13:53 +01:00 |
Andreas N
|
dfb879899a
|
even more design updates
|
2015-01-03 02:08:09 +01:00 |
Andreas N
|
e25b05297f
|
even more design updatess
|
2015-01-03 02:00:54 +01:00 |
Andreas N
|
6ab87a5431
|
add cool new profile panel design
|
2015-01-03 01:58:27 +01:00 |
Andreas N
|
75fb90c9e5
|
add cool new profile panel design
|
2015-01-03 01:49:56 +01:00 |
Andreas N
|
00250ddcab
|
fix this shit, take 2
|
2015-01-03 00:33:10 +01:00 |
Andreas N
|
e6eff218b5
|
fix this shit
|
2015-01-03 00:32:07 +01:00 |
Andreas N
|
aa6c892eb3
|
added supporter display
|
2015-01-03 00:24:06 +01:00 |
nilsding
|
74ece9d971
|
added privacy setting routes
this took me longer than it should have taken
|
2015-01-02 21:34:56 +01:00 |
Andreas N
|
dd21ce344b
|
fixed button, or attempt fix
|
2015-01-02 17:40:34 +01:00 |
Andreas N
|
65445954c8
|
moved button on different sizes to navbar or right side
|
2015-01-02 17:27:44 +01:00 |
Andreas N
|
97086a8a9a
|
add privacy tab
|
2015-01-02 01:09:04 +01:00 |
Andreas N
|
57f469e429
|
you can report yourself anymore in comments
|
2015-01-02 00:41:26 +01:00 |
Andreas N
|
ed9c7e945d
|
you can report yourself anymore
|
2015-01-02 00:38:59 +01:00 |
Andreas N
|
26f21f8e97
|
fixed #37
|
2015-01-02 00:28:19 +01:00 |
Andreas N
|
806d83fc0c
|
updated css
|
2015-01-01 19:45:34 +01:00 |
Andreas N
|
dc558902f4
|
Merge remote-tracking branch 'origin/master'
|
2015-01-01 19:10:41 +01:00 |
Andreas N
|
d5b538461e
|
added moderator display to about page
|
2015-01-01 19:10:31 +01:00 |
nilsding
|
f6e405c2e9
|
url: HTTPS!
|
2015-01-01 18:55:17 +01:00 |
nilsding
|
5c0fd6838f
|
hmm?
|
2015-01-01 18:45:15 +01:00 |
nilsding
|
4a49b7fc27
|
ffffff
|
2015-01-01 18:19:02 +01:00 |
nilsding
|
b76a78bdfb
|
also this
|
2015-01-01 18:17:40 +01:00 |
nilsding
|
e9ab8deb85
|
:async
|
2015-01-01 18:17:34 +01:00 |
nilsding
|
149868c097
|
this should do.
|
2015-01-01 18:08:16 +01:00 |
nilsding
|
5df705cdaa
|
argh
|
2015-01-01 17:59:24 +01:00 |
nilsding
|
dee2ba253e
|
fix this shit
|
2015-01-01 17:54:16 +01:00 |
nilsding
|
77b92b0b23
|
changed a few Devise views
|
2015-01-01 17:50:25 +01:00 |
nilsding
|
ed6e91c33f
|
changed about avatar
|
2015-01-01 17:21:39 +01:00 |
Andreas N
|
ba0e39e99b
|
Merge remote-tracking branch 'origin/master'
|
2015-01-01 17:09:30 +01:00 |
Andreas N
|
96704c06da
|
updated bugtracker link in about page
|
2015-01-01 17:09:15 +01:00 |
nilsding
|
1d3848424d
|
changed regex for matching user mentions
|
2014-12-31 16:02:34 +01:00 |
nilsding
|
7d504778b0
|
"Delete all" button is now disabled properly and the ibCount is now incremented by 1 (closes GitHub issues #34 and #27)
|
2014-12-30 16:20:47 +01:00 |
nilsding
|
daa8eefff6
|
temp fix
|
2014-12-29 22:01:54 +01:00 |
nilsding
|
8998b84027
|
updateVars is now called when the image finished loading
|
2014-12-29 17:22:43 +01:00 |
nilsding
|
338fa5bdb2
|
divide by scale
|
2014-12-29 16:39:27 +01:00 |
nilsding
|
fa16612ba8
|
made the new cropper work
|
2014-12-29 16:29:46 +01:00 |
nilsding
|
26363c4742
|
added jquery.guillotine
|
2014-12-29 15:47:10 +01:00 |
nilsding
|
f7cb3478be
|
:medium everywhere
|
2014-12-29 14:57:16 +01:00 |
nilsding
|
e7a0d77fd4
|
changed flash thing
|
2014-12-29 14:54:32 +01:00 |
nilsding
|
3e033cc102
|
permit more params!
|
2014-12-29 14:52:06 +01:00 |
nilsding
|
7aa954e212
|
added cropper processor
|
2014-12-29 14:51:52 +01:00 |
nilsding
|
b61a631f15
|
added hidden fields
|
2014-12-29 14:50:25 +01:00 |
nilsding
|
4adc6eec09
|
ugh
|
2014-12-29 14:49:57 +01:00 |
nilsding
|
bba9fb8354
|
removed gravatar warning
|
2014-12-29 13:56:23 +01:00 |
nilsding
|
5071e3ffe8
|
added JCrop to view
|
2014-12-29 13:52:19 +01:00 |
nilsding
|
7074a1edf7
|
mark gravatar-url as deprecated
|
2014-12-29 12:56:41 +01:00 |
nilsding
|
b378a03afa
|
added delayed_paperclip
|
2014-12-29 11:58:01 +01:00 |
nilsding
|
678e03deed
|
uploading profile pictures works now
|
2014-12-29 11:21:43 +01:00 |
nilsding
|
501f039e7f
|
gravatar_url returns the users' profile_picture
|
2014-12-29 10:18:38 +01:00 |
nilsding
|
cf3933271a
|
added profile_picture to users
|
2014-12-29 10:18:12 +01:00 |
nilsding
|
f6ceafb710
|
added jquery.Jcrop
|
2014-12-29 09:39:47 +01:00 |
Andreas N
|
70ac565e6b
|
added following information thingy
|
2014-12-29 02:32:44 +01:00 |
nilsding
|
65e90e1c64
|
reporting users works as well.
|
2014-12-29 01:47:04 +01:00 |
nilsding
|
27558f83c4
|
made tabs work
|
2014-12-29 01:25:48 +01:00 |
nilsding
|
34a2f3cd6b
|
deleting comments works now
|
2014-12-29 01:05:30 +01:00 |
nilsding
|
a0c0d68e43
|
posting moderation comments works now
|
2014-12-29 00:50:14 +01:00 |
nilsding
|
b7b5ee960e
|
deleting reports works now
|
2014-12-29 00:21:06 +01:00 |
nilsding
|
486d5d18f2
|
this fucker finally works how I want it to
|
2014-12-28 23:57:07 +01:00 |
nilsding
|
7a0b3f4af7
|
added votes for reports
|
2014-12-28 23:26:16 +01:00 |
nilsding
|
3f3591c6e7
|
removed hardcoded occurrences of "justask"
|
2014-12-28 22:39:10 +01:00 |
nilsding
|
49c371302c
|
unique smiles only!
|
2014-12-28 22:15:25 +01:00 |
nilsding
|
40f54fd19a
|
more before_destroy and after_create
|
2014-12-28 21:58:35 +01:00 |
nilsding
|
bb3e431393
|
added associations for this
|
2014-12-28 21:47:51 +01:00 |
nilsding
|
2c29dd9a18
|
even more after_create and before_destroy
|
2014-12-28 21:46:57 +01:00 |
nilsding
|
7d157cde8f
|
dependent: :destroy
|
2014-12-28 21:42:21 +01:00 |
nilsding
|
9c9c4fdc5d
|
after_create and before_destroy
|
2014-12-28 21:40:33 +01:00 |