Commit Graph

224 Commits

Author SHA1 Message Date
pixeldesu 764a36e4be %ul.nav -> .list-group 2015-08-25 23:46:49 +02:00
Yuki 9ef71a84e9 Merge branch 'master' of github.com:Retrospring/retrospring into feature-themes 2015-07-29 19:52:14 +05:30
Yuki 21f2467f45 Fix question pagination 2015-07-25 23:18:27 +05:30
Yuki 54b051a7e7 Temp. layout for testing 2015-07-24 22:42:14 +05:30
pixeldesu 6f65f8c9f4 Merge branch 'feature-userbox-header' 2015-07-24 17:10:28 +02:00
pixeldesu 5ce5d69e4a remove the TODO from the userbox 2015-07-24 17:09:17 +02:00
pixeldesu 1a9660bc05 update userbox style with headers 2015-07-24 17:04:46 +02:00
pixeldesu ca41890ada replaced big avatar image on main timeline page 2015-06-28 01:36:58 +02:00
Yuki 409c82b5ed Flag switcher 2015-06-21 12:33:29 +05:30
Georg G 53fe52b3b6 fixed wrong style on timestamps in answerbox 2015-06-09 18:24:27 +02:00
Yuki 649b1cda3b Fix Retrospring/bugs#77 2015-06-09 17:57:49 +05:30
pixeldesu 341372d874 finalize 2015-06-08 21:51:46 +02:00
pixeldesu a8fd3624b6 localize even more final stuff 2015-06-08 21:11:35 +02:00
pixeldesu d28f64adf1 localize placeholders 2015-06-08 20:48:23 +02:00
pixeldesu 3a4ff794de add some missing locales 2015-06-07 23:52:03 +02:00
pixeldesu cd2685a179 localized moderation, sidebar, userbox, etc. 2015-06-07 16:24:41 +02:00
Yuki a560efe1c0 badumm tiss 2015-05-27 08:10:11 +05:30
pixeldesu 7a0be2519a localize question_header and questionbox 2015-05-27 04:31:28 +02:00
pixeldesu 16ec60aa19 localize question 2015-05-27 04:13:13 +02:00
pixeldesu 75a7b393b9 Merge remote-tracking branch 'origin/locale' into locale 2015-05-27 03:54:04 +02:00
pixeldesu 7905fe8372 localize actions 2015-05-27 03:53:53 +02:00
Yuki 52890707c5 less logic in views 2015-05-27 06:51:06 +05:30
Yuki 74bbbdf4ca FILTHY 2015-05-27 06:41:21 +05:30
pixeldesu 9c83972105 localized answerbox (trigger warning: horrible code) 2015-05-27 02:58:03 +02:00
Yuki 67f11828dd Fix CAT-2015-0001 2015-05-24 19:38:07 +05:30
pixeldesu 6b08e6fed5 tooltips for comment timestamps [ci skip] 2015-05-17 05:52:49 +02:00
pixeldesu bbb3b806a5 Merge remote-tracking branch 'origin/master' 2015-05-17 05:36:50 +02:00
pixeldesu ab6983001e timestamps for comments and CSS fixes 2015-05-17 05:36:23 +02:00
Yuki 9e3a6e2171 Mobile-friendly profile info box 2015-05-16 04:09:33 +05:30
pixeldesu 023fe26e81 finish up Discover page 2015-05-14 00:45:01 +02:00
Yuki 0ba88942de Fix question headers overflowing into the answers 2015-05-13 00:18:06 +05:30
Yuki 2204227273 Feature-comment-smiles complete (fix Retrospring/bugs#42) 2015-05-04 07:09:47 +05:30
Yuki ee29e1f28f Reporting and Deleting logic 2015-04-26 07:06:25 +05:30
pixeldesu e2f06167dc fix styling and schema 2015-04-26 02:46:37 +02:00
pixeldesu c8ba89dd1e change question display and add report placeholder 2015-04-26 02:18:57 +02:00
Yuki 4ad9916c7e Rename 'delete answer' to 'return to inbox' for clarity 2015-04-24 04:22:52 +05:30
Georg G 667bb155c9 fixes Retrospring/bugs#23 2015-04-22 18:19:20 +02:00
pixeldesu 305de8bf7b fix typo 2015-04-21 17:41:45 +02:00
Yuki 8eeae22c43 Don't resubscribe if a user unsubscribes and comments again 2015-04-21 17:52:32 +05:30
Yuki ecffd07344 Support for post subscriptions 2015-04-21 06:42:11 +05:30
pixeldesu 4e185bbaa7 change Bootswatch theme, general theme changes, list group helper 2015-04-19 16:49:53 +02:00
Howl 1032363b5a fix horrible link section in about page 2015-04-18 23:45:52 +02:00
pixeldesu 865bbbd6b9 add Github link to footer 2015-04-18 21:08:20 +02:00
Andreas N da7b684513 add links to privacy policy and terms of service in footer 2015-02-20 01:23:48 +01:00
Andreas N af598f585a added link to blog in the footer 2015-02-20 01:12:24 +01:00
Andreas N 66cc15971e more date tooltips 2015-02-20 00:40:41 +01:00
Andreas N a3bfa41baa add date tooltips to relative dates 2015-02-20 00:18:43 +01:00
Andreas N a451cab3e9 show answer link in all cases 2015-02-18 00:07:38 +01:00
Andreas N c61b9ddf50 fix #83 2015-02-17 23:57:34 +01:00
Andreas N cff278793e update timeline design 2015-01-31 16:20:07 +01:00
Andreas N 99c7aa8f86 add mobile navigation for lists and timelines 2015-01-30 22:46:44 +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 26605dd66f more fixes for member listing for groups 2015-01-17 19:15:06 +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 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 1bb369aa7d implemented basic functionality of YE OLDE BANHAMMER! 2015-01-12 22:44:13 +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 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
Andreas N 52791b737b added link to FAQ page 2015-01-07 22:06:21 +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
nilsding 09b6a6bc10 made that stuff work 2015-01-03 22:27:14 +01:00
Andreas N 57f469e429 you can report yourself anymore in comments 2015-01-02 00:41:26 +01:00
Andreas N ed9c7e945d you can report yourself anymore 2015-01-02 00:38:59 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +01:00
nilsding 90fe42e643 Merge remote-tracking branch 'origin/master' into moderation
Conflicts:
	app/models/user.rb
2014-12-28 19:29:01 +01:00
nilsding 5829d4f1ef removed unnecessary p tag 2014-12-28 19:11:36 +01:00
nilsding 0e4d744478 added Markdown to answers 2014-12-28 19:06:49 +01:00
Andreas N 56441a4967 more fix. 2014-12-27 16:03:09 +01:00
nilsding 642d88da07 , 2014-12-27 15:56:34 +01:00
nilsding 1a131d8c47 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:50:59 +01:00
Andreas N edeff57293 Fixxed! 2014-12-27 15:50:36 +01:00
nilsding 5c5edbab13 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:40:07 +01:00
Andreas N be44301874 I hope this finally fixes it ;_; 2014-12-27 15:39:45 +01:00
nilsding 27aa704511 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:38:16 +01:00
Andreas N 018a377c24 finally 2014-12-27 15:38:06 +01:00
nilsding f1298a416f Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:31:44 +01:00
Andreas N 9522bfa8f0 I should probably put that in the right file 2014-12-27 15:31:34 +01:00
nilsding 8a23ce0cf3 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:28:10 +01:00
nilsding 4e81467163 hhhh 2014-12-27 15:28:01 +01:00
Andreas N 2e2c2dac58 trying to fix dropdowns 2014-12-27 15:27:39 +01:00
Andreas N 1700bfb0f5 update comment design again 2014-12-27 15:22:30 +01:00
Andreas N f8d8c13fb9 update comment design 2014-12-27 15:15:35 +01:00
Andreas N c7c10b43b9 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:13:05 +01:00
Andreas N 395d1691f8 update comment design 2014-12-27 15:12:57 +01:00
nilsding 260d5cddd7 updated delete button 2014-12-27 14:59:48 +01:00
nilsding 1a43ae0054 UND NACH RECHTS, RECHTS, RECHTS, IMMER NACH RRRECHTS 2014-12-27 02:34:01 +01:00
Andreas N 2c8cd5bc3e fix broken dropdown 2014-12-27 02:29:57 +01:00
Andreas N bdd3cd5afc Added button for report/delete actions 2014-12-27 02:26:51 +01:00
nilsding 9fe8be1db8 Merge branch 'master' of git.rrerr.net:justask/justask
Conflicts:
	app/views/shared/_answerbox.html.haml
2014-12-27 00:40:02 +01:00
nilsding c817f32b18 j 2014-12-27 00:39:03 +01:00
Andreas N 20c173442d remove that button 2014-12-27 00:37:42 +01:00