Commit Graph

444 Commits

Author SHA1 Message Date
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 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