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

1076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Bruckmayer
fa5b5242c1 Merge pull request #483 from ChrisBr/refactoring_splash 
Extracted Splashpage from Conference
 2014-08-31 23:10:43 +02:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Christian Bruckmayer
7793497862 Merge pull request #482 from ChrisBr/refactor_tickets 
Refactor tickets
 2014-08-31 22:52:04 +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
Christian Bruckmayer
5485fe0e7f Merge pull request #471 from ChrisBr/refactoring_registration 
Big refactoring of registration
 2014-08-22 20:11:46 +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
Henne Vogelsang
460492157d Merge pull request #376 from differentreality/speakers 
add links for events/conferences/submitters
 2014-08-22 14:19:01 +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
Henne Vogelsang
6579b3220f Merge pull request #480 from hennevogel/blah 
Drop and fix wrong migration 20140801080705
 2014-08-20 22:09:38 +02:00
Henne Vogelsang
8e042f2ea6 Use find_or_create_by for the deleted user 2014-08-20 21:45:09 +02:00
Stella Rouzi
41a21ffe27 add attr_accessible for TempUser 2014-08-20 19:47:07 +03:00
Stella Rouzi
858d8bbae8 create dummy user if not found 2014-08-20 17:31:28 +03:00
Stella Rouzi
f841442dca fixes 2014-08-20 16:23:05 +03:00
Stella Rouzi
fecfe530ba fix for buggy migration 20140801080705 2014-08-20 15:45:05 +03:00
Stella Rouzi
7ed14d4935 add corrected migration for adding dummy user to events without users 2014-08-20 15:44:26 +03:00
Stella Rouzi
cfa9b27589 drop wrong migration 20140801080705 2014-08-20 15:33:38 +03:00
Henne Vogelsang
2cd5c83fc6 Merge pull request #477 from hennevogel/master 
Add a rake task to the deployment to backup the DB.
 2014-08-20 01:21:21 +02:00
Henne Vogelsang
f212aeeb30 Add a rake task to the deployment to backup the DB. 
Apparently needed with all the broken migrations...
 2014-08-20 00:49:48 +02:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes 
Minor fixes
 2014-08-19 14:24:21 -07:00
James Mason
0e0415d515 Merge pull request #473 from bear454/phantomjs 
Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall it.
 2014-08-19 14:24:04 -07:00
James Mason
2b0d7b880b Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs. 2014-08-19 10:32:37 -07:00
James Mason
89c77fa33b trigger click instead of .click 2014-08-19 10:09:24 -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
818fd96418 Adding a network delay on subsequent action in proposal spec. 
Without this, I get consistent failures, and others experience intermmitent failures, on this spec.
 2014-08-19 08:49:51 -07:00
James Mason
cb68445efa Typo 2014-08-19 08:49:40 -07:00
Christian Bruckmayer
e41fa41acf Merge pull request #472 from ChrisBr/adds_error_message_to_questions 
Adds error message to questions controller
 2014-08-19 13:26:27 +02:00
Chrisbr
236f3f20e7 Adds error message to questions controller 2014-08-19 13:01:39 +02:00
Henne Vogelsang
f2bbb68ad9 Update rails to address CVE-2014-3514. Fix the deployment 2014-08-19 12:31:31 +02:00
Artem Chernikov
3581edf58c Merge pull request #464 from differentreality/fix_migration_event_users 
fix migration
 2014-08-19 10:06:03 +02:00
Artem Chernikov
65291d8b0d Merge pull request #450 from gopesht/dj_deploy 
Adds delayed jobs recipe for production, and some documentation
 2014-08-19 09:50:36 +02:00
Stella Rouzi
eef902291d fix migration. Create dummy user if user doesn't exist, make sure all event_users records are valid 2014-08-18 19:56:31 +03: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
Christian Bruckmayer
206d121d3d Merge pull request #445 from ChrisBr/refactor_registration_period 
Introduces new registration period object
 2014-08-18 15:26:52 +02:00
Chrisbr
4189d5251b Removes stats controller 2014-08-18 14:33:12 +02:00