Andreas N
|
0b2c1b86c8
|
added member listing for groups
|
2015-01-17 19:13:09 +01:00 |
|
nilsding
|
1c26af4c8c
|
@group now holds the current group
|
2015-01-17 19:07:31 +01:00 |
|
nilsding
|
927ec9678f
|
deleting groups works now! finally!!!
|
2015-01-17 18:57:23 +01:00 |
|
Andreas N
|
745f600f60
|
added delete button
|
2015-01-17 18:42:56 +01:00 |
|
Andreas N
|
2ddb39e530
|
added top padding
|
2015-01-17 18:36:46 +01:00 |
|
nilsding
|
a0d0731a6b
|
creating groups works now.
|
2015-01-17 18:24:36 +01:00 |
|
nilsding
|
dd6af3f651
|
adding and removing users to/from groups works now
|
2015-01-17 17:50:25 +01:00 |
|
nilsding
|
0bf59a0bb0
|
fixed that damn tab link border thing
|
2015-01-17 16:26:46 +01:00 |
|
nilsding
|
5fd5af9f47
|
Merge branch 'master' into groups
|
2015-01-17 15:51:52 +01:00 |
|
Andreas N
|
fa3020e36d
|
i honestly don't know whats wrong here
|
2015-01-17 12:45:02 +01:00 |
|
Andreas N
|
c36c3e6472
|
fixed faq
|
2015-01-17 12:41:59 +01:00 |
|
Andreas N
|
ac6c7a5c79
|
Merge remote-tracking branch 'origin/master'
|
2015-01-17 12:39:41 +01:00 |
|
Andreas N
|
599a88c34a
|
updated faq
|
2015-01-17 12:39:31 +01:00 |
|
Andreas N
|
991ad1f838
|
added agree statement to sign in page
|
2015-01-17 12:34:51 +01:00 |
|
Andreas N
|
6871733249
|
update terms of service
|
2015-01-17 09:21:49 +01:00 |
|
Andreas N
|
d5b14f0654
|
update effective date
|
2015-01-17 09:13:56 +01:00 |
|
Andreas N
|
ec62fea665
|
updated screen name validator
|
2015-01-16 23:31:02 +01:00 |
|
Andreas N
|
74e74dedef
|
added terms of service
|
2015-01-16 23:16:28 +01:00 |
|
Andreas N
|
28e72b3adc
|
added panel-body
|
2015-01-16 22:45:00 +01:00 |
|
Andreas N
|
d593e0edd4
|
added privacy policy
|
2015-01-16 22:43:56 +01:00 |
|
Andreas N
|
75ae141759
|
added privacy policy
|
2015-01-16 22:36:39 +01:00 |
|
nilsding
|
53cb527c7f
|
put that damn tooltip in the callback function.
|
2015-01-15 17:47:54 +01:00 |
|
Andreas N
|
597c54aa93
|
remove empty header
|
2015-01-15 16:18:35 +01:00 |
|
Andreas N
|
e90d9777b2
|
update about page with cool header
|
2015-01-15 16:04:59 +01:00 |
|
Andreas N
|
0e052ee1be
|
added tab navigation
|
2015-01-14 20:14:58 +01:00 |
|
Andreas N
|
b99fe56038
|
update design to be condensed
|
2015-01-14 19:57:11 +01:00 |
|
Andreas N
|
0ad2bc9ca2
|
fix indentation
|
2015-01-14 19:37:51 +01:00 |
|
Andreas N
|
053a2d695c
|
I think this is causing some problems with the design
|
2015-01-14 19:30:48 +01:00 |
|
nilsding
|
3ba2b785d4
|
added maximum length for group name
|
2015-01-14 17:48:21 +01:00 |
|
nilsding
|
e5b753681c
|
Merge branch 'master' into groups
|
2015-01-14 17:38:47 +01:00 |
|
Andreas N
|
c557192b61
|
wrapping list-group in panel, just for design stuff
|
2015-01-14 16:29:53 +01:00 |
|
Andreas N
|
1497f97395
|
attempt to center input
|
2015-01-14 15:44:27 +01:00 |
|
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 |