Yuki
|
9734e5463e
|
Merge pull request #33 from colons/master
Do not declare mobile app capability
|
2015-07-28 04:33:56 +05:30 |
Yuki
|
21f2467f45
|
Fix question pagination
|
2015-07-25 23:18:27 +05:30 |
Yuki
|
12b2ec8a3b
|
Turbolinks stop removing the god damn spreadsheet you twat
|
2015-07-24 22:44:16 +05:30 |
Yuki
|
54b051a7e7
|
Temp. layout for testing
|
2015-07-24 22:42:14 +05:30 |
pixeldesu
|
6ea04faf4f
|
update show_follow JS to address changes
|
2015-07-24 17:14:42 +02:00 |
pixeldesu
|
6f65f8c9f4
|
Merge branch 'feature-userbox-header'
|
2015-07-24 17:10:28 +02:00 |
pixeldesu
|
5ce5d69e4a
|
remove the TODO from the userbox
|
2015-07-24 17:09:17 +02:00 |
pixeldesu
|
1a9660bc05
|
update userbox style with headers
|
2015-07-24 17:04:46 +02:00 |
Iain Dawson
|
92ffb71c3b
|
Do not declare mobile app capability.
|
2015-07-24 08:15:44 +01:00 |
Yuki
|
5c2168b9af
|
The copy paste is strong
|
2015-07-23 23:23:51 +05:30 |
Yuki
|
deb6d12108
|
Moderation Priority + IP
|
2015-07-23 23:21:13 +05:30 |
Yuki
|
5c86833601
|
Fix emails
|
2015-07-23 12:12:36 +05:30 |
Yuki
|
38d1c21118
|
Someone wanted even paddings, here you go. also made the support more wide.
|
2015-07-23 11:50:21 +05:30 |
Yuki
|
54e27896f4
|
Add missing ='s to text templates
|
2015-07-21 23:57:59 +05:30 |
Yuki
|
eb85f38220
|
Fix text, add more templates
|
2015-07-21 23:50:54 +05:30 |
Yuki
|
362292716f
|
Mail templating, hopefully
|
2015-07-21 23:43:14 +05:30 |
pixeldesu
|
19d6ccd855
|
change logic for deletion when no user or no question is found
|
2015-07-17 22:31:10 +02:00 |
pixeldesu
|
e1d38ebb89
|
removing more logic from templates + simpler coffeescript
|
2015-07-17 21:45:45 +02:00 |
pixeldesu
|
84f80c824e
|
fix broken pagination and wrong question count for deletion
|
2015-07-17 20:54:11 +02:00 |
pixeldesu
|
e9ae442431
|
add ability to show/search questions from specific users
|
2015-07-17 20:29:19 +02:00 |
pixeldesu
|
ca41890ada
|
replaced big avatar image on main timeline page
|
2015-06-28 01:36:58 +02:00 |
Yuki
|
409c82b5ed
|
Flag switcher
|
2015-06-21 12:33:29 +05:30 |
pixeldesu
|
aab109dd42
|
add sign in count to data page
|
2015-06-21 04:35:27 +02:00 |
pixeldesu
|
c600b0562a
|
copycat mistakes
|
2015-06-20 21:15:38 +02:00 |
pixeldesu
|
f76e997708
|
empty != blank
|
2015-06-20 21:09:30 +02:00 |
pixeldesu
|
58e80919df
|
add data page
|
2015-06-20 20:38:07 +02:00 |
pixeldesu
|
c1faf41305
|
added translator badge to profiles
|
2015-06-19 14:46:23 +02:00 |
pixeldesu
|
1daa44f5bf
|
fixes Retrospring/bugs#82
|
2015-06-17 12:07:51 +02:00 |
Georg G
|
53fe52b3b6
|
fixed wrong style on timestamps in answerbox
|
2015-06-09 18:24:27 +02:00 |
Yuki
|
e5ecea8414
|
Fix third-person notifications showing the wrong user
|
2015-06-09 21:19:29 +05:30 |
Yuki
|
649b1cda3b
|
Fix Retrospring/bugs#77
|
2015-06-09 17:57:49 +05:30 |
Yuki
|
428bd99a63
|
Fix another issue
|
2015-06-09 09:36:09 +05:30 |
pixeldesu
|
341372d874
|
finalize
|
2015-06-08 21:51:46 +02:00 |
pixeldesu
|
a8fd3624b6
|
localize even more final stuff
|
2015-06-08 21:11:35 +02:00 |
pixeldesu
|
d28f64adf1
|
localize placeholders
|
2015-06-08 20:48:23 +02:00 |
pixeldesu
|
7c5f9b082a
|
add missing profile setting locales
|
2015-06-08 16:05:20 +02:00 |
pixeldesu
|
488d582afa
|
add i18n-js and localize javascript (not implemented yet)
|
2015-06-08 16:01:16 +02:00 |
pixeldesu
|
3a4ff794de
|
add some missing locales
|
2015-06-07 23:52:03 +02:00 |
pixeldesu
|
984abbe738
|
git localize flashes
|
2015-06-07 19:03:57 +02:00 |
pixeldesu
|
cd2685a179
|
localized moderation, sidebar, userbox, etc.
|
2015-06-07 16:24:41 +02:00 |
pixeldesu
|
f011fddc9d
|
instead of capitalizing the string in the template, just capitalize the locale
|
2015-06-07 15:34:22 +02:00 |
pixeldesu
|
97f0594d13
|
another attempt to fix test
|
2015-06-07 15:27:34 +02:00 |
pixeldesu
|
4c7ae9ea70
|
whoops, copypasta mistake here
|
2015-06-07 15:25:39 +02:00 |
pixeldesu
|
e006dfde53
|
localize user profile, settings, modals
|
2015-06-07 15:10:17 +02:00 |
Yuki
|
ce2323d675
|
fix tests
|
2015-06-07 06:27:21 +05:30 |
Yuki
|
f564ef724e
|
line 51 of _notification.html.haml line 57 of _notifications.html.haml
|
2015-06-07 06:13:18 +05:30 |
pixeldesu
|
b8c0032986
|
localize notifications (except comments)
|
2015-06-07 01:28:10 +02:00 |
pixeldesu
|
45ec9ebdff
|
Merge remote-tracking branch 'origin/locale' into locale
|
2015-06-07 00:24:50 +02:00 |
pixeldesu
|
75d4d5a07f
|
localize inbox
|
2015-06-07 00:24:27 +02:00 |
Yuki
|
a560efe1c0
|
badumm tiss
|
2015-05-27 08:10:11 +05:30 |
pixeldesu
|
7a0be2519a
|
localize question_header and questionbox
|
2015-05-27 04:31:28 +02:00 |
pixeldesu
|
16ec60aa19
|
localize question
|
2015-05-27 04:13:13 +02:00 |
pixeldesu
|
75a7b393b9
|
Merge remote-tracking branch 'origin/locale' into locale
|
2015-05-27 03:54:04 +02:00 |
pixeldesu
|
7905fe8372
|
localize actions
|
2015-05-27 03:53:53 +02:00 |
Yuki
|
52890707c5
|
less logic in views
|
2015-05-27 06:51:06 +05:30 |
Yuki
|
74bbbdf4ca
|
FILTHY
|
2015-05-27 06:41:21 +05:30 |
pixeldesu
|
9c83972105
|
localized answerbox (trigger warning: horrible code)
|
2015-05-27 02:58:03 +02:00 |
pixeldesu
|
ab0b428e03
|
implemented translations into front, about and discover
|
2015-05-26 21:15:18 +02:00 |
pixeldesu
|
b687b27563
|
use service-docs instead of text in templates
|
2015-05-26 01:35:04 +02:00 |
Yuki
|
67f11828dd
|
Fix CAT-2015-0001
|
2015-05-24 19:38:07 +05:30 |
pixeldesu
|
49dea9095a
|
move Group modal toggle to navbar on desktop
|
2015-05-24 03:58:15 +02:00 |
pixeldesu
|
8753af3b48
|
completely redesign About page
|
2015-05-19 17:48:02 +02:00 |
pixeldesu
|
4400779d00
|
add Most Comments and Most Answered to Discover
|
2015-05-18 00:57:47 +02:00 |
pixeldesu
|
6b08e6fed5
|
tooltips for comment timestamps [ci skip]
|
2015-05-17 05:52:49 +02:00 |
pixeldesu
|
bbb3b806a5
|
Merge remote-tracking branch 'origin/master'
|
2015-05-17 05:36:50 +02:00 |
pixeldesu
|
ab6983001e
|
timestamps for comments and CSS fixes
|
2015-05-17 05:36:23 +02:00 |
Yuki
|
9e3a6e2171
|
Mobile-friendly profile info box
|
2015-05-16 04:09:33 +05:30 |
Georg G
|
f359f32380
|
removed period
|
2015-05-14 13:15:31 +02:00 |
Georg G
|
3e72243639
|
change wording on discover page
|
2015-05-14 13:14:42 +02:00 |
pixeldesu
|
c7cecba025
|
fix type being not set for question pages
|
2015-05-14 02:39:30 +02:00 |
pixeldesu
|
d3e78b8cb7
|
update Discover page title
|
2015-05-14 00:48:26 +02:00 |
pixeldesu
|
773b2917cb
|
Merge branch 'feature-discover'
|
2015-05-14 00:47:23 +02:00 |
pixeldesu
|
023fe26e81
|
finish up Discover page
|
2015-05-14 00:45:01 +02:00 |
Yuki
|
bf68586a80
|
The copy and paste is strong
|
2015-05-14 03:37:09 +05:30 |
Yuki
|
2e1cb4d273
|
Made titles functional, because functional programming is the future
|
2015-05-14 03:32:19 +05:30 |
pixeldesu
|
86b5e9933e
|
add basic functionality
|
2015-05-13 23:55:10 +02:00 |
pixeldesu
|
5c13dda585
|
add tab navigation
|
2015-05-13 22:29:37 +02:00 |
pixeldesu
|
23583fab99
|
add header and page title to discover page
|
2015-05-13 21:20:20 +02:00 |
pixeldesu
|
961ebfd266
|
add routes and empty index for discover
|
2015-05-13 20:56:51 +02:00 |
pixeldesu
|
c27c99b18f
|
add particles to about and faq, update frontpage
|
2015-05-13 16:14:30 +02:00 |
pixeldesu
|
e01ac8dcf6
|
added Particleground to frontpage
|
2015-05-12 23:53:42 +02:00 |
Yuki
|
0ba88942de
|
Fix question headers overflowing into the answers
|
2015-05-13 00:18:06 +05:30 |
pixeldesu
|
884dab5988
|
update panel styles, fixes Retrospring/bugs#51
|
2015-05-11 06:17:12 +02:00 |
pixeldesu
|
d08692340c
|
add pagetitles
|
2015-05-10 19:48:47 +02:00 |
pixeldesu
|
3d5bb16a8f
|
update Terms of Service, adding Code of Conduct
|
2015-05-10 13:39:18 +02:00 |
Yuki
|
b71466535d
|
Fix zooming when cropping header
|
2015-05-08 21:44:54 +05:30 |
Yuki
|
94433f4484
|
trim the fat
|
2015-05-08 21:37:09 +05:30 |
Yuki
|
9633511859
|
Some fixes (whoops used current_user instead of user)
|
2015-05-08 21:34:58 +05:30 |
Yuki
|
975909f197
|
remove unused file
|
2015-05-08 21:24:03 +05:30 |
Yuki
|
2e6ffdaab7
|
basic implementation
|
2015-05-08 21:14:16 +05:30 |
Yuki
|
b2a57da4b2
|
Merge with master
|
2015-05-08 18:58:50 +05:30 |
pixeldesu
|
61fdaf6742
|
= != -
|
2015-05-06 02:07:12 +02:00 |
Georg G.
|
9b39491d88
|
Merge pull request #18 from skiprope/temp-bans
Support for ban reasons and ban times.
|
2015-05-05 16:54:23 +02:00 |
Yuki
|
65c852585d
|
notification tab for comment smiles
|
2015-05-05 02:40:54 +05:30 |
nilsding
|
97b27248c2
|
added CommentSmile to 'Smiles' in the stats section in about page
|
2015-05-04 16:43:48 +02:00 |
Yuki
|
513c41619c
|
Thanks, Mac (remove .DS_Store)
|
2015-05-04 07:41:53 +05:30 |
Yuki
|
2204227273
|
Feature-comment-smiles complete (fix Retrospring/bugs#42)
|
2015-05-04 07:09:47 +05:30 |
Yuki
|
9d14321cd1
|
Fix Retrospring/bugs#41
|
2015-04-30 05:17:55 +05:30 |
Yuki
|
982531ab55
|
don't echo everything omg i need to take pills to make me less stupid or something
|
2015-04-28 17:39:43 +05:30 |
Yuki
|
9688b7ee48
|
Merge stable
|
2015-04-28 10:22:54 +05:30 |
Yuki
|
d012423b29
|
Fix for Retrospring/bugs#41
|
2015-04-28 07:55:46 +05:30 |
pixeldesu
|
bd3564d6f3
|
center question on question page
|
2015-04-27 19:36:02 +02:00 |
Yuki
|
76ac8e1a9d
|
Fix Retrospring/bugs#36
|
2015-04-27 06:51:29 +05:30 |
pixeldesu
|
db474773bd
|
update moderation tab display
|
2015-04-26 13:28:04 +02:00 |
pixeldesu
|
13d67b51f0
|
redirect to root instead of users question site
|
2015-04-26 13:19:04 +02:00 |
pixeldesu
|
aac84c623f
|
fix invisible border on question panel
|
2015-04-26 13:15:03 +02:00 |
Yuki
|
ee29e1f28f
|
Reporting and Deleting logic
|
2015-04-26 07:06:25 +05:30 |
pixeldesu
|
e2f06167dc
|
fix styling and schema
|
2015-04-26 02:46:37 +02:00 |
pixeldesu
|
c8ba89dd1e
|
change question display and add report placeholder
|
2015-04-26 02:18:57 +02:00 |
Yuki
|
ba9262145d
|
Show 'View reported User' in addition to the other buttons if reason.target.user is present
|
2015-04-26 03:23:22 +05:30 |
Yuki
|
4ad9916c7e
|
Rename 'delete answer' to 'return to inbox' for clarity
|
2015-04-24 04:22:52 +05:30 |
Yuki
|
0bb3895ce8
|
Small fixes
|
2015-04-24 00:51:58 +05:30 |
Yuki
|
f4b5289d3a
|
Actually fixes Retrospring/bugs#25
|
2015-04-23 07:03:21 +05:30 |
Yuki
|
5764c36b32
|
DateTime.now -> DateTime.current
|
2015-04-23 06:48:17 +05:30 |
Yuki
|
1184410275
|
Forbid admins getting banned
|
2015-04-23 06:39:23 +05:30 |
Yuki
|
be04d3528c
|
Support for ban reasons and ban times. Fixes Retrospring/bugs#26 and Retrospring/bugs#25
|
2015-04-23 06:26:29 +05:30 |
Georg G.
|
e306d36b10
|
Merge pull request #15 from skiprope/report-reason
Add support for report reasons (fixes Retrospring/bugs#7)
|
2015-04-22 18:25:29 +02:00 |
Georg G
|
667bb155c9
|
fixes Retrospring/bugs#23
|
2015-04-22 18:19:20 +02:00 |
Yuki
|
b9bf0b04b6
|
Add support for report reasons
|
2015-04-22 08:29:10 +05:30 |
Georg G
|
ef4fd30cd9
|
closes Retrospring/bugs#17
|
2015-04-22 00:33:55 +02:00 |
pixeldesu
|
305de8bf7b
|
fix typo
|
2015-04-21 17:41:45 +02:00 |
Georg G
|
1db856c0fe
|
fixed dropdown text for comments
|
2015-04-21 15:46:43 +02:00 |
Yuki
|
8eeae22c43
|
Don't resubscribe if a user unsubscribes and comments again
|
2015-04-21 17:52:32 +05:30 |
Yuki
|
ecffd07344
|
Support for post subscriptions
|
2015-04-21 06:42:11 +05:30 |
Georg G
|
aed2597de0
|
fixed grammar
|
2015-04-20 21:14:59 +02:00 |
Georg G
|
aef20ee485
|
formatting
|
2015-04-20 21:14:05 +02:00 |
Howl
|
aec96e5e4f
|
Add link to bugs tracker and change a bit some stuff
|
2015-04-20 19:02:19 +02:00 |
Georg G
|
b6499ddd42
|
UNCAPS!!!!!!!!!!!
|
2015-04-19 22:38:10 +02:00 |
Georg G
|
d669d66d4a
|
formatting
|
2015-04-19 22:36:50 +02:00 |
Georg G
|
7b637fd81b
|
added contributors to about section
|
2015-04-19 22:31:14 +02:00 |
Georg G
|
c9b7e71290
|
added contributor badge to user profile view
|
2015-04-19 22:25:21 +02:00 |
Georg G
|
ced880fe34
|
made contributor badge changable via web interface
|
2015-04-19 22:25:04 +02:00 |
Georg G
|
55b2a98450
|
fixed notification badge fuckup
|
2015-04-19 17:07:35 +02:00 |
pixeldesu
|
4e185bbaa7
|
change Bootswatch theme, general theme changes, list group helper
|
2015-04-19 16:49:53 +02:00 |
Georg G.
|
a9a12fa7d9
|
Merge pull request #2 from TheHowl/padding-on-links-section
fix horrible link section without padding in about page
|
2015-04-19 00:26:41 +02:00 |
Yuki
|
e2bfc26c75
|
Markdown preview through AJAX (/ajax/preview)
|
2015-04-19 03:47:13 +05:30 |
Howl
|
1032363b5a
|
fix horrible link section in about page
|
2015-04-18 23:45:52 +02:00 |
pixeldesu
|
e1d20db3e0
|
update faq and about
|
2015-04-18 22:06:36 +02:00 |
Georg G
|
71a7effa29
|
changed faq entry
|
2015-04-18 22:01:00 +02:00 |
pixeldesu
|
d46a6ecb38
|
update about page
|
2015-04-18 21:21:45 +02:00 |
pixeldesu
|
723d72c587
|
update about page
|
2015-04-18 21:11:18 +02:00 |
pixeldesu
|
865bbbd6b9
|
add Github link to footer
|
2015-04-18 21:08:20 +02:00 |
nilsding
|
434e1a21bc
|
removed shutdown message
|
2015-04-02 01:31:09 +02:00 |
nilsding
|
47cbbed719
|
made admin listing changeable in justask.yml
|
2015-04-02 01:28:42 +02:00 |
nilsding
|
adee82bdf1
|
le instant troll mode activated
|
2015-03-27 23:10:57 +01:00 |
pixeldesu
|
09b30506fd
|
add deletion message to index
|
2015-03-27 13:25:50 +01:00 |
pixeldesu
|
fbb494f3ea
|
add deletion message to index
|
2015-03-27 13:24:09 +01:00 |
pixeldesu
|
644b1b1316
|
add deletion message to index
|
2015-03-27 13:21:46 +01:00 |
pixeldesu
|
6e913fbfeb
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2015-03-27 13:17:29 +01:00 |
pixeldesu
|
5d3cd6ee75
|
add deletion message to index
|
2015-03-27 13:17:16 +01:00 |
nilsding
|
1773ff0b33
|
remove myself from about page
|
2015-03-18 21:26:42 +01:00 |
nilsding
|
487de37477
|
fix jihad issue #86
|
2015-02-28 17:29:10 +01:00 |
Andreas N
|
da7b684513
|
add links to privacy policy and terms of service in footer
|
2015-02-20 01:23:48 +01:00 |
Andreas N
|
af598f585a
|
added link to blog in the footer
|
2015-02-20 01:12:24 +01:00 |
Andreas N
|
66cc15971e
|
more date tooltips
|
2015-02-20 00:40:41 +01:00 |
Andreas N
|
a3bfa41baa
|
add date tooltips to relative dates
|
2015-02-20 00:18:43 +01:00 |
Andreas N
|
a451cab3e9
|
show answer link in all cases
|
2015-02-18 00:07:38 +01:00 |
Andreas N
|
c61b9ddf50
|
fix #83
|
2015-02-17 23:57:34 +01:00 |
Andreas N
|
d87d18ae9d
|
change effective date
|
2015-02-16 19:23:58 +01:00 |
Andreas N
|
c50531c988
|
Merge remote-tracking branch 'remotes/origin/texts' into develop
|
2015-02-16 18:59:59 +01:00 |
Andreas N
|
8f9472a611
|
update privacy policy
|
2015-02-16 16:32:29 +01:00 |
Georg G
|
d5fcec4d7d
|
hide that "Load more" button if you delete all questions
|
2015-02-12 22:15:01 +01:00 |
Georg G
|
66c5e46a78
|
this happens all the time
|
2015-02-12 22:10:50 +01:00 |
Georg G
|
cb606f942a
|
fixed pagination for real
|
2015-02-12 22:09:11 +01:00 |
Andreas N
|
e3bc0d6300
|
add inbox pagination
|
2015-02-12 21:59:46 +01:00 |
Andreas N
|
9aabccdddc
|
add links to profile
|
2015-02-12 18:10:16 +01:00 |
Andreas N
|
f58ec9f2a6
|
another try to fix
|
2015-02-12 17:50:13 +01:00 |
Andreas N
|
f2678cac0f
|
applied to wrong item
|
2015-02-12 17:23:46 +01:00 |
Andreas N
|
42dd275b2f
|
more optimizations to mobile display
|
2015-02-12 17:22:40 +01:00 |
Andreas N
|
2e75649b71
|
optimization to mobile display
|
2015-02-12 17:08:22 +01:00 |
Andreas N
|
4e7c0ec819
|
trying to fix this³
|
2015-02-12 16:59:54 +01:00 |
Andreas N
|
136b4dbba5
|
trying to fix this²
|
2015-02-12 16:57:51 +01:00 |
Andreas N
|
89ea02e7af
|
the navbar is kinda broken
|
2015-02-12 16:51:04 +01:00 |
Andreas N
|
1ef032e69e
|
some more changes
|
2015-02-12 16:48:14 +01:00 |
Andreas N
|
55a4278c34
|
copycat failures
|
2015-02-12 16:39:28 +01:00 |
Andreas N
|
0dfbac0bda
|
update profile dropdown, first draft
|
2015-02-12 16:37:07 +01:00 |
Andreas N
|
cb13903493
|
update moderator display
|
2015-02-12 15:57:05 +01:00 |
Andreas N
|
5e9d455a2f
|
typo
|
2015-02-10 22:08:00 +01:00 |
Andreas N
|
c6864133d4
|
update terms/policy a bit
|
2015-02-10 21:36:37 +01:00 |
Andreas N
|
87cfff8809
|
try to fix buggy tooltip
|
2015-02-09 19:58:58 +01:00 |
Andreas N
|
ddbb7e63c8
|
remove small size for asking button
|
2015-02-09 17:39:34 +01:00 |
Andreas N
|
7e12a1c77a
|
update notification display
|
2015-02-09 16:48:31 +01:00 |
Andreas N
|
6ac227fd31
|
hide entire list item, not just the button
|
2015-02-09 16:43:48 +01:00 |
Andreas N
|
192c0a0931
|
update ask button in navbar
|
2015-02-09 16:43:05 +01:00 |
Andreas N
|
3c6221eb1e
|
indentation got fucked up here
|
2015-02-08 02:54:57 +01:00 |
Andreas N
|
8550760772
|
add inbox sidebar
|
2015-02-08 00:59:07 +01:00 |
Andreas N
|
46d8769b92
|
remove padding on even more pages
|
2015-02-05 15:20:41 +01:00 |
Andreas N
|
cde8d8a30f
|
remove padding on specific rows on mobile devices
|
2015-02-05 15:17:15 +01:00 |
Andreas N
|
66607a1eae
|
update modal
|
2015-02-03 18:22:01 +01:00 |
Andreas N
|
26cd72ba2e
|
update modal
|
2015-02-03 18:10:14 +01:00 |
Georg G
|
06cc52ffc5
|
made these checkboxes work
|
2015-02-03 17:48:30 +01:00 |
Georg G
|
96f4a9433f
|
moderation javascripts now only get loaded if the current_user is a moderator or above
|
2015-02-03 17:31:04 +01:00 |
Georg G
|
17f1c8f091
|
added user privileges modal
|
2015-02-03 17:13:50 +01:00 |
Andreas N
|
d09b8554d3
|
update placeholders
|
2015-02-01 20:07:52 +01:00 |
Andreas N
|
cff278793e
|
update timeline design
|
2015-01-31 16:20:07 +01:00 |
Andreas N
|
9cb21d2458
|
add moderation navbar navbar
|
2015-01-31 00:49:31 +01:00 |
Andreas N
|
030e6ac6a6
|
add notification navbar
|
2015-01-31 00:47:28 +01:00 |
nilsding
|
393b92e001
|
… [ci skip]
|
2015-01-30 22:55:29 +01:00 |
Andreas N
|
bca0344792
|
remove margin from navbar
|
2015-01-30 22:53:44 +01:00 |
nilsding
|
bde9f39573
|
fixed mobile navbar thing [ci skip]
|
2015-01-30 22:52:05 +01:00 |
Andreas N
|
1c6533bb74
|
change text
|
2015-01-30 22:48:38 +01:00 |
Andreas N
|
cac03fa31e
|
change fixed to static
|
2015-01-30 22:48:24 +01:00 |
Andreas N
|
99c7aa8f86
|
add mobile navigation for lists and timelines
|
2015-01-30 22:46:44 +01:00 |
Andreas N
|
caa6a06ab0
|
small visual improvement
|
2015-01-30 20:34:28 +01:00 |
Andreas N
|
b3d81e18ab
|
fix this shit
|
2015-01-30 20:32:10 +01:00 |
nilsding
|
a7fbc5b366
|
fixed inbox entries and toggle button
|
2015-01-28 06:49:17 +01:00 |
Andreas N
|
9c2b0951bf
|
add coffescript to expand options
|
2015-01-27 18:25:20 +01:00 |
Andreas N
|
ddbff78926
|
add panel-footer to inbox panel
|
2015-01-27 18:13:24 +01:00 |
nilsding
|
13bdbaa430
|
centred the "New notifications will appear here" text and also fixed class for notifications entry on navbar
|
2015-01-26 17:53:23 +01:00 |
nilsding
|
c8b02bbf50
|
actually add some code here
|
2015-01-26 17:50:45 +01:00 |
Andreas N
|
2a0d80b755
|
basic stuff fixed
|
2015-01-26 17:21:40 +01:00 |
Andreas N
|
da9c15d43c
|
basic stuff added
|
2015-01-26 17:16:32 +01:00 |
Andreas N
|
e9c7c5120b
|
hotfix
|
2015-01-26 15:57:07 +01:00 |
Andreas N
|
370169c35a
|
update and fix mobile design
|
2015-01-26 15:51:18 +01:00 |
Andreas N
|
1a3c491e45
|
remove fa-spin from blogger badge
|
2015-01-25 20:50:42 +01:00 |
nilsding
|
0d639fd6ec
|
added blogger badge
|
2015-01-25 20:30:09 +01:00 |
Andreas N
|
fa2220dd00
|
added Filippus to admins
|
2015-01-19 17:39:19 +01:00 |
Andreas N
|
5b67ac7f0a
|
added template css file
|
2015-01-18 00:23:55 +01:00 |
Andreas N
|
3edfbb42a1
|
add design stuff for header display
|
2015-01-18 00:16:06 +01:00 |
Andreas N
|
c60e345d7b
|
removed kyr from admins
|
2015-01-17 21:35:52 +01:00 |
Andreas N
|
26605dd66f
|
more fixes for member listing for groups
|
2015-01-17 19:15:06 +01:00 |
Andreas N
|
f714e8d0e2
|
fix member listing for groups
|
2015-01-17 19:13:31 +01:00 |
Andreas N
|
0b2c1b86c8
|
added member listing for groups
|
2015-01-17 19:13:09 +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 |
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
|
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
|
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
|
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 |
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
|
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
|
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
|
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 |
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
|
1bb369aa7d
|
implemented basic functionality of YE OLDE BANHAMMER!
|
2015-01-12 22:44:13 +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
|
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
|
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
|
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 |
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
|
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 |
nilsding
|
0916628c43
|
added link to bug tracker
|
2015-01-07 00:36:09 +01:00 |
Andreas N
|
1b4eb15152
|
tooltips for smiles
|
2015-01-06 17:33:02 +01:00 |
Andreas N
|
0d784aee47
|
finish implementing new badge design
|
2015-01-06 15:32:14 +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
|
59b431513b
|
made privacy_allow_stranger_answers work
|
2015-01-03 22:37:10 +01:00 |
nilsding
|
09b6a6bc10
|
made that stuff work
|
2015-01-03 22:27:14 +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
|
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
|
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
|
f4d63ae4e3
|
users now can answer other people's questions
|
2015-01-03 18:41:10 +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 |
Andreas N
|
82924cfbec
|
fix profile size indifference
|
2015-01-03 15:23:43 +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
|
ddae3c6278
|
crapkit sucks
|
2015-01-03 04:01:42 +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 |
nilsding
|
9869a46fef
|
Revert "attempt fix for #39"
This reverts commit 16f319a0a6 .
|
2015-01-03 03:50:54 +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
|
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
|
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
|
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
|
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
|
daa8eefff6
|
temp fix
|
2014-12-29 22:01:54 +01:00 |
nilsding
|
fa16612ba8
|
made the new cropper work
|
2014-12-29 16:29:46 +01:00 |
nilsding
|
f7cb3478be
|
:medium everywhere
|
2014-12-29 14:57:16 +01:00 |
nilsding
|
b61a631f15
|
added hidden fields
|
2014-12-29 14:50:25 +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
|
678e03deed
|
uploading profile pictures works now
|
2014-12-29 11:21:43 +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
|
7d55141a1a
|
added deleted column to reports
|
2014-12-28 21:34:36 +01:00 |
nilsding
|
b3f165b12b
|
reporting and deleting comments works now
|
2014-12-28 21:14:01 +01:00 |
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 |
nilsding
|
a4edb4147d
|
generating questions is great
|
2014-12-09 23:37:44 +01:00 |
nilsding
|
9d9713e655
|
this does not belong here
|
2014-12-09 23:22:56 +01:00 |
nilsding
|
daab6ce4f5
|
THIS IS SPARTA
|
2014-12-09 23:21:41 +01:00 |
pixeldesu
|
ef9579594c
|
added notification test page
|
2014-12-09 23:07:04 +01:00 |
pixeldesu
|
f277b249c2
|
added notification controller
|
2014-12-09 22:35:11 +01:00 |
pixeldesu
|
bee2404fe3
|
fix equal sign
|
2014-12-09 22:23:51 +01:00 |
pixeldesu
|
a9a10dd04d
|
remove pluralize stuff
|
2014-12-09 22:07:45 +01:00 |
pixeldesu
|
98b63b45c6
|
splitting scss, pluralizing entries, etc
|
2014-12-09 15:32:29 +01:00 |
nilsding
|
c18ac74700
|
renamed following to friends
|
2014-12-08 19:51:34 +01:00 |
nilsding
|
e63e52f585
|
the count is now incremented/decremented correctly on the view followers/friends pages
|
2014-12-08 19:48:12 +01:00 |
nilsding
|
f381baa702
|
ZHE FIXXX
|
2014-12-08 17:18:26 +01:00 |
nilsding
|
0f2dc34e55
|
why not zoidberg?
|
2014-12-08 17:14:02 +01:00 |
nilsding
|
b4408ffbd2
|
!!! (aka. made follower/following links clickable)
|
2014-12-08 17:11:54 +01:00 |
nilsding
|
742bba0b12
|
?
|
2014-12-08 17:10:09 +01:00 |
nilsding
|
30c8654a27
|
added follower/following pages
|
2014-12-08 17:03:06 +01:00 |
nilsding
|
2caf81d08e
|
ayyyy vodka
|
2014-12-08 16:01:27 +01:00 |
nilsding
|
293837984e
|
added pagination to User#show
|
2014-12-08 15:23:04 +01:00 |
nilsding
|
cc87061fe2
|
Links. (Und rechts)
|
2014-12-08 15:17:26 +01:00 |
nilsding
|
bd16bd794d
|
alright this should do.
|
2014-12-08 14:22:11 +01:00 |
nilsding
|
6c0e6d1a51
|
hmm...
|
2014-12-08 14:18:16 +01:00 |
nilsding
|
c279026ce0
|
added pagination! (at least on the timeline)
|
2014-12-08 14:14:13 +01:00 |
nilsding
|
da97b7dcf4
|
show the ask followers modal only for signed in users
|
2014-12-08 13:10:25 +01:00 |
pixeldesu
|
51498d3825
|
fixed navbar display
|
2014-12-07 21:06:57 +01:00 |
nilsding
|
afe9b8f743
|
bugFuchs
|
2014-12-07 20:57:10 +01:00 |
nilsding
|
7de522a82f
|
added question#show thing and more...
|
2014-12-07 20:51:44 +01:00 |
nilsding
|
a9f5ddab65
|
added thing
|
2014-12-07 20:18:53 +01:00 |
nilsding
|
58d0efc219
|
implemented "ask your followers"
|
2014-12-07 20:13:45 +01:00 |
nilsding
|
81b131779b
|
current password now moved to its own modal, it's more visible then.
|
2014-12-07 16:04:05 +01:00 |
nilsding
|
3632dbde9f
|
fixed path
|
2014-12-07 15:53:19 +01:00 |
pixeldesu
|
01c5577cdd
|
changed display for comments
|
2014-12-07 15:36:08 +01:00 |
nilsding
|
bc4e6d4ed2
|
added some counters to sdgjlk
|
2014-12-07 15:11:09 +01:00 |
nilsding
|
9f4d9214bd
|
added some counters to user profiles
|
2014-12-07 15:10:05 +01:00 |
nilsding
|
8ab5458b1b
|
posting comments is now possible.
|
2014-12-07 15:05:44 +01:00 |
nilsding
|
50151453d8
|
added ajax/comment_controller
|
2014-12-07 14:31:20 +01:00 |
nilsding
|
a34972379f
|
unregistered users will see the smile_count if at least someone smiled the answer
|
2014-12-07 12:46:25 +01:00 |
nilsding
|
382277adf0
|
iOS web app things
|
2014-12-06 17:08:10 +01:00 |
nilsding
|
a2e1e2557b
|
smile count is now in the button itself if the user is signed in
|
2014-12-05 20:21:15 +01:00 |
nilsding
|
c276b6aacf
|
added comment text input box thing
|
2014-12-05 20:17:44 +01:00 |