Commit Graph

645 Commits

Author SHA1 Message Date
Georg G 6a9619a70c update gems
also remove mysql because no one uses it anyway lol
2016-01-05 17:15:57 +01:00
Yuki 64ba41d9a6 Fix reports 2015-09-18 18:02:16 +09:00
pixeldesu ede3ad1b92 Update notification design and behaviour
- Add display of content that was replied to/with
- Instead of marking notifications new, only show new items and hide seen entries
- Add a 'New Notifications' page and set it as default
- Add proper display if there are no new notifications
- Adjust theme to fit new changes
2015-09-16 22:18:40 +02:00
Yuki 71caf3cce5 Several changes to theming, solving a bunch of bugs 2015-08-27 05:30:26 +05:30
pixeldesu 683ce43294 implement pgHero 2015-08-26 21:37:29 +02:00
Yuki 010d0a327e i'm about to give up 2015-08-26 02:26:47 +05:30
Yuki a7c3acea76 ISHYGDDT 2015-08-26 02:14:14 +05:30
Yuki bee62c2139 Show themes in admin 2015-08-26 00:40:08 +05:30
Yuki 906692e78f Theming is finished
Previews, settings pane and presets!
2015-08-25 23:57:06 +05:30
Yuki 1912fc3766 Model goop
also made the theme selection logic for user profiles and current user, and the saving logic
2015-08-25 13:56:36 +05:30
Yuki e7e28efcab Theme Progress
Link color
Notification dropdown text fix
Dropdown select color
Panels
Modals
Buttons, Labels and Alerts
nprogress
fix and rename __THEME_CSS_CACHE to __THEME_CSS_CACHE_V1
2015-08-25 01:26:59 +05:30
Yuki 5f8dc8a24f Cache CSS if in production 2015-07-29 22:29:52 +05:30
Yuki 9ef71a84e9 Merge branch 'master' of github.com:Retrospring/retrospring into feature-themes 2015-07-29 19:52:14 +05:30
Yuki 92bbfef2df Moved ask all + ask group to worker, validates user_id for ask person now 2015-07-27 12:29:56 +05:30
pixeldesu fcbfa6efdb Rollbar setup 2015-07-26 20:34:00 +02:00
Yuki 54b051a7e7 Temp. layout for testing 2015-07-24 22:42:14 +05:30
Yuki deb6d12108 Moderation Priority + IP 2015-07-23 23:21:13 +05:30
Yuki 362292716f Mail templating, hopefully 2015-07-21 23:43:14 +05:30
Yuki e76871b75f Make the mailer respect APP_CONFIG.host, add ENV switches for letter_opener, mailcatcher and sendmail 2015-07-21 23:03:30 +05:30
pixeldesu cbbd629961 I don't think localhost is the right thing here 2015-07-21 18:46:48 +02:00
pixeldesu 13963c9f04 add description how to use local testing for mails 2015-07-21 18:28:23 +02:00
pixeldesu d880681f37 removing :page from inbox/:author route again 2015-07-17 21:02:53 +02:00
pixeldesu 51f21b73b1 fix broken route 2015-07-17 20:57:48 +02:00
pixeldesu 84f80c824e fix broken pagination and wrong question count for deletion 2015-07-17 20:54:11 +02:00
pixeldesu e9ae442431 add ability to show/search questions from specific users 2015-07-17 20:29:19 +02:00
pixeldesu 3a5dcbcd3b Move account deletion to Sidekiq worker, fixes #11 2015-07-15 01:44:35 +02:00
pixeldesu e39da499ce update locales submodule 2015-07-04 16:52:16 +02:00
Yuki af71f1ef34 Some adjustmenets to locale logic, add 'jp.language: 日本語', regenerate schema 2015-07-04 13:01:46 +05:30
pixeldesu bbecf20c52 update locales submodule 2015-07-03 23:59:46 +02:00
pixeldesu 1809169c87 update locales submodule 2015-06-21 13:50:29 +02:00
pixeldesu 028ba7130c update locales submodule 2015-06-21 13:33:11 +02:00
Yuki 409c82b5ed Flag switcher 2015-06-21 12:33:29 +05:30
Yuki a452cc36de merge from master 2015-06-21 11:35:52 +05:30
pixeldesu d2c2af9d8e update locales submodule 2015-06-21 01:15:50 +02:00
pixeldesu f6ad7a08ed update locales submodule 2015-06-21 01:09:28 +02:00
pixeldesu 0ded19a4ce update locales submodule 2015-06-21 00:25:31 +02:00
pixeldesu efe698beb2 update locales submodule 2015-06-20 23:33:51 +02:00
pixeldesu bea0fb2525 update locale submodule 2015-06-20 23:22:13 +02:00
pixeldesu fe4f641516 update locale submodule 2015-06-20 23:15:20 +02:00
pixeldesu 58e80919df add data page 2015-06-20 20:38:07 +02:00
pixeldesu 25b98176b1 add locales submodule 2015-06-19 13:33:43 +02:00
Adel Duprat-Kissami ece8fe65c0 Update fr.yml 2015-06-14 15:37:39 +02:00
Adel Duprat-Kissami d6c432152f Some more TL fixes 2015-06-10 21:43:27 +02:00
pixeldesu 003d5c0abe Merge branch 'master' of github.com:Retrospring/retrospring 2015-06-09 22:45:09 +02:00
pixeldesu 52f156a63b add czech translation 2015-06-09 22:43:23 +02:00
Andreas N. 521b1b921a Merge pull request #39 from LordHaruto/master
Fixed TL errors
2015-06-09 22:17:47 +02:00
pixeldesu 102e9bef5e add italian translation 2015-06-09 22:13:43 +02:00
Adel Duprat-Kissami 1cb40dc783 oops 2015-06-09 20:33:28 +02:00
Adel Duprat-Kissami 866d1f5399 Fixed TL errors
Better wording and more uniformity.
2015-06-09 20:28:25 +02:00
Yuki 9da3472179 add non iso countries, i guess 2015-06-09 23:35:33 +05:30
Yuki 53f3e487fd Less specific 2015-06-09 23:30:23 +05:30
Yuki ff956febee Load countries 2015-06-09 23:27:32 +05:30
Adel Duprat-Kissami 220d901161 fixed typo 2015-06-09 19:25:50 +02:00
Yuki 23fe484a2e 'language' key 2015-06-09 22:45:11 +05:30
Yuki e621372795 Prepare for the retrolution 2015-06-09 22:36:50 +05:30
pixeldesu 214ae12e59 add french translation 2015-06-09 18:05:30 +02:00
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
Yuki 3afaf3222d Yes and No translated into true and false??? this fixes it 2015-06-09 00:31:37 +05:30
pixeldesu d28f64adf1 localize placeholders 2015-06-08 20:48:23 +02:00
pixeldesu d13cdb27dc localize javascript 2015-06-08 20:35:16 +02:00
Yuki 055830626e Set up i18n-js and show usage to pixel 2015-06-08 20:19:47 +05:30
pixeldesu 7c5f9b082a add missing profile setting locales 2015-06-08 16:05:20 +02:00
pixeldesu 488d582afa add i18n-js and localize javascript (not implemented yet) 2015-06-08 16:01:16 +02:00
pixeldesu 3a4ff794de add some missing locales 2015-06-07 23:52:03 +02:00
pixeldesu 984abbe738 git localize flashes 2015-06-07 19:03:57 +02:00
pixeldesu e6e1d03187 localized ajax controllers 2015-06-07 18:24:01 +02:00
pixeldesu cd2685a179 localized moderation, sidebar, userbox, etc. 2015-06-07 16:24:41 +02:00
pixeldesu f011fddc9d instead of capitalizing the string in the template, just capitalize the locale 2015-06-07 15:34:22 +02:00
pixeldesu e006dfde53 localize user profile, settings, modals 2015-06-07 15:10:17 +02:00
Yuki 80b1c1af96 yml also isn't rb 2015-06-07 06:16:47 +05:30
Yuki f3b80d2bd4 yml has no support for single quotation marks (') ;-; 2015-06-07 06:16:12 +05:30
Yuki f564ef724e line 51 of _notification.html.haml line 57 of _notifications.html.haml 2015-06-07 06:13:18 +05:30
pixeldesu b8c0032986 localize notifications (except comments) 2015-06-07 01:28:10 +02:00
pixeldesu 45ec9ebdff Merge remote-tracking branch 'origin/locale' into locale 2015-06-07 00:24:50 +02:00
pixeldesu 75d4d5a07f localize inbox 2015-06-07 00:24:27 +02:00
Yuki 191b1cc1db that locale is now provided by devise-i18n [skip ci] 2015-05-27 08:18:08 +05:30
Yuki 3c6c0b1596 explanation for '%{hide} %{user}' 2015-05-27 08:13:42 +05:30
pixeldesu 7a0be2519a localize question_header and questionbox 2015-05-27 04:31:28 +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 eda3bf5e62 Don't raise on invalid locales 2015-05-27 07:13:33 +05:30
pixeldesu 9c83972105 localized answerbox (trigger warning: horrible code) 2015-05-27 02:58:03 +02:00
pixeldesu ac2d50398b remove TODOs 2015-05-26 22:15:59 +02:00
pixeldesu ab0b428e03 implemented translations into front, about and discover 2015-05-26 21:15:18 +02:00
pixeldesu ce2503bfb3 turn front, about and discover into locales (not implemented yet) 2015-05-26 18:24:33 +02:00
Yuki 69a1bb32f4 Basic locale check 2015-05-26 08:56:40 +05:30
Yuki cd904ae1bc Fix FAQ 2015-05-26 04:56:58 +05:30
pixeldesu 961ebfd266 add routes and empty index for discover 2015-05-13 20:56:51 +02:00
Yuki 3d2b884b74 Revert to 'rspec fixes' -- 'Inbox user answers a question' is a mysterious failure 2015-05-11 16:09:12 +05:30
Yuki b543c35665 i wonder if this is the issue 2015-05-11 16:02:50 +05:30
Yuki d81c11c0e6 what's the internal server error 2015-05-11 15:50:01 +05:30
Yuki fa1ef1de21 this probably is it, if it's not then it's your problem, i didn't cause this 2015-05-11 15:34:08 +05:30
Yuki 56b64d70bd rspec fixes 2015-05-11 14:40:42 +05:30
Georg G 4c6b009d23 use Sidekiq for processing 2015-05-10 02:57:27 +02:00
Yuki 20ebb6dbad rake command to migrate to AWS 2015-05-09 19:48:34 +05:30
Yuki 0a34cc07b3 Paperclip fog support, needs AWS/Rack testing before deployment! (Retrospring/bugs#48) 2015-05-08 23:48:18 +05:30
Georg G. 9b39491d88 Merge pull request #18 from skiprope/temp-bans
Support for ban reasons and ban times.
2015-05-05 16:54:23 +02:00
Yuki 2204227273 Feature-comment-smiles complete (fix Retrospring/bugs#42) 2015-05-04 07:09:47 +05:30
Yuki 9688b7ee48 Merge stable 2015-04-28 10:22:54 +05:30
Yuki ee29e1f28f Reporting and Deleting logic 2015-04-26 07:06:25 +05:30
Yuki be04d3528c Support for ban reasons and ban times. Fixes Retrospring/bugs#26 and Retrospring/bugs#25 2015-04-23 06:26:29 +05:30
Georg G ef4fd30cd9 closes Retrospring/bugs#17 2015-04-22 00:33:55 +02:00
Yuki ecffd07344 Support for post subscriptions 2015-04-21 06:42:11 +05:30
Georg G 5ce34de74f added Rack initializer 2015-04-19 01:24:50 +02:00
Yuki e2bfc26c75 Markdown preview through AJAX (/ajax/preview) 2015-04-19 03:47:13 +05:30
Georg G 77c8026e2f renamed config.serve_static_assets to config.serve_static_files 2015-04-18 21:56:05 +02:00
nilsding c357036047 removed deployment-related stuff 2015-04-02 01:30:24 +02:00
nilsding 47cbbed719 made admin listing changeable in justask.yml 2015-04-02 01:28:42 +02:00
Andreas N c50531c988 Merge remote-tracking branch 'remotes/origin/texts' into develop 2015-02-16 18:59:59 +01:00
Georg G 06cc52ffc5 made these checkboxes work 2015-02-03 17:48:30 +01:00
Georg G 96f4a9433f moderation javascripts now only get loaded if the current_user is a moderator or above 2015-02-03 17:31:04 +01:00
nilsding 0a69ee04a7 changed exception rendering option for test environment [ci skip] 2015-01-26 16:14:20 +01:00
nilsding 097041c8d2 update questiongenerator 2015-01-18 01:12:53 +01:00
nilsding 2c502aeaa4 added Group and GroupMember to RailsAdmin 2015-01-17 19:30:24 +01:00
nilsding 927ec9678f deleting groups works now! finally!!! 2015-01-17 18:57:23 +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 2c19ae8aea finally get rid of that '@' in the URL 2015-01-17 16:29:11 +01:00
Andreas N 74e74dedef added terms of service 2015-01-16 23:16:28 +01:00
Andreas N 75ae141759 added privacy policy 2015-01-16 22:36:39 +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 9de917fb23 closes GitHub issue #57 2015-01-12 13:00:00 +01:00
nilsding f93624fa2c added groups route thing 2015-01-12 06:57:43 +01:00
nilsding 6fcbee55c4 added forbidden user names (including case insensitivity!) 2015-01-09 14:12:52 +01:00
Andreas N 4161002da0 added faq page 2015-01-07 21:30:52 +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 7be7de11cd moved answering code from inbox_controller.rb to answer_controller.rb 2015-01-03 18:40:39 +01:00
nilsding 74ece9d971 added privacy setting routes
this took me longer than it should have taken
2015-01-02 21:34:56 +01:00
nilsding 57c1650e04 added mailers to development environment 2015-01-01 18:08:09 +01:00
nilsding a70b7c5fdb alright.... 2015-01-01 17:57:44 +01:00
nilsding 88616f0280 added another mailer thing 2015-01-01 17:56:52 +01:00
nilsding d3b9b4640d added Mailer queue 2015-01-01 17:34:14 +01:00
nilsding db83a29911 added devise-async and configured Devise for email 2015-01-01 17:31:58 +01:00
nilsding 6a1a1879d3 added a few action_mailer config vars 2015-01-01 17:26:35 +01:00
nilsding b378a03afa added delayed_paperclip 2014-12-29 11:58:01 +01:00
nilsding 27558f83c4 made tabs work 2014-12-29 01:25:48 +01:00
nilsding a0c0d68e43 posting moderation comments works now 2014-12-29 00:50:14 +01:00
nilsding b7b5ee960e deleting reports works now 2014-12-29 00:21:06 +01:00
nilsding 7a0b3f4af7 added votes for reports 2014-12-28 23:26:16 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +01:00
nilsding ce280fffa1 reporting things via ajax works now 2014-12-28 19:55:50 +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 7537331651 changed this 2014-12-28 19:12:28 +01:00
nilsding 443ca0e663 added sanitize initializer 2014-12-28 19:06:04 +01:00
nilsding b625144993 added moderation models 2014-12-27 14:35:09 +01:00
nilsding a2c361b5c5 made railsadmin shut up about the different notification types 2014-12-26 14:31:59 +01:00
nilsding 755bbac2d7 moderation routes require moderation status 2014-12-26 13:46:47 +01:00
pixeldesu 2107ec6270 init moderation controller 2014-12-25 23:00:33 +01:00
nilsding 6ac9af787e added Capistrano 2014-12-21 22:12:59 +01:00
nilsding 1ba34c59d0 added "delete all questions" button thing 2014-12-21 13:41:57 +01:00
Andreas N 46c9ccc0ac question page added 2014-12-19 22:34:24 +01:00
nilsding c9d57e235f added route for notifications 2014-12-14 15:17:52 +01:00
nilsding b25c419e52 aw yeah 2014-12-12 23:53:23 +01:00
nilsding 7e5ce0c048 added sidekiq.yml 2014-12-12 22:59:25 +01:00
nilsding 9c59e802c1 boost connection pool 2014-12-12 22:50:54 +01:00
nilsding f24433d84e added Services controller 2014-12-12 21:43:09 +01:00
nilsding 12180bf1f2 added OmniAuth initializer 2014-12-12 21:42:50 +01:00
nilsding 319d75fdf5 added sidekiq/web 2014-12-12 18:35:14 +01:00
nilsding c5f2e8e449 added Sidekiq initializer 2014-12-12 17:35:16 +01:00
nilsding bfeb7b3edb updated configuration example 2014-12-12 13:45:02 +01:00
nilsding 2251a21872 added public timeline 2014-12-11 06:39:35 +01:00
nilsding 0eb5e8104b added RailsAdmin 2014-12-10 17:01:59 +01:00
nilsding daab6ce4f5 THIS IS SPARTA 2014-12-09 23:21:41 +01:00
pixeldesu f277b249c2 added notification controller 2014-12-09 22:35:11 +01:00
nilsding c18ac74700 renamed following to friends 2014-12-08 19:51:34 +01:00
nilsding 30c8654a27 added follower/following pages 2014-12-08 17:03:06 +01:00
nilsding 7de522a82f added question#show thing and more... 2014-12-07 20:51:44 +01:00
nilsding d0c2669463 added haml initializer 2014-12-07 17:56:51 +01:00
nilsding 8479f308ac ! 2014-12-07 14:29:35 +01:00
nilsding 641fa1ddc3 added show answer thing 2014-12-05 07:02:23 +01:00
nilsding 97c197f112 smiles!!! 2014-11-30 20:31:22 +01:00
nilsding ae4952db28 deleting questions from the inbox is now possible 2014-11-30 18:05:51 +01:00
nilsding 4db8f8f33f added some Ajax routes 2014-11-30 14:45:32 +01:00
nilsding 8dff4462cf added (ajax) answer controller 2014-11-26 17:05:46 +01:00
nilsding 76e6b8f5ec tests. 2014-11-17 23:25:28 +01:00
nilsding b1a1c83163 answers are now shown on the user page 2014-11-12 20:40:24 +01:00
nilsding 57dc1f51c6 added a new config value and initializer for will_paginate 2014-11-12 20:40:06 +01:00
nilsding 1702c2fca4 added inbox ajax thing 2014-11-11 16:19:20 +01:00
nilsding a7f37fb31c added Inbox controller 2014-11-11 07:10:41 +01:00
nilsding 62eae3affe added new config variable 2014-11-11 06:48:22 +01:00
nilsding ba71902c27 asking questions is now possible! …kinda. 2014-11-10 21:56:30 +01:00
nilsding b65c60ea76 we are now making AJAX requests 2014-11-10 18:19:04 +01:00
nilsding f7f71e9cc9 modified show_user_profile routes, added ajax route 2014-11-10 13:04:10 +01:00
nilsding 7ab98b95e1 hhh 2014-11-03 13:21:41 +01:00
nilsding 164d3ac642 added justask.yml for configuration 2014-11-03 12:54:24 +01:00
nilsding e3c655804e more routes! 2014-11-02 17:58:27 +01:00
nilsding ae66877cde changed a few things 2014-10-28 06:36:38 +01:00
nilsding 7641726677 added authentication and everything 2014-08-01 15:27:08 +02:00
nilsding b45be30b19 added users model 2014-08-01 12:07:16 +02:00
nilsding 601b27d3b3 added static pages 2014-08-01 11:47:25 +02:00
nilsding 386066c55b first commit 2014-08-01 11:23:47 +02:00