Commit graph

984 commits

Author SHA1 Message Date
chrisbr
15c6ed127f Implements username authentication
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
2014-11-03 15:25:33 +01:00
Stella
4973effe23 Add Users link in drop down menu 2014-10-31 23:00:42 +02:00
Matt Barringer
6bf85d64d6 I can't take credit for all of this :-) 2014-10-15 18:28:58 +02:00
Christian Bruckmayer
aeb23ba914 Merge pull request #517 from openSUSE/lodging-section
Describe the splash area as 'Lodging' instead of 'Lodgings'...
2014-10-07 09:52:22 +02:00
Christian Bruckmayer
3b63fb712f Merge pull request #516 from openSUSE/spacing-fix
Improve spacing around comma in conference list.
2014-10-07 09:51:58 +02:00
James Mason
1534a0ba45 Describe the splash area as 'Lodging' instead of 'Lodgings'...
... becauase it just sounds clunky.
2014-10-06 20:56:29 -07:00
James Mason
92db387822 Merge pull request #513 from ChrisBr/fix_proposal_js
Fixes the proposal abstract word count javascript functions
2014-10-06 20:44:43 -07:00
James Mason
ce81ec306f Improve spacing around comma in conference list. 2014-10-06 20:35:10 -07:00
James Mason
567ce6342d Merge pull request #509 from ChrisBr/fix_to_do
Fixes to do list link to registration period
2014-10-06 20:22:24 -07:00
Chrisbr
c995f57877 Fixes the proposal abstract word count javascript functions
fix #510
2014-10-05 18:58:47 +02:00
Chrisbr
d996d1bb0e Fixes the top bar icons of the instance dashboard
fix #507
2014-10-04 09:34:57 +02:00
Chrisbr
b6439a7ea0 Fixes to do list link to registration period
fix #505
2014-10-04 09:30:56 +02:00
Chrisbr
be68877f1a Implements new admin menu structure #304
close #305
2014-09-30 12:57:56 +02:00
Gopesh Tulsyan
67ea900dc3 Keynote Speakers implemented 2014-09-15 19:02:02 +05:30
Stella Rouzi
1106f4e227 Merge pull request #500 from differentreality/typo_phrasing
rephrase closed cfp in splashpage
2014-09-11 13:25:30 +03:00
Stella Rouzi
ea0fcac402 rephrase closed cfp in splashpage 2014-09-10 10:30:56 +03:00
James Mason
a3e4ab5ca0 there's no such thing as Array#to_h
(cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)
2014-09-09 17:57:30 -07:00
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