Commit graph

  • 8975df6a6b Event schedules controller tests improved Ana 2016-08-09 16:23:38 +02:00
  • a1c7f67735 Render errors in JSON in the schedule correctly Ana 2016-08-09 14:55:39 +02:00
  • e8261d41bc Improve Error messages Ana 2016-08-08 18:29:31 +02:00
  • c687c1072e Add event schedules and schedules controller specs Ana 2016-08-08 18:01:35 +02:00
  • 5761e0f7a4 Using flash instead of alerts in the schedule Ana 2016-08-05 20:04:26 +02:00
  • 81108290e5 Schedule update moved to program update Ana 2016-08-04 19:20:11 +02:00
  • 310c521790 EventSchedulesController when something goes wrong Ana 2016-08-04 17:06:34 +02:00
  • 13bcee485e Has a valid factory test for event schedule Ana 2016-08-04 13:16:32 +02:00
  • c469f4f415 Event schedule controller pluralized Ana 2016-08-04 12:19:32 +02:00
  • 33e9c86214 Selected_scheduled? helper added Ana 2016-08-04 01:59:58 +02:00
  • 29b920d746 Corrections in SchedulesController Ana 2016-08-04 00:56:01 +02:00
  • 2e1cd164a4 Load event schedule fixed Ana 2016-08-03 23:22:09 +02:00
  • 57d2a05b7f Use of Rails usl helper instead of interpolation Ana 2016-08-03 22:02:37 +02:00
  • a578167cf5 Event model improvements Ana 2016-08-01 21:25:12 +02:00
  • 5001848af7 Introduce an Admin::EventScheduleController Ana 2016-08-01 00:52:52 +02:00
  • a394293500 Do not use JS to initialize the schedule Ana 2016-07-31 18:41:27 +02:00
  • 71dab6b79c SchedulesController introduced Ana 2016-07-29 22:02:01 +02:00
  • b037a5eb7c Load and authorize schedule in ScheduleController Ana 2016-07-29 18:29:57 +02:00
  • 42848f929b Several schedules in the backend && routes changed Ana 2016-07-29 01:05:15 +02:00
  • 3897ec79ca Repeated sentence moved to a function Ana 2016-07-28 17:37:11 +02:00
  • beb17165a2 Introduce an association for the selected_schedule Ana 2016-07-28 12:50:32 +02:00
  • 3f114629f9 javascript for the admin schedule moved to a .js Ana 2016-07-27 21:07:44 +02:00
  • 0b26ed5c35 EventSchedule validations Ana 2016-07-26 16:20:31 +02:00
  • 354e15a76d Public schedule adapted to the new relations Ana 2016-07-20 23:20:47 +02:00
  • dfd64a4510 Integrate the schedule in the admin interface Ana 2016-07-13 01:33:56 +02:00
  • e7a30302ff Tests for the new associations and models Ana 2016-07-08 13:27:42 +02:00
  • c047ffd699 New associations and models: schedule versioning Ana 2016-07-08 13:28:02 +02:00
  • e34a1904e0 Merge pull request #1132 from Ana06/all-events-links Stella Rouzi 2016-08-11 13:20:46 +03:00
  • 96337ed081 Make the whole event panel clickable in all events Ana 2016-08-10 17:11:08 +02:00
  • ebce23686c Merge cdd2242c87 into 424b1302cb Shlok Srivastava 2016-08-10 13:43:33 +00:00
  • cdd2242c87 Updated schema acc to rails 5 shlok007 2016-08-10 19:01:04 -04:00
  • 519a3616ac app:update and modifying configurations shlok007 2016-08-10 17:20:10 -04:00
  • 81ef17f346 .travis.yml updated to use ruby v2.3.1 shlok007 2016-08-10 11:20:33 -04:00
  • 2596c501fa Resolving Dependencies shlok007 2016-08-10 03:07:44 -04:00
  • 211410b6f0 Merge 4d4736f042 into 424b1302cb Rishabh Saxena 2016-08-10 06:18:19 +00:00
  • a09b04a865
    Replace unless else with if else and fix undefined method error Arun Kumar 2016-08-09 22:20:56 +05:30
  • 067f61364d
    Refactor code Arun Kumar 2016-08-05 22:55:46 +05:30
  • 59076c9dd7
    Add ability for ichain users to login before registering for conference Arun Kumar 2016-08-05 22:23:26 +05:30
  • 95f81b39f3
    Redirect user to the login page while registering with ichain Arun Kumar 2016-07-07 02:01:45 +05:30
  • 424b1302cb Merge pull request #1126 from Ana06/unless Stella Rouzi 2016-08-09 13:21:17 +03:00
  • c1334e59cc Do not use unless with else Ana 2016-08-08 23:57:03 +02:00
  • 859b3beda6 Merge pull request #1123 from Ana06/if_not Christian Bruckmayer 2016-08-08 14:07:05 +02:00
  • 81ef4f0438 Merge pull request #1112 from Ana06/ability_test Christian Bruckmayer 2016-08-08 14:05:30 +02:00
  • 2b79f07acf Merge pull request #1111 from LukasReschke/patch-1 Christian Bruckmayer 2016-08-08 14:04:14 +02:00
  • 7f3ee13358 Schedule tags improved Ana 2016-08-07 21:49:35 +02:00
  • 7e5d20c89d style: if ! changed by unless Ana 2016-08-06 00:57:07 +02:00
  • a916795a15 Merge 325a5ae77a into 96155eb87f Ana María Martínez Gómez 2016-08-01 22:47:08 +00:00
  • 325a5ae77a Avoid overlapping in the admin schedule Ana 2016-07-23 00:23:24 +02:00
  • 99f71497cc Introduce a "Save" button for the admin schedule Ana 2016-07-22 17:57:26 +02:00
  • 2d95cd05ff Inform that there are no rooms in the schedule Ana 2016-07-19 23:49:06 +02:00
  • f65778b4fe Event model improvements Ana 2016-08-01 21:25:12 +02:00
  • 47e316cddd Introduce an Admin::EventScheduleController Ana 2016-08-01 00:52:52 +02:00
  • af75334353 Do not use JS to initialize the schedule Ana 2016-07-31 18:41:27 +02:00
  • cb9253ff07 SchedulesController introduced Ana 2016-07-29 22:02:01 +02:00
  • c5e410843c Load and authorize schedule in ScheduleController Ana 2016-07-29 18:29:57 +02:00
  • 4abc60424d Several schedules in the backend && routes changed Ana 2016-07-29 01:05:15 +02:00
  • 060d7e909c Repeated sentence moved to a function Ana 2016-07-28 17:37:11 +02:00
  • f8f1d9c61b Introduce an association for the selected_schedule Ana 2016-07-28 12:50:32 +02:00
  • 17bfb02d27 javascript for the admin schedule moved to a .js Ana 2016-07-27 21:07:44 +02:00
  • 7ad7a6423d EventSchedule validations Ana 2016-07-26 16:20:31 +02:00
  • 2aee0158f8 Public schedule adapted to the new relations Ana 2016-07-20 23:20:47 +02:00
  • 8f3dcda2f7 Integrate the schedule in the admin interface Ana 2016-07-13 01:33:56 +02:00
  • 71b39bb612 creation of my_conference repeated in ability_spec Ana 2016-07-29 19:58:11 +02:00
  • 0b5d6ac6e4 Use v1.0 instead of v1.0-beta Lukas Reschke 2016-07-29 12:26:46 +02:00
  • 00ff197658 Updated layout of ichain sign in page jmks 2016-07-28 14:21:38 -04:00
  • 3bf42a3cc4 Tests for the new associations and models Ana 2016-07-08 13:27:42 +02:00
  • dea273d8bd New associations and models: schedule versioning Ana 2016-07-08 13:28:02 +02:00
  • 96155eb87f Merge pull request #1082 from nishanthvijayan/handle-cancelled-events Henne Vogelsang 2016-07-25 15:52:53 +02:00
  • 5edc6123f4 Merge pull request #987 from differentreality/blind_voting Henne Vogelsang 2016-07-25 15:49:01 +02:00
  • a071d4497b Handle cancelation of scheduled events Nishanth Vijayan 2016-07-13 18:36:22 +05:30
  • 63750345e7 Merge pull request #1032 from Ana06/all-events Henne Vogelsang 2016-07-25 11:47:28 +02:00
  • 1559b29d2d Rubocop class length increased Ana 2016-07-15 13:55:21 +02:00
  • bf7f5ce09f The schedule takes you to the current day and time Ana 2016-07-02 17:23:56 +02:00
  • 39c4261859 All events takes you to the current day Ana 2016-07-01 11:41:16 +02:00
  • 6d9eabcc0e All events moved to a different controller method Ana 2016-06-30 16:53:15 +02:00
  • 24364d0136 _all_events hamlfy Ana 2016-07-06 19:53:02 +02:00
  • 6f20031bc1 _carousel hamlfy Ana 2016-06-30 20:56:00 +02:00
  • cd32ddd422 _schedule hamlfy Ana 2016-06-30 13:57:25 +02:00
  • 818c55df5a Tracks color in all events takes background into account. Ana 2016-06-30 11:03:08 +02:00
  • 70f30fcb1f Dropdown with date tags in all events Ana 2016-06-12 21:37:16 +02:00
  • cc031b9f3a Unscheduled events added to all events Ana 2016-06-11 00:43:45 +02:00
  • 69043e1549 All events grouped by date and time Ana 2016-06-10 22:39:06 +02:00
  • 14b0669f8b Merge pull request #1103 from Ana06/event-serializer-length Stella Rouzi 2016-07-22 13:23:17 +03:00
  • 59eeb7edbd Enable blind voting Stella Rouzi 2016-07-05 16:44:53 +03:00
  • 4d4736f042 repair tests Rishabh Saxena 2016-07-22 01:15:22 +05:30
  • 851b467235 payment view improvement Rishabh Saxena 2016-07-22 00:05:30 +05:30
  • 6d8605073f use full_name instead of first and last name, test changes, schema improvements Rishabh Saxena 2016-07-21 22:43:43 +05:30
  • f00e051eff refactor payment#purchase method, improve environment variable names Rishabh Saxena 2016-07-21 10:15:17 +05:30
  • c4d934d711 refactor payment model and its tests Rishabh Saxena 2016-07-19 12:37:19 +05:30
  • a0fc9dd950 Default value for length in as_json fixed Ana 2016-07-18 11:45:59 +02:00
  • 25c0046290 repair code reviews, improve environment configs Rishabh Saxena 2016-07-18 12:04:10 +05:30
  • 8388385b51 Merge pull request #1102 from Ana06/unused-css Christian Bruckmayer 2016-07-15 14:12:54 +02:00
  • 223a0eead9 delete unused methods, add feature tests Rishabh Saxena 2016-07-15 02:46:31 +05:30
  • 3b4c7d70c0 remove card_types from helpers Rishabh Saxena 2016-07-14 22:20:31 +05:30
  • ae44abc7e6 solve code reviews, resolve rebase conflicts Rishabh Saxena 2016-07-14 19:10:33 +05:30
  • 9b704e483e modify tests Rishabh Saxena 2016-07-14 19:09:39 +05:30
  • a3d709bc75 add helper tests Rishabh Saxena 2016-07-14 19:08:28 +05:30
  • 540e19e015 unused css removed Ana 2016-07-14 12:31:04 +02:00
  • 9379586fad Remove cocoon and volunteers tests. Stella Rouzi 2016-07-13 06:51:36 +03:00
  • 6b6fc61fd8 Merge ed087352e2 into 7a95c43a57 Stella Rouzi 2016-07-13 03:27:47 +00:00