gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4833 commits 2 branches 2 tags 50 MiB
Commit graph

1238 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
ea0fcac402 rephrase closed cfp in splashpage 2014-09-10 10:30:56 +03: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
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
fd43d4de11 add links for events/conferences/submitters 2014-08-21 08:00:28 +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
cb68445efa Typo 2014-08-19 08:49:40 -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
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
45b8c5dd68 Drop JQuery-UI. Fixes Issue #353 partly 2014-08-18 09:32:14 +02:00
Stella Rouzi
09dea4b4c5 fix typo openSUSE 2014-08-15 13:10:35 +03:00
Stella Rouzi
911143c006 fix in admin menu and rework menu tests 2014-08-14 16:46:34 +03:00
Stella Rouzi
ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout 2014-08-14 11:37:30 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
1cbf78df3d create @user with cancan for remove_user action 2014-08-13 22:53:14 +03:00
Stella Rouzi
e9a57f78a3 style 2014-08-13 22:53:14 +03:00
Stella Rouzi
d13c1a83e4 fix in questions 2014-08-13 22:53:14 +03:00
Stella Rouzi
bbeae5e0ff fix 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts 
Add email settings to user accounts
 2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
fe17bd26e5 Merge pull request #440 from gopesht/add_home_route_to_splash 
Added route to root path for navigation from splash
 2014-08-13 09:20:56 +05:30
Gopesh Tulsyan
4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons 2014-08-12 17:04:16 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30