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 |
|
Georg G
|
4a8ea35ead
|
Merge branch 'navbar-profile-redesign'
|
2015-02-12 20:22:34 +01:00 |
|
Andreas N
|
2a854c1cda
|
update paddings
|
2015-02-12 18:14:23 +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 |
|
nilsding
|
5c2d75ece9
|
now marking multiple "smiled" and "commented" notifications as read at once
|
2015-02-12 17:49:05 +01:00 |
|
Andreas N
|
c033f1f4b2
|
media queries for min and max size
|
2015-02-12 17:48:19 +01:00 |
|
Andreas N
|
0f8940435d
|
impoooortant
|
2015-02-12 17:46:19 +01:00 |
|
Andreas N
|
910c1a81d6
|
I heard you like importants in media queries so I put an important in your media query
|
2015-02-12 17:44:07 +01:00 |
|
Andreas N
|
06d2af92ce
|
another way to fix this
|
2015-02-12 17:25:46 +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
|
f46ebe5a30
|
doing the worst things to css since its existence
|
2015-02-12 17:11:21 +01:00 |
|
Andreas N
|
2e75649b71
|
optimization to mobile display
|
2015-02-12 17:08:22 +01:00 |
|
Andreas N
|
8a83db4291
|
can we remove the important here?
|
2015-02-12 17:02:14 +01:00 |
|
Andreas N
|
b9874ff423
|
more centered alignment for single usernames
|
2015-02-12 17:01:50 +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
|
8e9a893c79
|
trying to fix this
|
2015-02-12 16:54:48 +01:00 |
|
Andreas N
|
ed3490c40c
|
whoops
|
2015-02-12 16:52:08 +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
|
1c0a70165a
|
Merge remote-tracking branch 'origin/master'
|
2015-02-12 15:57:21 +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 |
|
nilsding
|
e51b525fd5
|
use :created_at for order
|
2015-02-10 07:04:49 +01:00 |
|
nilsding
|
31d8e68725
|
automatically mark notifications as read
|
2015-02-10 06:53:50 +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
|
a509b34524
|
Merge remote-tracking branch 'origin/master'
|
2015-02-03 14:57:44 +01:00 |
|
Andreas N
|
3bf92f43f0
|
remove support from validator
|
2015-02-03 14:55:36 +01:00 |
|
nilsding
|
8882360e4b
|
added 'search' to the list of forbidden user names [ci skip]
|
2015-02-02 16:10:01 +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 |
|
Andreas N
|
5369f34bab
|
Merge remote-tracking branch 'remotes/origin/inbox-options'
|
2015-01-30 20:27:11 +01:00 |
|
Andreas N
|
5ce2368310
|
Merge branch 'inbox-options'
|
2015-01-30 20:22:48 +01:00 |
|
nilsding
|
0bf46a888f
|
added a new Markdown renderer (TwitteredMarkdown) which will be used for sharing to Twitter
|
2015-01-29 16:45:58 +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
|
ca7789750a
|
made NProgress loading bar brighter (GitHub issue #73)
|
2015-01-27 17:53:05 +01:00 |
|
nilsding
|
b26ec1dd0b
|
fixed question generator not working if privacy_allow_anonymous_questions is false (GitHub issue #71)
|
2015-01-27 17:51:39 +01:00 |
|
Andreas N
|
8ff92dca15
|
Merge remote-tracking branch 'origin/master'
|
2015-01-26 18:41:37 +01:00 |
|
Andreas N
|
32956319d4
|
changed question-text line height
|
2015-01-26 18:41:16 +01:00 |
|
nilsding
|
4e49258463
|
removed annoying margin, ready to merge [ci skip]
|
2015-01-26 18:08:03 +01:00 |
|
nilsding
|
f7e71d3d67
|
how about this selector?
|
2015-01-26 18:04:17 +01:00 |
|
Andreas N
|
174ea6b774
|
changed display of notification badge
|
2015-01-26 17:55:18 +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
|
45e08651af
|
fixed some more stuff
|
2015-01-26 17:33:40 +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 |
|
Andreas N
|
40eb19d387
|
updated colours thingy
|
2015-01-25 20:48:14 +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 |
|
nilsding
|
05334e3bd0
|
added some specs
|
2015-01-18 14:15:21 +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 |
|
nilsding
|
44b4e8721a
|
alright
|
2015-01-17 19:53:34 +01:00 |
|
nilsding
|
4a8005b195
|
closes issue #64
|
2015-01-17 19:49:11 +01:00 |
|
Andreas N
|
1f73b3e3fa
|
Merge remote-tracking branch 'origin/groups' into groups
|
2015-01-17 19:15:15 +01:00 |
|
Andreas N
|
26605dd66f
|
more fixes for member listing for groups
|
2015-01-17 19:15:06 +01:00 |
|
nilsding
|
2ffd514bf1
|
forgot the @
|
2015-01-17 19:14:18 +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
|
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 |