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
|
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 |
|
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 |