Commit graph

  • 7a95c43a57 Require less variables for heroku. Henne Vogelsang 2016-07-12 16:27:49 +02:00
  • 07c9aee7cc remove 'paid' argument in testing function calls Rishabh Saxena 2016-07-11 23:01:05 +05:30
  • 888c7a8524 use short-form presence validator. use two-argument form. add unpaid scope. repair tests. Rishabh Saxena 2016-07-08 23:07:17 +05:30
  • 893f517ab0 pass paid value as hash, improve code reviews Rishabh Saxena 2016-07-08 20:24:56 +05:30
  • 8b03f1be74 check for other tests Rishabh Saxena 2016-07-08 12:51:18 +05:30
  • df4b015c09 replace submit form capybara Rishabh Saxena 2016-07-08 09:12:32 +05:30
  • e31ca46f87 submit form directly in tests Rishabh Saxena 2016-07-08 00:59:24 +05:30
  • 2e66e5807a check path transition after payment Rishabh Saxena 2016-07-08 00:48:31 +05:30
  • 58a240a9f2 add tests and repair button click Rishabh Saxena 2016-07-08 00:18:14 +05:30
  • 99b4d18729 check failing tests Rishabh Saxena 2016-07-07 23:53:07 +05:30
  • 5b8e7ade2f use select instead of fill_in capybara Rishabh Saxena 2016-07-07 19:28:15 +05:30
  • 1af6fa5ad1 add id to inputs and repair tests Rishabh Saxena 2016-07-07 18:39:35 +05:30
  • c57a8a1d00 repair tests and move method belonging to controller Rishabh Saxena 2016-07-06 23:50:04 +05:30
  • 38ae24c6b3 add more tests Rishabh Saxena 2016-07-06 12:40:42 +05:30
  • c0c84b9dbf add more explanatory true/false values Rishabh Saxena 2016-07-05 16:39:38 +05:30
  • f202c6b93b repairing code reviews Rishabh Saxena 2016-06-26 08:07:00 +02:00
  • ee71456060 improve tests[WIP] Rishabh Saxena 2016-06-18 18:33:36 +05:30
  • 809e2b7156 active merchant GATEWAY config Rishabh Saxena 2016-06-18 18:32:54 +05:30
  • b202984fa9 update ticket purchase and conference registration views for new structure Rishabh Saxena 2016-06-18 18:32:21 +05:30
  • 14594c7a4d add payment views, styling and its helper methods Rishabh Saxena 2016-06-18 18:30:17 +05:30
  • 81ef41be8b modify controllers and models to just save paid ticket purchases Rishabh Saxena 2016-06-18 18:25:20 +05:30
  • 900a1b32a8 add payment resources, controllers and method for updating purchased ticket's parameters Rishabh Saxena 2016-06-18 18:18:52 +05:30
  • 36f2cf4373 add payment model and its associations Rishabh Saxena 2016-06-18 18:13:29 +05:30
  • e8f1645fc2 add active merchant and payment schema Rishabh Saxena 2016-06-18 18:06:36 +05:30
  • 69a5d41b79 Merge pull request #1080 from Ana06/text-color Christian Bruckmayer 2016-07-11 16:31:47 +02:00
  • feb002de1a Text color of event types and difficulty levels Ana 2016-07-03 00:02:14 +02:00
  • 28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color Christian Bruckmayer 2016-07-11 15:10:26 +02:00
  • 2e73c3f67b Rubocop class length increased Ana 2016-07-04 18:22:10 +02:00
  • 8d9bb56f06 Hexadecimal color changed to capital letters Ana 2016-07-04 17:53:21 +02:00
  • 0deaf1abc7 Different colors for new tracks, types and levels Ana 2016-07-02 21:37:16 +02:00
  • eb312f139e Merge pull request #1084 from arun1595/define-singular-resource Stella Rouzi 2016-07-11 13:40:56 +03:00
  • dce9ffb298 Merge c1db82f19a into 798998b73f Arun Kumar 2016-07-08 06:37:55 +00:00
  • c1db82f19a
    Make abstract optional Arun Kumar 2016-07-08 12:00:51 +05:30
  • d8e2ad594a
    Redirect user to the login page while registering with ichain Arun Kumar 2016-07-07 02:01:45 +05:30
  • 2d4f77b3a3 modified redirect path during registration shlok007 2016-07-06 15:32:47 -04:00
  • 7a01d21915 Merge 762c93498e into 798998b73f Henne Vogelsang 2016-07-05 11:27:11 +00:00
  • b7b0ab6d50 Merge 3eeba6cbb0 into 798998b73f Nishanth Vijayan 2016-07-05 08:51:11 +00:00
  • 798998b73f Merge pull request #1085 from Ana06/validation Stella Rouzi 2016-07-05 10:49:16 +02:00
  • 9d4a82b062 Name validation repeated in Track Ana 2016-07-05 10:13:41 +02:00
  • 0675572e05
    Modify conference registration to a singular resource Arun Kumar 2016-07-05 00:10:18 +05:30
  • 3345dcc386 Merge e71f899950 into 8b831b1977 Nishanth Vijayan 2016-07-02 04:52:46 +00:00
  • e71f899950 Open schedule for the current day by default Nishanth Vijayan 2016-07-02 09:50:14 +05:30
  • 3eeba6cbb0 Allow admins to manually confirm users Nishanth Vijayan 2016-07-02 00:38:43 +05:30
  • ed087352e2 Latest state Stella Rouzi 2016-07-01 16:08:48 +03:00
  • 8b831b1977 Merge pull request #1070 from Ana06/style Henne Vogelsang 2016-07-01 14:52:36 +02:00
  • 99d11bb3d0 Merge pull request #1073 from danimo/fix_osm_tiles_for_https Henne Vogelsang 2016-07-01 14:52:18 +02:00
  • 2b43b348cd Use relative URL when loading OSM tiles Daniel Molkentin 2016-07-01 14:27:32 +02:00
  • 0965b04cf2 Merge fd47bc4d9c into 8c27a3dbac Henne Vogelsang 2016-07-01 09:04:18 +00:00
  • fd47bc4d9c Hack Week Rulez Henne Vogelsang 2016-07-01 11:03:45 +02:00
  • 762c93498e Fix the survey view Henne Vogelsang 2016-07-01 10:58:44 +02:00
  • 805cbb9606 Remove cocoon and dependencies from the pipeline Henne Vogelsang 2016-07-01 10:33:40 +02:00
  • 1991f53f26 Merge branch 'adding_surveys' of https://github.com/mdeniz/osem into mdeniz-adding_surveys Henne Vogelsang 2016-07-01 10:32:07 +02:00
  • c1ce420c5d unnecessary %div deleted Ana 2016-06-30 21:01:06 +02:00
  • 96ae730955 Merge 933e14673c into 8c27a3dbac Moisés Déniz Alemán 2016-06-30 15:39:29 +00:00
  • 8c27a3dbac Merge branch 'arun1595-venue-splash-page' Henne Vogelsang 2016-06-30 17:31:46 +02:00
  • ff025a4839 Fix the venue display on splash Henne Vogelsang 2016-06-30 17:31:11 +02:00
  • 933e14673c Added Submission model mdeniz 2016-06-30 17:28:07 +02:00
  • 5ca234c8fc Remove Cocoon gem mdeniz 2016-06-30 17:25:49 +02:00
  • 51fa77c9d5 Merge f433786c61 into cdaefee323 Shyukri Shyukriev 2016-06-30 12:57:03 +00:00
  • f433786c61 Changing form for surveys Shyukri Shyukriev 2016-06-30 14:52:43 +02:00
  • 463a242c24 Fixing route for replying the survey Shyukri Shyukriev 2016-06-30 14:51:23 +02:00
  • 5a0328842e Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page Henne Vogelsang 2016-06-30 13:04:28 +02:00
  • 67bccf0195 Showing survey for users and handling authorization Shyukri Shyukriev 2016-06-30 13:04:07 +02:00
  • 7b64dca766 Merge pull request #1050 from hennevogel/one Henne Vogelsang 2016-06-30 12:44:22 +02:00
  • fdec9fe035 Merge 03168b4efe into cdaefee323 Moisés Déniz Alemán 2016-06-30 10:43:49 +00:00
  • cdaefee323 Merge pull request #1065 from shyukri/scheduling_default_timezone Henne Vogelsang 2016-06-30 12:43:47 +02:00
  • 4d40bb309a Merge pull request #1059 from Ana06/api_key Henne Vogelsang 2016-06-30 12:38:05 +02:00
  • 5d5ad9348c Merge pull request #1034 from Ana06/statistic Henne Vogelsang 2016-06-30 12:25:59 +02:00
  • 92e9043a57 Merge pull request #1030 from Ana06/public-schedule Henne Vogelsang 2016-06-30 12:13:51 +02:00
  • 9ce4ba6f6b Added target for surveys. Shyukri Shyukriev 2016-06-30 12:09:21 +02:00
  • 157a16d8f2 Add survey replies. Shyukri Shyukriev 2016-06-30 12:05:00 +02:00
  • 3db1d5f9cf Update API key section in TRANSLATION.md Ana María Martínez Gómez 2016-06-27 18:38:32 +02:00
  • 1f7c903f2f 10 extra lines added to Rubocop ClassLength Ana 2016-06-30 10:17:44 +02:00
  • 03168b4efe Improving surveys system: showing surveys in admin UI as they will be for the user mdeniz 2016-06-29 17:23:01 +02:00
  • 0944952e9d Add default buttons on top if the items are > 5 on tracks, event_types, lodgings, rooms. This should prevent scrolling down to find the button. Shyukri Shyukriev 2016-06-29 14:20:41 +02:00
  • 118f8f416d Scheduling new conference: use default Time.zone.now instead of the 1st available option which was American Samoa. Should fix issue#1064. Shyukri Shyukriev 2016-06-29 12:38:27 +02:00
  • 32dcdb386c Merge 335608e6c4 into c39a4541cf Stella Rouzi 2016-06-28 20:29:14 +00:00
  • 335608e6c4 Adding surveys Stella Rouzi 2016-06-28 18:16:06 +03:00
  • c39a4541cf Merge pull request #989 from Ana06/registration_limit Stella Rouzi 2016-06-27 20:10:24 +03:00
  • 028d430885 Schedule height fits a 600px screen and the schedule is hiden if there is only one room Ana 2016-06-17 14:00:31 +02:00
  • 82c2c400b6 Swipe support added to the carousel Ana 2016-06-16 13:04:44 +02:00
  • 53b02d6a74 Adapting number of columns in the carousel schedule taking screen width into account Ana 2016-06-13 13:34:55 +02:00
  • d8f9de9363 new schedule Ana 2016-06-10 16:33:57 +02:00
  • 866e58b5bf registration_limit check moved to ability file Ana 2016-05-04 23:46:52 +02:00
  • 0018284c66 Merge pull request #1058 from openSUSE/fix_migration Stella Rouzi 2016-06-27 18:10:05 +03:00
  • 8197f4267e Remove duplicate remove_column Christian Bruckmayer 2016-06-27 14:29:27 +02:00
  • 69a0d12793 Merge pull request #1044 from Ana06/tracks-color Henne Vogelsang 2016-06-26 12:34:10 +02:00
  • 3b9f18c60e Merge pull request #1052 from nishanthvijayan/remove-unused-columns Henne Vogelsang 2016-06-26 12:20:44 +02:00
  • 460d117d7a making next_color function more readable Ana 2016-06-25 14:30:36 +02:00
  • 1d7f3207a6 Registrations dashbox eliminated from registrations Ana 2016-06-20 16:02:05 +02:00
  • 62c3ee1631 Statistics on top of Registrations#index Ana 2016-06-12 00:20:28 +02:00
  • f5701f2e77 Statistics on top of Events#index Ana 2016-06-11 14:09:23 +02:00
  • 7a7a58ebf8 Remove unused columns from Conferences,Venues,Events and Sponsors tables Nishanth Vijayan 2016-06-24 22:41:18 +05:30
  • f5e52e3855 Merge pull request #1051 from differentreality/xml_sort Henne Vogelsang 2016-06-23 11:57:52 +02:00
  • 1bbeac61e8 Merge pull request #1048 from differentreality/show_recent_conference_first Henne Vogelsang 2016-06-23 11:57:22 +02:00
  • b0ffa683dc Show most recent conference first in conferences#index Stella Rouzi 2016-06-23 12:24:58 +03:00
  • c1205c6387 Order events by date Stella Rouzi 2016-06-22 16:09:17 +03:00
  • 51503fdff3 revision is deprecated, use branch in mina Henne Vogelsang 2016-06-22 13:24:31 +02:00
  • d62665a190 XML export fix tests. Add not nil room for scheduled events. Stella Rouzi 2016-06-20 21:05:08 +03:00
  • c49606c815 Merge pull request #1047 from differentreality/xml_export Henne Vogelsang 2016-06-22 12:33:43 +02:00