Commit graph

  • 8652a5cb78 Update Byebug to latest version Hernan Schmidt 2017-07-12 16:40:13 +02:00
  • 4743102389 Merge c57c15de77 into ea43b19ef4 Stella Rouzi 2017-07-12 14:12:19 +00:00
  • c57c15de77 only load conference in index Stella Rouzi 2017-07-12 17:07:47 +03:00
  • 6e8998a2c1 Added controller tests Stella Rouzi 2017-07-12 17:06:44 +03:00
  • e894176a10 Test fixes Stella Rouzi 2017-07-12 15:58:46 +03:00
  • fe8c7bb83f Fix authorization of conference versions Stella Rouzi 2017-07-11 23:47:34 +03:00
  • a61327f728 Fix user link, when deleted Stella Rouzi 2017-07-01 00:19:19 +03:00
  • de6d5da7b3 Show conference changelog Nishanth Vijayan 2016-08-06 17:22:53 +05:30
  • f1d2bf710f Merge bf4189132a into ea43b19ef4 Chaitanya Yadav 2017-07-12 14:11:54 +00:00
  • 49e14431f4 Merge 2875f1de7b into ea43b19ef4 nasia-sam 2017-07-12 14:11:54 +00:00
  • ea43b19ef4 add tests for new conference links shlok007 2017-07-12 17:34:33 +05:30
  • ddf6f4b4c9 fix new conference links shlok007 2017-07-11 03:59:52 +05:30
  • 8ff64ff30c add tests for new conference links shlok007 2017-07-12 17:34:33 +05:30
  • 328bf3de08 fix new conference links shlok007 2017-07-11 03:59:52 +05:30
  • eb23d838b5 correct past and upcoming conferences in admin/organizations#index shlok007 2017-07-11 04:59:03 +05:30
  • d2f5da1289 correct past and upcoming conferences in admin/organizations#index shlok007 2017-07-11 04:59:03 +05:30
  • 62fe7e0a33 Add ruby version to travis rahul 2017-07-12 16:17:56 +05:30
  • 76734b3aef Merge branch 'master' into ticket-show-page Moisés Déniz Alemán 2017-07-12 12:06:43 +02:00
  • c5db5dba1e Ticket show page siddhantbajaj 2017-07-10 17:45:05 +05:30
  • 036b590823 Merge pull request #1579 from siddhantbajaj/ticket-scanning Moisés Déniz Alemán 2017-07-12 11:07:22 +02:00
  • 3ff81b3895 Updated to ruby 2.4 and rails 4.2.8 rahul 2017-07-12 14:27:16 +05:30
  • da3846a727 Merge pull request #1581 from openSUSE/revert-1575-show-page Ana María Martínez Gómez 2017-07-12 10:33:44 +02:00
  • 43b4204e30 Revert "Ticket show page" Moisés Déniz Alemán 2017-07-12 10:33:16 +02:00
  • 17b72da38f Merge pull request #1575 from siddhantbajaj/show-page Ana María Martínez Gómez 2017-07-12 10:11:55 +02:00
  • 88aa9b1ef3 fix failing tests for volunteers_coordinator shlok007 2017-07-11 20:56:02 +05:30
  • d6ba3d2cc8 fix failing tests about accessing admin area shlok007 2017-07-11 17:25:34 +05:30
  • c066aadae2 Added TicketScanning Model siddhantbajaj 2017-07-11 17:05:07 +05:30
  • fbd4be3503 Ticket show page siddhantbajaj 2017-07-10 17:45:05 +05:30
  • 93d5e360ca Merge dockerize commands TheAssassin 2017-07-09 20:55:09 +02:00
  • 6dea37ec41 Add missing environment variable TheAssassin 2017-07-09 19:57:29 +02:00
  • 13d6bf471d Wait for database to be started before running MySQL client command TheAssassin 2017-07-09 15:54:51 +02:00
  • ad9ef4aba3 Fix secret key generation TheAssassin 2017-07-09 15:48:09 +02:00
  • b5ca626873 Fix Git ignores TheAssassin 2017-07-09 15:47:24 +02:00
  • dd993b7448 Fix issue mentioned in osem/pull/1407 TheAssassin 2017-05-16 22:16:46 +02:00
  • c592a19f2d Use rails secret to generate the secret key TheAssassin 2017-04-04 07:32:33 +02:00
  • d7765bf4fd Update ignores TheAssassin 2017-04-01 01:16:51 +02:00
  • 769643a642 Remove MySQL config file again as soon as possible TheAssassin 2017-04-01 01:16:30 +02:00
  • 28d9ac9b1f Switch to built in rails server TheAssassin 2017-04-01 01:13:39 +02:00
  • 2c3c070f7e Update Docker docs TheAssassin 2017-04-01 00:48:22 +02:00
  • 9402eb36d8 Add beginner guide for deploying OSEM with Docker TheAssassin 2017-03-31 13:33:24 +02:00
  • 8229cca1e8 Add missing dependency to Dockerfile TheAssassin 2017-03-31 13:33:03 +02:00
  • f15fe9ddb0 Docker support for production use TheAssassin 2017-03-25 22:51:21 +01:00
  • f2be89b1af Merge dockerize commands TheAssassin 2017-07-09 20:55:09 +02:00
  • 0ea245b976 Add missing environment variable TheAssassin 2017-07-09 19:57:29 +02:00
  • 798900646f Wait for database to be started before running MySQL client command TheAssassin 2017-07-09 15:54:51 +02:00
  • 839d397223 Fix secret key generation TheAssassin 2017-07-09 15:48:09 +02:00
  • 9052c80692 Fix Git ignores TheAssassin 2017-07-09 15:47:24 +02:00
  • b33e9ed28e fix revision count and drop observers shlok007 2017-01-04 22:27:46 -05:00
  • a47e5d657e fix revision count and drop observers shlok007 2017-01-04 22:27:46 -05:00
  • 518ecc3d4e rebuild schema.rb for sqlite3 shlok007 2017-07-09 01:29:15 +05:30
  • 9c6286182e caching comment counts shlok007 2016-12-29 03:17:33 -05:00
  • affa2a71d5 rebuild schema.rb for sqlite3 shlok007 2017-07-09 01:29:15 +05:30
  • b90c83ac4c caching comment counts shlok007 2016-12-29 03:17:33 -05:00
  • 89840d0bab Merge pull request #1573 from openSUSE/fix-schema Hernán Schmidt 2017-07-08 19:28:50 +02:00
  • 1ba797bead Fix schema.rb Hernán Schmidt 2017-07-08 18:45:38 +02:00
  • 54aa82dcd1 Move abilities for admin views in separate model shlok007 2017-06-24 05:03:24 +05:30
  • 815b9e6e14 Merge pull request #1570 from siddhantbajaj/ticket-layout Ana María Martínez Gómez 2017-07-07 15:23:47 +02:00
  • 4c957a8b17 Updated Paper Trail siddhantbajaj 2017-07-07 02:35:40 +05:30
  • dd52a9b2ab Make ticket layout configurable siddhantbajaj 2017-06-30 05:26:21 +05:30
  • e25de318bd Merge pull request #1559 from siddhantbajaj/purchase-index Ana María Martínez Gómez 2017-07-06 09:28:32 +02:00
  • 570fec5a9f Merge pull request #1539 from siddhantbajaj/PdfTicket Ana María Martínez Gómez 2017-07-06 09:06:33 +02:00
  • a327d2cbd2 Ticket Purchase Index Page siddhantbajaj 2017-06-26 06:07:52 +05:30
  • 2cc97a92f5 Remove duplicated label - target/form L11 2017-07-01 13:39:22 +05:30
  • eca509ccc7 Merge branch 'master' into master Stella Rouzi 2017-07-05 16:37:49 +03:00
  • 72537ba2a8 Fixed user abilities in Physical Ticket siddhantbajaj 2017-06-29 19:25:10 +05:30
  • b9a540f4e2 Sample prototype for ticket pdf siddhantbajaj 2017-06-13 07:20:43 +05:30
  • 1be439ea98 Merge f6a3f0b71b into 95fbd10153 Atul Kanswal 2017-07-04 17:49:36 +00:00
  • 95fbd10153 Friendly urls for tracks AEtherC0r3 2017-06-29 23:39:56 +03:00
  • 71e6970a18 Friendly urls for tracks AEtherC0r3 2017-06-29 23:39:56 +03:00
  • 882a1d20c9 Merge pull request #1538 from shlok007/org-admins-backend Shlok Srivastava 2017-07-04 19:57:26 +05:30
  • 85a021ef05 Merge branch 'master' into org-admins-backend Hernán Schmidt 2017-07-04 15:30:30 +02:00
  • 4a624f10eb Merge d425349bdd into eb9d799f23 Divyanshu Mehta 2017-07-04 08:08:55 +00:00
  • eb9d799f23 Merge pull request #1558 from siddhantbajaj/admin-ticket Moisés Déniz Alemán 2017-07-04 10:04:42 +02:00
  • 7d472f2ad5 fix failing tests shlok007 2017-07-04 05:55:41 +05:30
  • 6b3a6fa967 Fixed ticket_sold method of ticket model siddhantbajaj 2017-06-29 20:58:22 +05:30
  • 3d4adb5683 Allow admin to show/generate ticket siddhantbajaj 2017-06-26 04:04:36 +05:30
  • f68fd39095 fixed abilities for conference#new and organization#new shlok007 2017-07-03 04:17:06 +05:30
  • f6a3f0b71b [Issue #1555] - Fix duplicate label attribute in admin/targets/_form ak 2017-07-01 17:33:16 +05:30
  • 16b4a23179 Remove duplicated label - target/form L11 2017-07-01 13:39:22 +05:30
  • d59a036cf1 removed unnecessary comments and fixed grammatical errors shlok007 2017-06-30 09:27:19 +05:30
  • 651abcab87 split feature tests for abilities and suggested changes shlok007 2017-06-30 09:18:17 +05:30
  • fe2af4a7ec Merge a21d95c486 into f37d3095e1 Siddhant Bajaj 2017-06-30 00:42:54 +00:00
  • a21d95c486 Make ticket layout configurable siddhantbajaj 2017-06-30 05:26:21 +05:30
  • 3daa12f83f fix tests for cfps after rebase shlok007 2017-06-28 08:05:04 +05:30
  • 21b2e5466f refactor features/ability_spec and increase test coverage for organization shlok007 2017-06-16 03:47:34 +05:30
  • 7d408ee33c suggested changes change description of organization_admin remove assign_role callback shlok007 2017-06-14 22:51:26 +05:30
  • 8839a928ed mending failing tests shlok007 2017-06-14 21:59:58 +05:30
  • ad3d6f2f95 modify admin/conference_controller_spec and not authorized error messages shlok007 2017-06-14 20:42:50 +05:30
  • aa3df0243e mending permissions and test shlok007 2017-06-13 20:57:55 +05:30
  • b72e64b238 Introduce organization admins shlok007 2017-06-13 04:39:47 +05:30
  • f37d3095e1 Rework cfp abilities AEtherC0r3 2017-06-19 17:35:46 +03:00
  • 5f3b48c9f7 Update shoulda-matchers to 2.8 AEtherC0r3 2017-06-15 11:34:58 +03:00
  • a1124546f1 Fix rspec tests because of the changes to the cfp AEtherC0r3 2017-06-01 01:11:28 +03:00
  • 2bff918556 Add index view for the cfp and modify existing ones AEtherC0r3 2017-05-31 21:03:15 +03:00
  • c3eb178546 Modify CFP to accept proposals for other things AEtherC0r3 2017-05-30 20:54:48 +03:00
  • 7fd738bc7d Add option to render html at format_helper Dimitris 2017-06-16 02:51:01 +03:00
  • 567d5f82a7 Merge branch 'master' into cfp_changes Stella Rouzi 2017-06-27 18:12:00 +03:00
  • 0a2b085bfd Merge branch 'master' into fix_markdown_hint Stella Rouzi 2017-06-27 17:57:46 +03:00
  • 3e97200a29 Add logo for booths nasia 2017-06-27 17:23:37 +03:00
  • 775a93fc26 Merge pull request #1560 from Ana06/comment-annotation Moisés Déniz Alemán 2017-06-27 10:51:34 +02:00