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

2180 commits

This branch
This branch
All branches
Author SHA1 Message Date
JewelSam
e57c83c355 Added reverse method to migration 2017-02-15 18:07:20 +03:00
JewelSam
56c69f51b7 #1040 Show email in public option 2017-02-14 17:54:31 +03:00
Hernán Schmidt
a0120734e3 Merge pull request #1287 from sheamunion/issue-1273 
Issue 1273
 2017-02-12 19:59:52 +01:00
Stella Rouzi
26a83d4a2e Merge pull request #1292 from shlok007/rename 
rename intersecting_events to intersecting_event_schedules
 2017-02-12 16:21:03 +02:00
shlok007
a2b3396897 rename intersecting_events to intersecting_event_schedules 2017-02-12 19:10:03 +05:30
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
ef5196b67d - Revert change to Conference :short_title validation 
- 'short_title' field in new view accepts a-zA-Z0-9_-
 2017-02-09 13:58: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
Stella Rouzi
0296a1e70d Merge pull request #1277 from BelieveC/master 
Fixes #1260, Change behavior of proposal update page requirement field
 2017-02-09 11:49:42 +02: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
BelieveC
c38cabe06e Fixes #1260, Changes behavior of proposal update page requirement field 2017-02-09 01:50:50 +05:30
shlok007
6db2e8abe7 remove input field from admin/resource#index 2017-02-09 01:11:24 +05:30
Hernán Schmidt
bee4dc9038 Merge pull request #1281 from sheamunion/issue-1273 
Better "short title" UI. Fixes #1273
 2017-02-08 19:38:25 +01:00
Shea Munion
1d4140099f Remove dash from regex for short_title format validation. 2017-02-08 12:23:30 -06:00
Shea Munion
c822d65010 Title attr aligns with hint text. Prepend field with conferences_url. 2017-02-08 12:13:01 -06:00
Hernán Schmidt
051e99aca4 Merge pull request #1280 from sheamunion/issue-1272 
Remove superfluous 'sign in' link. Fixes #1272
 2017-02-08 08:58:17 +01:00
Shea Munion
f416f0edab Add pattern & title attr to 'short title' field & prepended URL. 2017-02-07 19:38:39 -06:00
Shea Munion
96cfc036bc Remove superfluous 'sign in' link. 2017-02-07 19:26:51 -06:00
Hernán Schmidt
a9f3c97cf2 Merge pull request #1279 from JewelSam/master 
fixes #1271 - made 'Remember me' label clickable
 2017-02-07 22:45:34 +01:00
JewelSam
0e55a7a3ac #1271 - made 'Remember me' label clickable 2017-02-07 19:36:13 +03:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Ana María Martínez Gómez
db6222715b Merge pull request #1262 from nikhilgupta1211/rubocop_changes 
Enable Style/SpaceAroundOperators Rubocop
 2017-02-07 09:46:45 +01:00
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop 
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
 2017-02-05 19:43:00 +05:30
Ana María Martínez Gómez
945b4aac60 Merge pull request #1249 from commandprompt/configurable_schedules 
implements configurable schedule granularity
 2017-02-01 15:41:28 +01:00
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
Hernán Schmidt
a4ef10cf1b Merge pull request #1118 from rishabhs95/free-ticket 
ability to create and purchase free tickets
 2017-01-31 14:54:18 +01:00
Ana María Martínez Gómez
4089f16f17 Merge pull request #1253 from differentreality/1113 
Rebases #1113
 2017-01-31 10:08:38 +01:00
Rishabh Saxena
241bc89293
repair code reviews 2017-01-29 10:50:43 +05:30
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
Nishanth Vijayan
5111d9e937 Extract checking if event is replacement to event_schedule model 2017-01-20 18:54:56 +02:00
Nishanth Vijayan
9c7591adcd Add cancel/replacement labels in All Events 
Extract replacement/canceled label & notice logic to helpers

Join replacement/canceled label and notice and move to top
 2017-01-20 18:54:35 +02:00
Stella Rouzi
2a0e1b5dea Merge pull request #1251 from Ana06/schedule-bug 
Fix bug in the schedule
 2017-01-19 12:21:21 +02:00
Ana María Martínez Gómez
e61acde1e2 Fix bug in the schedule 
Events that should be rendered in more than one carousel section are
only rendered in the first one.
 2017-01-18 23:13:12 +01:00
Christian Bruckmayer
4a75546e6c Merge pull request #1246 from Ana06/db_cleaning 
Improvements in the DatabaseCleaner
 2017-01-17 14:22:26 +01:00
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
Stella Rouzi
845c9234e9 Merge pull request #1245 from AEtherC0r3/fix_id 
Find correct event id in versions
 2017-01-11 19:46:31 +02:00
Ana María Martínez Gómez
e4104ba2cd Fix the Travis failures in rspec 2017-01-11 10:07:25 +01:00
Ana María Martínez Gómez
7ebf44d1e4 Improvements in the DatabaseCleaner 
Move all what is related to the DatabaseCleaner to the
database_cleaner.rb file. Load the seeds only when they have been
deleted and not before every test.
 2017-01-11 10:03:27 +01:00
AEtherC0r3
ca442dcb90 Amend version tests to show correct event name 
Add scenario for votes
 2017-01-10 23:51:32 +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
Stella Rouzi
052cfebf4e Merge pull request #1237 from AEtherC0r3/template_subject 
Load subject when loading a temlate
 2017-01-10 12:51:10 +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
f67a721f20 Merge pull request #1232 from mwgalloway/error-pages 
Error pages
 2017-01-09 17:56:37 +01:00
Christian Bruckmayer
5f080cf6db Merge pull request #1134 from Ana06/all-events-links 
Make links inside event-panel work with ctrl+click
 2017-01-09 17:54:30 +01:00
Christian Bruckmayer
d6618fd3af Merge pull request #1136 from differentreality/fix_voting 
voting period is open when voting dates are not set
 2017-01-09 17:53:18 +01:00