Commit graph

  • 22714b0f11 Fix api/v1/events and api/v1/speakers controllers Nishanth Vijayan 2016-03-31 13:13:27 +05:30
  • bc5c5dd7ca Fix reference to non-existant route path in commercials_controller Nishanth Vijayan 2016-03-30 21:39:10 +05:30
  • c35270ad31 More sane branching in confirm action of proposal controller Aditya Prakash 2016-03-31 15:31:54 +05:30
  • 39a850cc39 Merge pull request #918 from matthin/master Henne Vogelsang 2016-03-31 12:05:23 +02:00
  • 12026b1a66 Merge pull request #929 from sonalkr132/rubocop-first Henne Vogelsang 2016-03-31 11:07:23 +02:00
  • 99c47a08ef Running rubocop first would give faster CI response for style offense Aditya Prakash 2016-03-30 22:38:17 +05:30
  • f4678e5415 Add proposal controller tests Aditya Prakash 2016-03-24 17:49:34 +05:30
  • 6aedf2b03d Merge pull request #904 from Shriyanshagro/master Henne Vogelsang 2016-03-30 17:31:42 +02:00
  • 483f1ccd85 Merge pull request #893 from nishanthvijayan/fix-tooltip-track Henne Vogelsang 2016-03-30 17:30:36 +02:00
  • 1979c0d9c1 Merge pull request #886 from sonalkr132/auth-registration Henne Vogelsang 2016-03-30 17:29:10 +02:00
  • c349700e72 Merge pull request #917 from sonalkr132/email-setting-tests Christian Bruckmayer 2016-03-29 15:40:42 -06:00
  • 4129955835 Move hash merge in before block and add test for missing name Aditya Prakash 2016-03-29 23:10:19 +05:30
  • ae917abbc6 Merge pull request #913 from nishanthvijayan/fix-schedule-rooms Christian Bruckmayer 2016-03-29 11:18:19 -06:00
  • 96cf00fda6 Remove registrations view test Justin Harrison 2016-03-29 13:14:42 -04:00
  • 4b5fce4203 Merge pull request #925 from davidsf/fix_conf_registration_show Christian Bruckmayer 2016-03-29 10:42:35 -06:00
  • 18b1ad2b70 More efficient listing of roles Justin Harrison 2016-03-29 12:04:48 -04:00
  • adf7e0149a Fix conference program proposal link in conference_registration.show. fix #924 David Sedeño 2016-03-28 23:18:35 +02:00
  • 40d478d500 with removed comments on osem-datepicker.js Shriyansh 2016-03-29 01:28:05 +05:30
  • 11bae37cc4 Merge pull request #866 from nishanthvijayan/fix-roles-autodeletion Stella Rouzi 2016-03-28 22:57:38 +03:00
  • 459a281230 Add test for email_settings model Aditya Prakash 2016-03-26 22:04:44 +05:30
  • 77649d73a6 Add model test to verify role is not deleted on removing all of its users Nishanth Vijayan 2016-03-24 01:14:08 +05:30
  • 3129c196fa Add rake task to re-add deleted roles from all conferences Nishanth Vijayan 2016-03-17 00:53:50 +05:30
  • 48b48e88ac Add before_destroy :cancel to precent role destroy.Change Conference-Role association to have dependent: :destroy_all Nishanth Vijayan 2016-03-11 20:44:09 +05:30
  • 2df6d1039f Merge pull request #916 from nishanthvijayan/eventattach-routes-cleanup Stella Rouzi 2016-03-28 16:10:56 +03:00
  • 33feb73246 removed defaultDate parametre from registration-period Shriyansh 2016-03-28 02:54:26 +05:30
  • 5e51a86e8b conference-start-day >= Current_date Shriyansh 2016-03-28 02:29:42 +05:30
  • bb858814ec Defined Constraints of start_date and end_date for Registration Period of conference Shriyansh 2016-03-28 02:10:31 +05:30
  • 70b8fca197 Made use of Rails I18n data format in EventSerializer #598 Shriyansh 2016-03-27 20:03:26 +05:30
  • b9cb920ccf Defined Arrival/Departure time constraints for attendees Shriyansh 2016-03-27 18:01:50 +05:30
  • c5da563a48 Merge branch 'master' of https://github.com/camillem/osem CamilleM 2016-03-26 23:37:35 +01:00
  • d11ea33cf0 Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908 CamilleM 2016-03-26 23:32:43 +01:00
  • 20b4cbf1f2 prefilled users arrival time with dates of the conference Shriyansh 2016-03-27 03:30:33 +05:30
  • 7c38622e8f Display roles in registration list Justin Harrison 2016-03-26 13:01:16 -04:00
  • 53555d5efa Remove leftover from event_attachment in routes Nishanth Vijayan 2016-03-26 15:49:23 +05:30
  • b94d34b6aa Merge 9c41817813 into 10ef898a0d Rishabh Saxena 2016-03-26 07:21:28 +00:00
  • 9c41817813 making sidebar collapsible for smaller views. Rishabh Saxena 2016-03-26 12:43:07 +05:30
  • 88a1197b12 Mark Events without room as unscheduled events Nishanth Vijayan 2016-03-26 00:00:53 +05:30
  • c0515d0c22 Downgrade holderjs to 2.9.1 Aditya Prakash 2016-03-24 17:59:35 +05:30
  • e851c0b4ff Add authorization rule for create user by unsigned user Aditya Prakash 2016-03-24 17:42:00 +05:30
  • dcb98c49f9 Improvements in proposal controller Aditya Prakash 2016-03-24 00:24:52 +05:30
  • f74fa695f7 Merge 1f3feeb0c9 into 10ef898a0d Shriyansh Agrawal 2016-03-23 19:35:35 +00:00
  • 1f3feeb0c9 Merge branch 'master' into handle_merge_conflicts Shriyansh 2016-03-24 01:01:00 +05:30
  • 246bf605ea Proposal submitter should be asked to add track only if conf has track Nishanth Vijayan 2016-03-18 01:59:05 +05:30
  • eae6d90e9f Fix authorization of new and create in ConferenceRegistrationsController Aditya Prakash 2016-03-17 14:54:35 +05:30
  • 10ef898a0d Merge pull request #872 from sonalkr132/proposal-after-cfp Henne Vogelsang 2016-03-23 16:34:12 +01:00
  • dae847bdca Merge pull request #901 from sonalkr132/show-destory-registration-test Henne Vogelsang 2016-03-23 16:27:50 +01:00
  • f66321a744 Merge pull request #891 from differentreality/translation_readme Christian Bruckmayer 2016-03-23 08:12:39 -06:00
  • 09ea168286 removed comments for gem'i18n' from Gemfile Shriyansh 2016-03-23 16:50:05 +05:30
  • 19157ac81d Add test for conference registration controller show and destroy action Aditya Prakash 2016-03-23 11:42:40 +05:30
  • 80a06b99b4 Merge pull request #894 from differentreality/comments Henne Vogelsang 2016-03-22 18:26:38 +01:00
  • 70d27b6a26 Merge pull request #898 from sonalkr132/edit-update-registration-test Henne Vogelsang 2016-03-22 18:25:31 +01:00
  • 5a4c6075ae Merge pull request #899 from sonalkr132/sponser-test Henne Vogelsang 2016-03-22 18:24:39 +01:00
  • 53f732ce9c Add model test for sponsership_level Aditya Prakash 2016-03-22 18:38:42 +05:30
  • 6a6824cef1 Add sponsership levels controller tests Aditya Prakash 2016-03-22 18:17:14 +05:30
  • 971018882a Add a readme file for translation Stella Rouzi 2016-03-18 19:23:28 +02:00
  • 3a167ef428 Merge pull request #897 from 4bic/4bic-patch-1 Stella Rouzi 2016-03-22 14:10:57 +02:00
  • b41d2bd5c1 Add test for conference registration controller edit and update action Aditya Prakash 2016-03-22 17:13:15 +05:30
  • 72c068203b Update routes.rb robin kiplangat 2016-03-22 12:40:26 +03:00
  • 2cb7dcd3e3 Merge c2e58490bd into 2f15309f0c Paulo Barros 2016-03-21 17:42:11 +00:00
  • c2e58490bd Add step to development guide Paulo Barros 2016-03-21 18:41:32 +01:00
  • 2f15309f0c Merge pull request #895 from 4bic/patch-1 Henne Vogelsang 2016-03-21 12:12:43 +01:00
  • e3e2312311 Update INSTALL.md robin kiplangat 2016-03-21 10:43:12 +03:00
  • 3f882957cf rewrite comments form, use strong parameters with comments Stella Rouzi 2016-03-20 19:06:12 +02:00
  • 775e3d8bca use of Rails I18n data format in EventSerializer #598 Shriyansh 2016-03-19 03:26:50 +05:30
  • a9fb07cadb Merge pull request #889 from rishabhs95/admin-tickets-view Christian Bruckmayer 2016-03-18 14:34:24 -06:00
  • 99afc456cd correcting ticket's details view and its related models. Rishabh Saxena 2016-03-18 00:25:15 +05:30
  • 3ad009658d Merge pull request #836 from davidsf/fix_email_send Christian Bruckmayer 2016-03-18 11:18:59 -06:00
  • 3e32c58460 Allow submission of proposal only if program has cfp Aditya Prakash 2016-03-12 21:08:43 +05:30
  • 835236ed7f Merge pull request #885 from sonalkr132/registration-model-tests Henne Vogelsang 2016-03-17 13:32:01 +01:00
  • 07d674ee2b Add model test for registration Aditya Prakash 2016-03-17 14:31:13 +05:30
  • 9e67a1bcd5 Merge pull request #876 from rishabhs95/delete-tickets-unregistered Christian Bruckmayer 2016-03-16 12:54:21 -06:00
  • 8334619029 callback for destroying registration and writing tests for it Rishabh Saxena 2016-03-12 11:57:48 +05:30
  • 19855d9cba Merge 7822a8d4e3 into 6cde2a5f4a Aditya Prakash 2016-03-16 15:54:10 +00:00
  • 6cde2a5f4a Merge pull request #858 from nishanthvijayan/refactor-redirect-flash Christian Bruckmayer 2016-03-16 08:19:43 -06:00
  • 9df53016ec Merge pull request #884 from nishanthvijayan/remove-role-datatable Henne Vogelsang 2016-03-16 10:25:53 +01:00
  • fd64db575b Remove datatable functionality from Roles index table. Nishanth Vijayan 2016-03-16 12:09:58 +05:30
  • 1c1e56ed46 Change update/save failures to use flash type :error instead of :alert Nishanth Vijayan 2016-03-16 11:20:56 +05:30
  • 19c54bd935 Change all redirect_to(path) to redirect path for uniformity Nishanth Vijayan 2016-03-11 02:08:00 +05:30
  • 434eb90b76 Add flash type error.Rewrite controllers to use common flash style with redirect_to Nishanth Vijayan 2016-03-10 14:25:38 +05:30
  • 65a56cd75c Merge c5e8b815bd into dcdceb7c6d Aditya Prakash 2016-03-16 03:23:59 +00:00
  • dcdceb7c6d Merge pull request #882 from rishabhs95/events-datatable Christian Bruckmayer 2016-03-15 16:38:54 -06:00
  • 52ec94588f Merge pull request #826 from differentreality/users_show_controller_test Christian Bruckmayer 2016-03-15 15:21:00 -06:00
  • 6c0d436c54 Merge pull request #873 from sonalkr132/edit-schedule-event Christian Bruckmayer 2016-03-15 15:19:18 -06:00
  • 9656fd17c2 Merge pull request #880 from nishanthvijayan/fix-api-serializers Christian Bruckmayer 2016-03-15 15:17:57 -06:00
  • d06a77ae76 enabling state save feature in datatables Rishabh Saxena 2016-03-15 19:08:57 +05:30
  • 3da04c0f7c Update active_model_serializers.Fix conference serializer and api tests Nishanth Vijayan 2016-03-15 12:29:10 +05:30
  • b5d253ff76 Merge 6beb9f68ab into d2cfb56ea5 Carlos Coêlho 2016-03-14 21:48:04 +00:00
  • 6beb9f68ab Moved withdrawn_event check to helper Carlos Coelho 2016-03-14 17:47:47 -03:00
  • e268acec23 Added alert to withdrawn events Carlos Coelho 2016-03-14 16:55:22 -03:00
  • 72c71fc510 Added inflection to pluralize was Carlos Coelho 2016-03-14 16:53:05 -03:00
  • d2cfb56ea5 Merge pull request #875 from nishanthvijayan/fix-api-rooms Christian Bruckmayer 2016-03-14 13:45:35 -06:00
  • 864245fec2 Add specs for api/v1/rooms_controller & api/v1/tracks_controller Nishanth Vijayan 2016-03-14 04:02:15 +05:30
  • 7822a8d4e3 Do not allow signed in users to registor unless registration is open Aditya Prakash 2016-03-14 23:38:55 +05:30
  • 33247cb690 Get withdrawn events list Carlos Coelho 2016-03-14 14:09:15 -03:00
  • 55cfc8ff60 Fix API endpoints conferences/id/rooms/ & tracks/ issue #874 Nishanth Vijayan 2016-03-13 21:19:58 +05:30
  • cb9cf0359b Merge pull request #854 from sonalkr132/test-user-admin Henne Vogelsang 2016-03-14 15:19:05 +01:00
  • eedb44a228 Merge e826bb85eb into 66e17d5ac5 Rishabh Saxena 2016-03-14 12:22:27 +00:00
  • d2b392e119 Remove assumption from test that first user is admin Aditya Prakash 2016-03-12 15:18:45 +05:30
  • 0619eb7963 Enforce non-admin attribute of user factory Aditya Prakash 2016-03-09 21:34:07 +05:30
  • 66e17d5ac5 Merge pull request #865 from Ana06/master Henne Vogelsang 2016-03-14 12:14:19 +01:00