Commit graph

  • 725a5e9af2 Merge 783365c59e into b0a84ad1c6 Chashmeet Singh 2017-03-14 07:38:18 +00:00
  • 6ba692db1b Merge fc609844d6 into b0a84ad1c6 Chashmeet Singh 2017-03-14 07:38:17 +00:00
  • b0a84ad1c6 Merge pull request #1348 from siddhantbajaj/RegistrationLimit Stella Rouzi 2017-03-14 09:12:51 +02:00
  • c5e3d495bb Add some tips to installation guide Emanuel Hayford 2017-03-14 04:51:26 +01:00
  • 893ad60995 Merge pull request #1364 from BelieveC/MockAuthConfigForGithub Stella Rouzi 2017-03-13 19:38:00 +02:00
  • 3655c80feb Fixed registration limit issue Siddhant Bajaj 2017-03-13 22:57:38 +05:30
  • 123c9f6a6f Add mock_auth config for Github Chaitanya 2017-03-13 18:48:41 +05:30
  • e8699f4258 Updating readme, install, payments, contributing files Stella Rouzi 2017-03-13 14:29:52 +02:00
  • a826bb9d1e Merge pull request #1360 from Ana06/contributing Stella Rouzi 2017-03-13 11:52:30 +02:00
  • ea4dac2393 Merge pull request #1359 from nikhilgupta1211/view_tests Ana María Martínez Gómez 2017-03-13 10:02:42 +01:00
  • 3ef17e921f Removed the View Tests gotens1211 2017-03-13 13:33:07 +05:30
  • 2c33384a87 Improve contributing guide Ana María Martínez Gómez 2017-03-12 21:06:53 +01:00
  • 8e4cca980e removed the render banners component test gotens1211 2017-03-12 18:31:05 +05:30
  • 9c2a09eaf2 changed dropdown for small devices gotens1211 2017-03-03 13:22:41 +05:30
  • 92abf4b2ff Merge 22e0c1d8f8 into 05209260a4 Eugene 2017-03-10 16:41:42 +00:00
  • 75dc414dda Merge 5b3b054d0b into 05209260a4 Christopher Byrd 2017-03-10 16:41:28 +00:00
  • 05209260a4 Merge pull request #1285 from nikhilgupta1211/modify_navbar Hernán Schmidt 2017-03-10 17:32:05 +01:00
  • 8541e47f88 Merge 3427233057 into 00c095d054 agrim mittal 2017-03-10 16:16:39 +00:00
  • 00c095d054 Merge pull request #1300 from siddhantbajaj/Demo_data Ana María Martínez Gómez 2017-03-10 17:13:40 +01:00
  • f78f449258 Added demo data Siddhant Bajaj 2017-03-10 17:40:41 +05:30
  • f7f5ab8b58 Merge pull request #1351 from differentreality/contributing_guide Ana María Martínez Gómez 2017-03-10 12:48:54 +01:00
  • 4ff5bc4c09 Add contributing info for first comers Stella Rouzi 2017-03-10 11:51:24 +02:00
  • 18d0f6215b Fixes #1081, Add more profile info on user Profile Chaitanya 2017-03-10 00:36:22 +05:30
  • 7ea168fef4 Add column for user's social media and social code sites info Chaitanya 2017-03-10 00:35:30 +05:30
  • db2d776c3b Sign in Ui improved in mobile gotens1211 2017-02-09 16:13:55 +05:30
  • 56c7906d52 Merge pull request #1338 from nasia-sam/change_date_format Stella Rouzi 2017-03-08 11:08:24 +02:00
  • 4676163ddb Merge 0e8406be74 into 77c7bdfecf Chris Niedzwiedz 2017-03-08 09:07:53 +00:00
  • 77c7bdfecf Merge pull request #1266 from AEtherC0r3/fix_unreachable_code Stella Rouzi 2017-03-08 10:55:27 +02:00
  • cd997c8e88 Merge pull request #1275 from shlok007/intersecting-events Stella Rouzi 2017-03-08 10:51:53 +02:00
  • c7e6fb42b7 changed date format in proposals#show nasia 2017-03-07 20:43:48 +02:00
  • 88e1646e87 Fix unreachable code (#1140) in ConferenceRegistrationController#new AEtherC0r3 2017-02-02 01:28:22 +02:00
  • 4dd10d09ad display concurrent events on event#show shlok007 2017-02-07 01:22:49 +05:30
  • 3427233057 change toast position hitman 2017-03-07 16:14:50 +05:30
  • 37fb336af7 remove bootstrap_class_for helper function and related usage hitman 2017-03-07 16:06:22 +05:30
  • 33b9a2b93b use render for toast and remove helper function hitman 2017-03-07 15:13:38 +05:30
  • db1eedf51b shift to toastr_rails and bundler version 1.14.3 hitman 2017-03-07 15:10:31 +05:30
  • 40b99cc2d6 add toastr cdn and modified toast function hitman 2017-03-07 02:45:29 +05:30
  • 5e3e482311 add toastr for notifications hitman 2017-03-06 22:04:09 +05:30
  • eefa391747 Merge 2d4f77b3a3 into b46a721a7d Shlok Srivastava 2017-03-06 20:58:56 +00:00
  • b46a721a7d Merge pull request #1332 from agrim123/link_format Christian Bruckmayer 2017-03-06 17:34:29 +01:00
  • 226d16dc63 fix markdown issue hitman 2017-03-06 20:54:21 +05:30
  • 040db7990b change escape_html: false to true hitman 2017-03-06 18:38:45 +05:30
  • 4a974e29b3 convert timezone to conference`s timezone gotens1211 2017-03-05 16:26:30 +05:30
  • dc41daae97 added feature test for roles shlok007 2017-02-05 17:24:29 +05:30
  • 556ba8993a Update several_schedules.rake Aayush Gupta 2017-03-04 01:27:51 +05:30
  • 61930f8572 Merge pull request #1325 from ChrisBr/fix-heroku Henne Vogelsang 2017-03-03 15:13:03 +01:00
  • 734e1d4dd9
    Revert "Mock request to fix factory girl rake" Christian Bruckmayer 2017-03-03 15:08:31 +01:00
  • 322d58c61c
    Revert "fixed travis issues" Christian Bruckmayer 2017-03-03 15:07:54 +01:00
  • f85ff0c6c5 Merge pull request #1322 from differentreality/commercial_in_admin_event Christian Bruckmayer 2017-03-03 13:29:24 +01:00
  • 1ec5c0f0f3 Merge pull request #1321 from differentreality/users_sort_confirmed Christian Bruckmayer 2017-03-03 13:28:53 +01:00
  • b8770f8417 Merge pull request #1323 from nikhilgupta1211/hakiri Christian Bruckmayer 2017-03-03 13:05:44 +01:00
  • 2353fd812e updated rubyzip gem in Gemfile.lock gotens1211 2017-03-03 16:28:25 +05:30
  • 1772e13523 Shows commercial in admin/events#show and links to admin namespace Stella Rouzi 2017-03-03 12:43:59 +02:00
  • 2dba9287ae Provide value for sorting column Confirmed? in admin/users#index Stella Rouzi 2017-03-03 12:36:42 +02:00
  • acc4cc3aef Merge pull request #1283 from siddhantbajaj/Voteschange Ana María Martínez Gómez 2017-03-02 14:10:39 +01:00
  • 7844554817 Merge pull request #1193 from kormoc/contributing_updates Christian Bruckmayer 2017-03-02 14:07:19 +01:00
  • ff65b3b601 Merge pull request #1243 from cniedzwiedz/squash_test Christian Bruckmayer 2017-03-02 14:01:51 +01:00
  • dcfc25a541 Show vote versions in event history Siddhant Bajaj 2017-03-02 17:07:19 +05:30
  • ffb0e25689 Fixing issue #1315 Ramaraju-1996 2017-03-02 13:16:08 +05:30
  • b82ec308a6 Merge pull request #2 from Ramaraju-1996/Ramaraju-1996-patch-2 Ramaraju-1996 2017-03-02 12:29:37 +05:30
  • 1e1c15b1e9 Merge pull request #1 from Ramaraju-1996/Ramaraju-1996-patch-1 Ramaraju-1996 2017-03-02 12:28:48 +05:30
  • 72513f2744 Fixing issue #1315 Ramaraju-1996 2017-03-02 12:27:36 +05:30
  • 09e516cc52 Fixing issue #1315 Ramaraju-1996 2017-03-02 12:23:04 +05:30
  • b9cc2a4394 Fixes #1315, Add documentation for openID in development Chaitanya 2017-03-02 02:54:12 +05:30
  • 72f2871517 Merge pull request #1267 from nikhilgupta1211/countablejs Stella Rouzi 2017-03-01 17:18:37 +02:00
  • c1b81755c9 Implementing Countable.js to count words. gotens1211 2017-02-05 16:00:45 +05:30
  • 8b5d6603af Merge pull request #1254 from shlok007/devise Stella Rouzi 2017-03-01 13:29:44 +02:00
  • fd49e1733f Merge pull request #1311 from nikhilgupta1211/duplicate_methods Stella Rouzi 2017-03-01 13:07:21 +02:00
  • 851a5e33b3 Merge pull request #1299 from shlok007/rolify Stella Rouzi 2017-03-01 12:47:34 +02:00
  • ec1adbada8 Removed duplicate methods date_range_string and date_string. gotens1211 2017-02-23 15:20:53 +05:30
  • af4da7a9f8 Merge 1752a292ab into 3bf8b2472d Jon Kimble 2017-03-01 05:16:47 +00:00
  • 1752a292ab Pass method correct arguments Jon Kimble 2017-02-28 22:08:44 -07:00
  • 5dc379fe6a Remove redundant method Jon Kimble 2017-02-28 22:07:18 -07:00
  • 09696a4518 fixes bug OSEM#1298 Eugene Dubinin 2017-02-22 15:17:50 +02:00
  • a056643bbe Merge 025f175276 into 3bf8b2472d Chris Niedzwiedz 2017-02-28 12:49:19 +00:00
  • 9a42b0a090 Merge f49ebf634f into 3bf8b2472d Chris Niedzwiedz 2017-02-28 12:49:19 +00:00
  • eb7c04ea13 Merge 76afd89f2b into 3bf8b2472d Siddhant Bajaj 2017-02-26 16:36:00 +00:00
  • 3bf8b2472d Merge pull request #1303 from shlok007/ability-spec-resources Ana María Martínez Gómez 2017-02-25 20:51:39 +01:00
  • 5b3b054d0b Removed duplicate date_string method Christopher 2017-02-24 19:01:08 -08:00
  • 390e68b1ac Merge pull request #1143 from Ana06/schedule-times Christian Bruckmayer 2017-02-23 09:12:02 +01:00
  • ebb5203887 Exclude conference model from ClassLength cop Ana María Martínez Gómez 2016-12-21 11:42:19 +01:00
  • bde2ee3d7d Delete Eventschedules out of conference hours Ana 2016-08-15 20:31:23 +02:00
  • b3bbaf87a4 Adapt public schedule to use the confence hours Ana 2016-08-15 13:11:33 +02:00
  • 7eb9a57c34 Adapt admin schedule to use the confence hours Ana 2016-08-15 13:05:35 +02:00
  • 9b9d255e3b Add fields in conference edit form for hours Ana 2016-08-15 12:39:39 +02:00
  • b80aff3cce Add times to Conference Ana 2016-08-15 12:26:47 +02:00
  • bba663069a Merge 7fa6d5277d into 7000e63700 David Sedeño 2017-02-21 19:06:53 +00:00
  • 7fa6d5277d Implements configurable start and end hour of the dayused in schedule David Sedeño 2017-02-21 20:04:46 +01:00
  • 7000e63700 Merge pull request #1297 from siddhantbajaj/Travis_Errors Ana María Martínez Gómez 2017-02-21 18:14:43 +01:00
  • 0295850f20 Mock request to fix factory girl rake Siddhant Bajaj 2017-02-20 23:45:13 +05:30
  • 1ca3147ae0 add resources test in features/ability_spec.rb shlok007 2017-02-18 20:41:03 +05:30
  • 1255088ff0 fixed travis issues Siddhant Bajaj 2017-02-20 23:43:02 +05:30
  • 0d6ba56e55 Merge pull request #1304 from nikhilgupta1211/register_date Christian Bruckmayer 2017-02-20 10:20:49 +01:00
  • b725bde890 Merge pull request #1296 from JewelSam/master Christian Bruckmayer 2017-02-20 09:56:45 +01:00
  • 82db583217 Default date removed from conference registrations. gotens1211 2017-02-20 01:52:50 +05:30
  • 76afd89f2b Printable tickets for osem Siddhant Bajaj 2017-02-20 07:39:46 +05:30
  • b946b9f261 Merge a09b04a865 into cf29150a2a Arun Kumar 2017-02-18 13:02:20 +00:00
  • 84f4743648 update rolify to 5.1.0 shlok007 2017-02-17 02:52:11 +05:30
  • cf29150a2a Merge pull request #1290 from siddhantbajaj/dropdown Stella Rouzi 2017-02-16 10:56:33 +02:00
  • 3f21d1bc37 Merge pull request #1288 from siddhantbajaj/Eventindex Stella Rouzi 2017-02-16 10:56:00 +02:00