Commit graph

  • dd159c5555 Fix edit and schedule buttons on proposal show page Aditya Prakash 2016-03-13 18:51:08 +05:30
  • 8ae7155218 #name test added Ana 2016-03-13 01:37:11 +01:00
  • 7e4d91adaf Improvements in registration specs Aditya Prakash 2016-03-12 17:46:50 +05:30
  • e826bb85eb writing tests for deleting tickets after unregistering Rishabh Saxena 2016-03-12 14:08:32 +05:30
  • e94fabbaa8 after destroy callback for registration Rishabh Saxena 2016-03-12 11:57:48 +05:30
  • c5e8b815bd tmp commit: adding proposal controller tests Aditya Prakash 2016-03-12 11:50:49 +05:30
  • 21d9e126f2 Add controller test for users#show Stella Rouzi 2016-03-04 19:17:58 +02:00
  • ac066b0546 deleting all associated tickets to a user Rishabh Saxena 2016-03-11 14:59:44 +05:30
  • 297b1f8c8a Adding tests for tickets deletion. Rishabh Saxena 2016-03-10 21:44:18 +05:30
  • 5a19d47376 checking if no tickets are purchased. passing tests. Rishabh Saxena 2016-03-10 03:20:15 +05:30
  • 5ad99e1cd8 fixed typo in destroying Rishabh Saxena 2016-03-10 03:18:24 +05:30
  • 892c15b64a destroying purchased tickets. Rishabh Saxena 2016-03-10 03:17:28 +05:30
  • 922e94649d overriding the #name attribute Ana 2016-03-10 22:49:54 +01:00
  • 5bff60ec7d Tests for ConferenceRegistrations controller Aditya Prakash 2016-02-29 00:21:24 +05:30
  • 13a6586f81 Tests for registration model Aditya Prakash 2016-02-27 13:43:19 +05:30
  • c71d15565e Fix authorization of new and create in ConferenceRegistrationsController Aditya Prakash 2016-02-28 12:07:13 +05:30
  • b18e302224 Merge pull request #852 from differentreality/programs_typo Christian Bruckmayer 2016-03-10 15:51:29 +01:00
  • 62bc035e53 Merge pull request #862 from ChrisBr/ichain Henne Vogelsang 2016-03-10 15:28:12 +01:00
  • 15ba6449ea Merge pull request #863 from ChrisBr/config Henne Vogelsang 2016-03-10 15:24:03 +01:00
  • 2f23ba2fd3 Remove duplicate delivery_method config option Christian Bruckmayer 2016-03-10 15:06:59 +01:00
  • a6c89351c5 Make Comment find_since_last_login scope robust against nil value Christian Bruckmayer 2016-03-10 13:59:59 +01:00
  • 55ab8a8e8f Set sign_in attributes on iChain login Christian Bruckmayer 2016-03-10 13:42:30 +01:00
  • 18645081ac Merge pull request #861 from sonalkr132/admin-proposal-overflow Henne Vogelsang 2016-03-10 14:48:56 +01:00
  • afc58d3d85 Fix overflow of proposal edit in admin area Aditya Prakash 2016-03-10 17:42:09 +05:30
  • fb4e8958e0 Fix variable @program typo in programs#show Stella Rouzi 2016-03-09 20:11:59 +02:00
  • 7e585615c9 Merge 2f1052df1a into 976616b47b Nishanth Vijayan 2016-03-09 14:13:19 +00:00
  • 976616b47b Protect root_path from forgery with null_session Henne Vogelsang 2016-03-09 14:12:31 +01:00
  • 36f3730846 Adopt the schema to latest migration Henne Vogelsang 2016-03-09 13:39:58 +01:00
  • 9c2ef19741 Don't require support/external_request from rake tasks Henne Vogelsang 2016-03-09 13:32:43 +01:00
  • 2f1052df1a Replace add userby email textinput in admin/roles#show with searchable combobox Nishanth Vijayan 2016-03-09 17:41:28 +05:30
  • fd8dbfe7a7 Fix autloading of webmock/rspec in production Henne Vogelsang 2016-03-09 12:03:27 +01:00
  • 97ca07d142 Merge pull request #841 from chocoelho/unset_footer_fixed_height Henne Vogelsang 2016-03-09 11:47:26 +01:00
  • 0df693ffbf Merge pull request #820 from differentreality/update_rolify Henne Vogelsang 2016-03-09 11:32:52 +01:00
  • 158679dcc3 Merge caa2e0532a into 782a1f071f theaverageguy 2016-03-09 10:25:12 +00:00
  • 782a1f071f Merge pull request #801 from sonalkr132/targets_test Stella Rouzi 2016-03-09 12:13:53 +02:00
  • 1990d3a1ad Merge pull request #837 from sonalkr132/room-ticket-tests Stella Rouzi 2016-03-09 12:04:12 +02:00
  • e560d263c9 Merge pull request #838 from sonalkr132/ticket-tests Stella Rouzi 2016-03-09 12:03:52 +02:00
  • 877402e837 Merge pull request #849 from nishanthvijayan/fix-markdown-editor-assetgem Henne Vogelsang 2016-03-08 18:06:35 +01:00
  • f713d1eac5 Check installed Bundler version Nishanth Vijayan 2016-03-08 21:14:44 +05:30
  • 34e8dade05 Enforce min bundler version required by rails-assets Nishanth Vijayan 2016-03-08 19:20:35 +05:30
  • 64b825cebe Fix markdown editors bug #811 using asset gem. Nishanth Vijayan 2016-03-08 16:50:30 +05:30
  • b9469f6a17 Merge pull request #847 from ChrisBr/update_country_select Henne Vogelsang 2016-03-08 11:23:50 +01:00
  • 34f2c1f395 new db/schema Stella Rouzi 2016-03-08 00:19:54 +02:00
  • 40a48e1e7e Update rolify and cancancan Stella Rouzi 2016-03-04 19:33:06 +02:00
  • 8c90d163a6 Merge 0dcf282601 into 9fbd2e9618 Nishanth Vijayan 2016-03-07 17:33:42 +00:00
  • d5f138b3dc Update country_select gem Christian Bruckmayer 2016-03-07 18:28:14 +01:00
  • 0dcf282601 Update bootstrap-markdown to v2.10.0.Fixes markdown editors bug #811. Nishanth Vijayan 2016-03-07 22:56:40 +05:30
  • 9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track Christian Bruckmayer 2016-03-07 17:12:33 +01:00
  • 25e879ee13 Merge pull request #825 from chocoelho/switch_vagrant_box Henne Vogelsang 2016-03-07 16:24:23 +01:00
  • c9cce9fcca Update INSTALL.md Henne Vogelsang 2016-03-07 14:52:39 +01:00
  • 7b3208b43b Tests for room controller Aditya Prakash 2016-03-06 11:21:31 +05:30
  • a964864fc6 Merge feaa61d0f2 into feeac2a816 Rishabh Saxena 2016-03-07 13:36:24 +00:00
  • feeac2a816 Merge pull request #846 from chocoelho/add_conference_email Christian Bruckmayer 2016-03-07 14:19:05 +01:00
  • fda08ecdb5 Added email to social media section Carlos Coelho 2016-03-07 09:47:21 -03:00
  • 483d9a234e Verified contact has email or not Carlos Coelho 2016-03-07 09:43:55 -03:00
  • c61696a3f8 Merge pull request #845 from rishabhs95/admin-view-users-datatable Christian Bruckmayer 2016-03-07 11:26:53 +01:00
  • 5368a7eb51 Merge b034d049da into 636eb40499 Rishabh Saxena 2016-03-07 09:50:42 +00:00
  • 636eb40499 Merge pull request #831 from ChrisBr/letter_open_web Henne Vogelsang 2016-03-07 10:50:30 +01:00
  • 2c1db3bd2a Making datatable responsive in admin's users view. Rishabh Saxena 2016-03-07 15:15:29 +05:30
  • b034d049da Merge branch 'admin-users-datatable' of https://github.com/rishabhs95/osem into admin-users-datatable Rishabh Saxena 2016-03-07 14:04:44 +05:30
  • f3924f6aff Adding table-responsive in datatable in admin's users view Rishabh Saxena 2016-03-07 14:02:54 +05:30
  • 5a90d42828 Merge 7b6be3a1eb into ac7149fbe5 awasum 2016-03-07 07:46:09 +00:00
  • 7b6be3a1eb minor col-md-12 awasum 2016-03-07 08:45:23 +01:00
  • 2ac7074a9d Fixed unresponsive table on admin/user web page. fixed secret key generation error renamed config files from example. awasum 2016-03-07 08:00:23 +01:00
  • db32854bb0 Making datatable responsive in admin's users view. Rishabh Saxena 2016-03-07 11:42:44 +05:30
  • 0336171e4a Unset footer fixed height Carlos Coelho 2016-03-06 22:20:13 -03:00
  • feaa61d0f2 Muting Bootstrap Markdown Options which make markdown editor get stuck in a loop. Ticket Description Working Issue #811 Rishabh Saxena 2016-03-06 23:04:16 +05:30
  • ebd01f064a Tests for ticket model Aditya Prakash 2016-03-05 15:49:10 +05:30
  • 69a4139268 Tests for room model Aditya Prakash 2016-03-05 16:41:46 +05:30
  • c219ffc9a3 Tests for Admin::Targets controller Aditya Prakash 2016-03-01 03:01:49 +05:30
  • 680d23a64a Tests for target model Aditya Prakash 2016-03-01 01:48:02 +05:30
  • dd08b702b9 Add program relation in generate_event_mail. fix #835 David Sedeño 2016-03-06 00:19:55 +01:00
  • c9951b451a Fix send emails because missing event program relation. fix #835 David Sedeño 2016-03-05 23:48:43 +01:00
  • caa2e0532a Name attribute in email theaverageguy 2016-03-05 23:05:22 +05:30
  • b9614a8212 Delete Purchased tickets Chashmeet Singh 2016-03-05 22:26:50 +05:30
  • ac7149fbe5 Merge pull request #832 from ChrisBr/vagrant Christian Bruckmayer 2016-03-05 16:23:13 +01:00
  • 50d946e4a7 Fixes setup db if statement in bootstrap.sh Christian Bruckmayer 2016-03-05 15:15:22 +01:00
  • 38296b0a63 Rename options.yml to config.yml in bootstrap.sh Christian Bruckmayer 2016-03-05 15:13:10 +01:00
  • 2dad051ab9 Add letter_opener_web Christian Bruckmayer 2016-03-05 14:09:22 +01:00
  • c5c392d4c7 Merge pull request #794 from differentreality/user_model_tests Christian Bruckmayer 2016-03-05 13:45:39 +01:00
  • 0ddaea2e5f Merge pull request #823 from hennevogel/master Christian Bruckmayer 2016-03-05 13:06:13 +01:00
  • feaf9d8078 Feature: Add/change Track for Event Henne Vogelsang 2016-03-05 02:54:09 +01:00
  • 5abd4abddd Merge 06c60ef095 into 18bb1bd237 Carlos Coêlho 2016-03-04 17:46:50 +00:00
  • 81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. Stella Rouzi 2016-02-26 15:19:23 +02:00
  • 18bb1bd237 Merge pull request #770 from hennevogel/feature_venue_show Stella Rouzi 2016-03-04 19:44:49 +02:00
  • 4b225f321c Controller test for users#show Stella Rouzi 2016-03-03 14:28:14 +02:00
  • 786d2c7985 update rolify Stella Rouzi 2016-02-26 18:45:07 +02:00
  • 06c60ef095 User creation if not signed in moved to helper Carlos Coelho 2016-03-04 14:07:07 -03:00
  • 99ce0411bc Updated vagrant box to official Leap release Carlos Coelho 2016-03-04 13:14:29 -03:00
  • 6b45645436 Merge 492297770b into af168f0f55 Stella Rouzi 2016-03-04 16:11:58 +00:00
  • af168f0f55 Merge pull request #700 from differentreality/roles_updated Henne Vogelsang 2016-03-04 17:11:56 +01:00
  • 33e1c6eae1 Beautify venues#show Henne Vogelsang 2016-02-08 12:25:42 +01:00
  • f83e76102f Make use of holder.js in venue#show Henne Vogelsang 2016-02-06 22:43:08 +01:00
  • 205fda70ea Some Vagrant fixes Henne Vogelsang 2016-03-04 15:36:45 +01:00
  • aa912357d6 Using guard clause instead of conditional wrapping Carlos Coelho 2016-03-04 11:34:16 -03:00
  • 2302821c48 Extract method of proposal submission Carlos Coelho 2016-03-04 11:09:50 -03:00
  • b58a00b321 Extract user creation method if not signed in Carlos Coelho 2016-03-04 11:09:14 -03:00
  • 3dc7aaf4ea Merge pull request #816 from chashmeetsingh/patch-2 Christian Bruckmayer 2016-03-04 08:52:31 +01:00
  • edbba42e16 Update Gemfile.lock Chashmeet Singh 2016-03-03 22:35:17 +05:30
  • 0e01ffa565 Merge pull request #786 from sonalkr132/test Henne Vogelsang 2016-03-03 16:42:46 +01:00