Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• 76104f6c24 Update Cloudfile sseerrggii 2014-01-01 09:01:05 +01:00
• 551210b55d Update Cloudfile sseerrggii 2014-01-01 08:53:06 +01:00
• fd50481810 Add domain timeoverflow.org sseerrggii 2014-01-01 08:20:09 +01:00
• 63a166b512 Merge branch 'memberships' amartincaro 2013-12-31 19:00:08 +01:00
• 2b299bac7b Merge branch 'master' into memberships amartincaro 2013-12-31 18:59:52 +01:00
• aa94217b23 Added action in users report to cancel a membership. Changed path for users resources to 'members'. Fix seed. amartincaro 2013-12-31 18:58:10 +01:00
• 61ed8de4e9 added shelly data Saverio Trioni 2013-12-31 17:41:00 +01:00
• 27b04bc1f5 Add ability to create posts for other users (for managers) Saverio Trioni 2013-12-31 13:38:59 +01:00
• 882bb737e6 Sorry, I mixed up a case with an if... :( Saverio Trioni 2013-12-31 13:38:33 +01:00
• 1631e59685 Accept a different user_id for post if the current user is a manager Saverio Trioni 2013-12-31 13:23:44 +01:00
• 28a9c45e84 Extracted common behavior from post subclasses controllers. Saverio Trioni 2013-12-31 13:20:31 +01:00
• b359b83fd9 Added action mailer configuration based on ENV. Added username field in sign up view. Added devise support in specs. amartincaro 2013-12-31 13:31:36 +01:00
• a7b810ad30 Added publisher to post Saverio Trioni 2013-12-31 12:50:31 +01:00
• 762c23746d User controller now uses devise for blocking unauthenticated access Saverio Trioni 2013-12-31 12:38:40 +01:00
• 7cc3cdafb7 Force searcher to go only on email, username and similar. Saverio Trioni 2013-12-31 12:38:05 +01:00
• 07294fe85d Adding order to a has_many without a lambda is deprecated. Saverio Trioni 2013-12-31 12:37:09 +01:00
• b1a57d2757 Using pluck breaks the rest of selected columns. Saverio Trioni 2013-12-31 12:36:47 +01:00
• fa15e515a8 Added sorting, membership-related columns, removed unused fields from user form. Saverio Trioni 2013-12-31 12:02:21 +01:00
• d490230ced Put back reports in the app. Saverio Trioni 2013-12-30 18:40:11 +01:00
• c3858c0008 Leftovers from persona Saverio Trioni 2013-12-30 18:39:58 +01:00
• 12155ba2a6 Manage seconds_to_hm when the arg is not numeric. Saverio Trioni 2013-12-27 21:00:24 +01:00
• f197d85a59 Remove persona. Bye bye. Saverio Trioni 2013-12-27 20:59:37 +01:00
• 5a2b657819 Merge remote-tracking branch 'timeoverflow/master' Saverio Trioni 2013-12-27 20:38:37 +01:00
• 9e5b6e263f Merge branch 'force-accept-terms' Saverio Trioni 2013-12-27 20:37:13 +01:00
• e508ce7f83 Merge branch 'documents' amartincaro 2013-12-27 20:30:23 +01:00
• 0df6917723 Merge branch 'master' into documents amartincaro 2013-12-27 20:30:03 +01:00
• 114bfeafcf Added terms and conditions creation in before suite (rspec). amartincaro 2013-12-27 20:29:38 +01:00
• 584e362ed0 fixed url of tagmanager Saverio Trioni 2013-12-27 20:25:49 +01:00
• fbc0b2894c Flow to accept the terms page. Saverio Trioni 2013-12-27 20:23:58 +01:00
• 4bca5c36ea Better views for devise. Saverio Trioni 2013-12-27 20:02:22 +01:00
• b9e3d82486 Merge branch 'user_status' amartincaro 2013-12-27 20:15:03 +01:00
• b0c9dfcd2d Merge branch 'master' into user_status amartincaro 2013-12-27 19:56:13 +01:00
• 2664527824 Merge branch 'transfer_computations' amartincaro 2013-12-27 19:53:32 +01:00
• 3cfa5e75ee Remove remains of previous sessions controller Saverio Trioni 2013-12-27 19:52:18 +01:00
• e60eda8704 Correct logout path Saverio Trioni 2013-12-27 19:51:53 +01:00
• a807a34ba4 Merge branch 'master' into transfer_computations amartincaro 2013-12-27 19:45:50 +01:00
• c082f27d77 Improved localization of amount value in transfers. Translation files updated. Turbolinks disabled. amartincaro 2013-12-27 19:43:34 +01:00
• c358e6bbdb Use own controller for sessions. (Remove the previous non-devise one) Saverio Trioni 2013-12-27 19:43:03 +01:00
• dd9b6b3b48 Hide Identity Document field in UI. Deleted Identity Document validation. Actions in user report are now: edit (everyone), activate/deactivate (superadmins) amartincaro 2013-12-27 18:17:23 +01:00
• a0cc8f37f5 added all devise view for configuration Saverio Trioni 2013-12-27 17:30:01 +01:00
• 88369044fd added devise things Saverio Trioni 2013-12-27 17:27:23 +01:00
• 913e457d4f added devise columns Saverio Trioni 2013-12-27 17:24:13 +01:00
• 21aa6d0561 added terms and condition link, opens in a modal Saverio Trioni 2013-12-27 13:37:06 +01:00
• 67f3311462 Merge branch 'master' into documents Saverio Trioni 2013-12-27 13:09:30 +01:00
• 2fbc9bddf3 Added documents, and a default 'terms and conds' document Saverio Trioni 2013-12-27 13:09:13 +01:00
• 658625e3f5 fixed bootstrap js url Saverio Trioni 2013-12-27 13:04:31 +01:00
• 9506ae09e5 updated gems, active_admin new syntax for permitted_params Saverio Trioni 2013-12-27 13:03:18 +01:00
• d13d24af4c don't load activeadmin js in application, load explicitly needed files Saverio Trioni 2013-12-27 11:48:09 +01:00
• c84ea82dd7 Fix some links (to user, to inquiry, to offer...) amartincaro 2013-12-24 19:54:54 +01:00
• 60627773e6 Added validations to give_time view. Added helper that converts a number of seconds to hours - minutes. amartincaro 2013-12-24 19:32:46 +01:00
• 9011e5db59 removed custom background images, they don't play well with themes Saverio Trioni 2013-12-23 12:14:52 +01:00
• 11caf5c042 Ensure that textured style is applied to navbar-inverse, so the fonts and colors are OK. Saverio Trioni 2013-12-22 22:34:24 +01:00
• 0ea4c1defa Added new landing page. Thanks @sseerrggii Saverio Trioni 2013-12-22 19:00:52 +01:00
• 039dd9ee36 Add support for markdown in haml Saverio Trioni 2013-12-22 19:00:20 +01:00
• ea413da9ec Update bootstrap version (includes support for center-block class) Saverio Trioni 2013-12-22 19:00:04 +01:00
• 021762dc5c Transfer has now 2 inputs (hours, minutes). Total amount (in seconds) is computed onsubmit time. amartincaro 2013-12-20 20:41:30 +01:00
• 7b4fcabf0b Added status to user. Added status management in create method. Added toggle method. amartincaro 2013-12-20 19:11:28 +01:00
• fb19f4934e An admin user can edit any user within his organization. Fix Edit profile link in user menu. amartincaro 2013-12-04 19:02:19 +01:00
• 7ae319294d Fix edit user form. User default attributes are no longer required. amartincaro 2013-12-03 20:43:05 +01:00
• f581235ca6 Merge branch 'bl_tests' amartincaro 2013-11-12 19:30:45 +01:00
• cbc1d5386d New tests for inquiries_controller. amartincaro 2013-11-12 19:30:30 +01:00
• 9044d38926 Merge branch 'master' into bl_tests amartincaro 2013-11-12 19:28:36 +01:00
• b583dd651f Adaptation of give_time feature to the new database model. amartincaro 2013-11-12 19:28:13 +01:00
• 60a85a6c8d New tests for transfers_controller. New spec for inquiries_controller. New fabricators. amartincaro 2013-11-07 19:44:57 +01:00
• a927023a54 Merge branch 'master' into bl_tests amartincaro 2013-11-07 19:43:41 +01:00
• 26b07222f8 Fix errors in inquiry show template. amartincaro 2013-11-07 19:43:04 +01:00
• 35744e142d Added status image for TravisCI Adrian 2013-11-06 21:46:13 +01:00
• db3e6394f3 New spec for TransfersController. amartincaro 2013-11-06 21:19:44 +01:00
• 9a270ab6da Merge branch 'master' into bl_tests amartincaro 2013-11-06 17:38:24 +01:00
• cfdd543444 Fix seeds in order to fit in the new database model. Fix reg_number_seq and member_uid generation. amartincaro 2013-11-05 19:33:59 +01:00
• 45d51e7fb4 We will use fabrication as object factory. New user fabricator. amartincaro 2013-11-05 19:31:40 +01:00
• 4c1d059b6e Añadido enlaces a perfil y modificar banco(s). Saverio Trioni 2013-11-05 10:05:51 +01:00
• 0d8deea3ad Allow to create user from admin. Saverio Trioni 2013-11-05 09:42:11 +01:00
• b1c4d52988 Fixed the filter on org to be just name. Saverio Trioni 2013-11-05 09:34:35 +01:00
• 6a0eee2f4a Some more information for bank memberships Saverio Trioni 2013-11-05 09:19:12 +01:00
• 9f1b791e0d The 'show' action for posts is available organization-wide Saverio Trioni 2013-11-05 09:16:20 +01:00
• 128a764245 TravisCI integration. amartincaro 2013-11-04 19:16:01 +01:00
• 60cb414c7f Fix for user, better layout Saverio Trioni 2013-11-04 10:29:22 +01:00
• 18cd07c131 Fix for inquiry exploding, and correct scope for offer creation and edit. Saverio Trioni 2013-11-04 10:28:35 +01:00
• d303b4b497 Wrong association definition. Saverio Trioni 2013-11-04 09:04:12 +01:00
• 0039eebe12 Correction to migration Saverio Trioni 2013-11-04 04:33:01 +01:00
• 7b6eb405e5 Added membership, and refactored with inherited_resources. Saverio Trioni 2013-11-04 04:29:50 +01:00
• 16eedc6a3a More admin. Saverio Trioni 2013-11-04 00:22:10 +01:00
• 6ef6e9e6b2 Fix for the a scope that removed previous filters... :( Saverio Trioni 2013-11-04 00:21:55 +01:00
• 0955982ee4 Superusers are defined in ENV (more secure than database). Saverio Trioni 2013-11-03 23:27:02 +01:00
• e5d553e55a Added pg-specific array-based tags. Saverio Trioni 2013-11-03 23:05:51 +01:00
• dac686458a Alta de usuario en admin. Saverio Trioni 2013-10-31 03:38:13 +01:00
• b93871ec1b Fix organization creation from admin. Saverio Trioni 2013-10-31 03:27:33 +01:00
• f3c25d87ea Protect the admin from non-superusers. Saverio Trioni 2013-10-31 03:20:13 +01:00
• b8ea9fbaa2 Some small translation tweak, menus not visible unless logged in. Saverio Trioni 2013-10-30 09:27:11 +01:00
• c8be1e565e Fix for login (CSRF) and deleted useless routes. Saverio Trioni 2013-10-30 09:25:43 +01:00
• 3e77688d7b The local filter should never block the flow Saverio Trioni 2013-10-30 08:07:49 +01:00
• e79cdc3380 Added active_admin. Awesome!!! Saverio Trioni 2013-10-29 23:54:12 +01:00
• e3db94db28 Fix for glyph names with hyphen. Saverio Trioni 2013-10-29 23:15:55 +01:00
• a1f5246dc7 cleanup of old things. Saverio Trioni 2013-10-29 21:24:36 +01:00
• 4d95882c78 Added ENV-friendly database.yml file. Saverio Trioni 2013-10-29 20:36:33 +01:00
• 94a075a1c2 Hey, adding postgres extensions is supported! Saverio Trioni 2013-10-27 22:26:55 +01:00
• 38aaa59ef9 Glyph helper. Use as <%= glyph('icon') %> Saverio Trioni 2013-10-27 22:25:48 +01:00
• 81ba88891b Added advanced tag manager :) Saverio Trioni 2013-10-27 18:16:04 +01:00
• c8c6ffe646 Added search to offers and inquiries. Uniform actions bar Saverio Trioni 2013-10-27 01:00:21 +02:00