gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-15 12:44:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2507 commits 15 branches 2 tags 50 MiB
Commit graph

493 commits

Author SHA1 Message Date
Stella Rouzi
cf29150a2a Merge pull request #1290 from siddhantbajaj/dropdown 
Fixed dropdown issues in admin/events#show page
 2017-02-16 10:56:33 +02:00
Stella Rouzi
3f21d1bc37 Merge pull request #1288 from siddhantbajaj/Eventindex 
fixed dropdown issue
 2017-02-16 10:56:00 +02:00
Stella Rouzi
e0e7d83aa0 Merge pull request #1270 from siddhantbajaj/schedule 
Fixed schedule creation when there is no room.
 2017-02-16 10:48:56 +02:00
Siddhant Bajaj
1d4615e297 fixed schedule creation 2017-02-16 00:01:40 +05:30
Siddhant Bajaj
3a9d7b9e1f fixed dropdown issues on Event Index page 2017-02-15 23:43:17 +05:30
Siddhant Bajaj
289a8393c8 fixed dropdown issue 2017-02-15 23:39:02 +05:30
Hernán Schmidt
a0120734e3 Merge pull request #1287 from sheamunion/issue-1273 
Issue 1273
 2017-02-12 19:59:52 +01:00
Shea Munion
efa314befd Merge branch 'issue-1273' of https://github.com/sheamunion/osem into issue-1273 2017-02-09 14:04:18 -06:00
Shea Munion
083efc3016 - Revert change to Conference :short_title validation 
- 'short_title' field in new view accepts a-zA-Z0-9_-
 2017-02-09 14:01:11 -06:00
Shea Munion
f1c66508e2 'short title' hint, pattern & title attr accept a-z0-9_- & prepend URL. 2017-02-09 13:51:32 -06:00
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources 
Ability to track resources
 2017-02-09 10:45:51 +01:00
shlok007
6db2e8abe7 remove input field from admin/resource#index 2017-02-09 01:11:24 +05:30
Shea Munion
c822d65010 Title attr aligns with hint text. Prepend field with conferences_url. 2017-02-08 12:13:01 -06:00
Shea Munion
f416f0edab Add pattern & title attr to 'short title' field & prepended URL. 2017-02-07 19:38:39 -06:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
Ana María Martínez Gómez
45c3c73e57 Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets 
Display paid and unpaid tickets in admin/tickets#show
 2017-01-26 16:27:24 +01:00
shlok007
d974807134 Display paid and unpaid tickets in admin/tickets#show 2017-01-23 22:37:57 +05:30
Stella Rouzi
46101228e7 Merge pull request #1169 from nishanthvijayan/reports 
Add new page with organizer reports
 2017-01-15 12:28:38 +02:00
Stella Rouzi
de2e316fee Merge pull request #1244 from AEtherC0r3/fix_table 
Adds table header in admin/events#index
 2017-01-11 19:47:52 +02:00
AEtherC0r3
e5687c4504 Find correct event id in versions 
Fixes #1226
 2017-01-10 22:07:40 +02:00
AEtherC0r3
e514a8c30a Adds table header in admin/events#index 2017-01-10 21:30:00 +02:00
AEtherC0r3
aaa2571eb5 Changes email templates in admin/emails#index 
Styling and readability improvements by using single quotes and expanding hashes to span multiple lines
Add subject templates
 2017-01-10 12:24:04 +02:00
desantonop
c0b7a70e6e Load template loads subject 
Change variable names in admin/emails#index to more descriptive ones. Geia soy Stella :*
Change attributes "data-name" to "data-body-input-id" and "data-template" to "data-body-text"
 2017-01-10 12:24:04 +02:00
Christian Bruckmayer
201fac7088 Merge pull request #1186 from sherrimitchell/event-page-comments 
Adding comments to events#index
 2016-12-19 17:24:30 +01:00
Stella Rouzi
6c39d34322 Merge pull request #1159 from nishanthvijayan/changelog-improvements 
Misc improvements to Revision History
 2016-11-21 19:21:02 +02:00
Stella Rouzi
710b4d26a4 Merge pull request #1174 from AnithaPal/export-events-and-comments 
Export events and comments
 2016-11-16 01:44:05 +02:00
AnithaPal
68d447f023 added events, confirmed events and events with comments export features with xlsx, pdf and csv format 2016-10-19 10:48:58 -04:00
AnithaPal
3da3fcccbb exporting events to pdf, excel, and csv format 2016-10-19 10:48:39 -04:00
AEtherC0r3
1ca6559400 Converts old ruby syntax to new in admin/emails#index 2016-10-14 20:08:58 +03:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
desantonop
cfdf4e331a Makes admin/tickets#index datatable 2016-09-28 21:02:36 +03:00
Nishanth Vijayan
1c42bf92c0 Link commercialable only if it exists else just display title/name 2016-09-28 18:42:18 +05:30
Nishanth Vijayan
d954059947 Show missing speakers in reports 2016-09-28 03:03:01 +05:30
Nishanth Vijayan
fabe29d2ed Add new page with organizer reports 2016-09-27 21:24:49 +05:30
Nishanth Vijayan
5a5b686830 Display event,user title/name only if they exists or when they have versions 2016-09-26 17:21:45 +05:30
Nishanth Vijayan
75ee1371de Cleanup obj_desc_and_link 2016-09-26 17:21:45 +05:30
Nishanth Vijayan
7d70f7685e Track Schedule and EventSchedule 2016-09-26 17:21:45 +05:30
Nishanth Vijayan
c7b8418f1a Fix linking problems for event and venue commercials 2016-09-26 17:21:44 +05:30
richiethomas
3daf624d75 Fix admin conferences program events#show page, now only shows a red X when commercial is missing 2016-09-19 12:51:50 -04:00
Stella Rouzi
85fcd4e1b7 Merge pull request #1115 from rishabhs95/admin-tickets-quantity 
Display correct quantity of tickets in admin views
 2016-09-15 13:05:28 +03:00
Rishabh Saxena
09ec8565d9 admin/tickets: add column for quantity 2016-09-14 19:40:43 +05:30
Sherri Mitchell
f8f49ae16d Adding comments to events#index 2016-09-08 14:55:52 -04:00
Stella Rouzi
46774748ba Merge pull request #1114 from nishanthvijayan/event-missing-info 
Show Event missing info in admin
 2016-08-26 18:42:59 +03:00
Hernan Schmidt
393deefcf9 Use a css regex matcher to find campaign entries 2016-08-22 11:23:18 +02:00
Nishanth Vijayan
f02aaac81e Show an event's missing info in event#show 2016-08-21 15:41:34 +05:30
Nishanth Vijayan
48828f8930 Display who added commercial for event 
Activate versioning for tests

The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
 2016-08-20 14:21:21 +05:30
Rishabh Saxena
54ad0628b4 admin/tickets: correct ticket_purchase quantity 2016-08-18 23:27:30 +05:30
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe 
Online payment feature - direct stripe integration
 2016-08-18 16:04:11 +02:00