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
1044 commits 15 branches 2 tags 50 MiB
Commit graph

667 commits

Author SHA1 Message Date
Stella Rouzi
46aed52c85 commercials 2014-09-03 00:18:45 +03:00
Stella Rouzi
bb731aec00 tickets controller fix message 2014-09-02 23:28:23 +03:00
Stella Rouzi
2d2b605063 deletions 2014-09-02 22:23:49 +03:00
Stella Rouzi
0b04179be9 fix quotes on tickets 2014-09-02 22:17:54 +03:00
Stella Rouzi
1fbbbdae6e deletions 2014-09-02 21:45:08 +03:00
Stella Rouzi
da061b3902 exclude config/ from rubocop styling, more style fixes 2014-09-02 21:45:07 +03:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Stella Rouzi
f91467a00a remove trailing spaces and blank lines 2014-09-02 21:41:25 +03:00
Henne Vogelsang
a1ed852287 Merge pull request #492 from hennevogel/master 
Fix a double render while confirming proposals
 2014-09-01 18:43:54 +02:00
Henne Vogelsang
42159617b4 Fix a double render while confirming proposals 2014-09-01 18:28:07 +02:00
Henne Vogelsang
33d5775d52 Merge pull request #491 from hennevogel/master 
More accept/reject/confirm fixes
 2014-09-01 17:18:54 +02:00
Henne Vogelsang
89440b971d More accept/reject/confirm fixes 2014-09-01 17:17:30 +02:00
Henne Vogelsang
28194d47ea Merge pull request #490 from hennevogel/master 
Fix accept, reject and confirm mail templates
 2014-09-01 16:54:47 +02:00
Christian Bruckmayer
d112a98e87 Merge pull request #485 from ChrisBr/fix_hakiri_issues 
Fix Hakiri issues
 2014-09-01 16:52:12 +02:00
Henne Vogelsang
6147c5d185 Fix accept, reject and confirm mail templates 2014-09-01 16:31:56 +02:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
c2a1ff1ffc Fix Hakiri issues 2014-08-27 16:18:35 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Henne Vogelsang
0f1051d24e Merge pull request #458 from differentreality/remove_attachments 
remove attachments
 2014-08-22 14:19:26 +02:00
Stella Rouzi
5a1dae866a fixes from comments 2014-08-21 08:00:29 +03:00
Stella Rouzi
d7c7d878f2 fix [] 2014-08-21 08:00:29 +03:00
Stella Rouzi
fd43d4de11 add links for events/conferences/submitters 2014-08-21 08:00:28 +03:00
Stella Rouzi
561a040c72 remove jquery-fileupload-rails 2014-08-21 07:58:26 +03:00
Stella Rouzi
30c2d66a15 remove attachments 2014-08-21 07:58:26 +03:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes 
Minor fixes
 2014-08-19 14:24:21 -07:00
James Mason
0daeaf859f Merge pull request #455 from bear454/drop_glyphs 
Drop glyphs, use FontAwesome instead.
 2014-08-19 08:54:01 -07:00
James Mason
cb68445efa Typo 2014-08-19 08:49:40 -07:00
Chrisbr
236f3f20e7 Adds error message to questions controller 2014-08-19 13:01:39 +02:00
James Mason
42a914398b Specifying bootstrap components explicitly, excluding glyphicons. 2014-08-18 08:52:26 -07:00
James Mason
e9019ed4fc Update global glyph style 2014-08-18 08:51:16 -07:00
James Mason
e79ed97a94 Switch schedule glyphs to FontAwesome 2014-08-18 08:51:16 -07:00
James Mason
eac40ddfd1 Switch proposal attachment glyphs to FontAwesome 2014-08-18 08:51:16 -07:00
James Mason
d50ac96c6b Switch header navigation glyphs to FontAwesome 2014-08-18 08:51:13 -07:00
James Mason
ba1aed3c54 Switch admin navigation glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
ebe9780059 Switch Splash gallery glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
90bc1b0513 Reformat dashboxes like admin/index 2014-08-18 08:49:44 -07:00
James Mason
2067ad726e Switch admin conference glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
df35b8bc46 Switch admin list glyphs to FontAwesome... 
... match with dashbox icons.
 2014-08-18 08:49:44 -07:00
James Mason
9415128fcb Switch todo glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
Chrisbr
4189d5251b Removes stats controller 2014-08-18 14:33:12 +02:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Henne Vogelsang
3a17ccb49b Merge pull request #454 from hennevogel/drop-jquery-ui 
Drop JQuery-UI
 2014-08-18 09:47:04 +02:00
Henne Vogelsang
45b8c5dd68 Drop JQuery-UI. Fixes Issue #353 partly 2014-08-18 09:32:14 +02:00
Stella Rouzi
3bb42bdb10 move sample user creation in seeds 2014-08-15 20:45:29 +03:00
Stella Rouzi
b5b85ede71 delete events without submitter 2014-08-15 20:45:28 +03:00
Christian Bruckmayer
63366d43a4 Merge pull request #453 from ChrisBr/bugfix_conference_controller 
Removes dulplicate conference update action
 2014-08-15 16:57:13 +02:00
Christian Bruckmayer
367c962c1b Merge pull request #429 from ChrisBr/fix_campaigns 
Fix campaigns dashboard missing method bug
 2014-08-15 16:14:31 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Christian Bruckmayer
1ab7fe3051 Merge pull request #449 from ChrisBr/introduce_speakers_relation 
Introduces speakers relation to conference #416
 2014-08-15 13:00:59 +02:00