Commit Graph

500 Commits

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