Commit graph

852 commits

Author SHA1 Message Date
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
f8a20099fa forgot to add the schema file, argh 2015-01-12 22:44:35 +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
1a41ea3193 it would be nice if you'd actually include this icon 2015-01-10 13:58:51 +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