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

1043 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
bb731aec00 tickets controller fix message 2014-09-02 23:28:23 +03:00
Stella Rouzi
9ff8becaf6 Merge pull request #468 from differentreality/styling 
Styling
 2014-09-02 23:03:53 +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
Henne Vogelsang
dc2201d937 Merge pull request #489 from ChrisBr/fix_migration 
Fix failing migration for new price and currency columns of ticket
 2014-09-01 13:16:23 +02:00
Chrisbr
0911e1ed83 Fix failing migration for new price and currency columns of ticket 2014-09-01 13:06:14 +02:00
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