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

206 commits

This branch
This branch
All branches
Author SHA1 Message Date
differentreality
4d2f0e2111 fix rebase conflict 2013-08-16 16:09:29 +03:00
differentreality
69efd2619a fix rebase conflict 2013-08-16 16:08:38 +03:00
differentreality
96d14f14de fix rebase conflict 2013-08-16 16:06:36 +03:00
differentreality
609b3d45fe check if voting is enabled by organizers 2013-08-16 16:06:01 +03:00
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03:00
Henne Vogelsang
2314d943e1 Merge pull request #36 from averi/master 
Improve the documentation.
 2013-08-16 03:10:00 -07:00
Andrea Veri
c3a6ff83c7 Improve the documentation. 2013-08-15 16:51:57 +02:00
Henne Vogelsang
b70ba985af Merge pull request #28 from differentreality/cfp 
Cfp option to accept changes in events
 2013-08-15 02:31:36 -07:00
Henne Vogelsang
5ea8a9438e Merge pull request #30 from differentreality/navbar_name 
show public name and email on top navbar
 2013-08-15 02:30:30 -07:00
Henne Vogelsang
55799aa018 More documentation 2013-08-14 18:45:21 +02:00
Henne Vogelsang
f8317a4482 ImageMagik is needed too 2013-08-14 18:35:21 +02:00
Henne Vogelsang
ca6b63c4e2 Document the installation a bit, run last 3 migrations 2013-08-14 18:35:21 +02:00
Henne Vogelsang
ef556f02ca Merge pull request #34 from differentreality/admin_events_list 
Admin events list
 2013-07-29 04:40:25 -07:00
Henne Vogelsang
f8a6f9626f Merge pull request #33 from differentreality/home 
Home page conferences order
 2013-07-29 04:39:52 -07:00
Henne Vogelsang
5602d9d9be Merge pull request #32 from differentreality/venue 
Minor layout change to single line box for venue name and address
 2013-07-29 04:39:30 -07:00
Henne Vogelsang
0f229f3db0 Merge pull request #31 from differentreality/schedule_show_by_date 
Schedule show by date
 2013-07-29 04:38:59 -07:00
Henne Vogelsang
6d5edfd301 Merge pull request #29 from differentreality/admin_event_edit 
edit event from admin panel
 2013-07-29 04:37:23 -07:00
differentreality
b5c002ad77 show public name and email on top navbar 2013-07-29 08:59:40 +03:00
differentreality
4f582bc7f9 show first day if today is not within the conference date range 2013-07-29 08:48:04 +03:00
differentreality
adb04ab82e show current day's schedule 2013-07-29 02:01:24 +03:00
differentreality
4a41336bff layout change to single line box for venue name and address 2013-07-28 22:41:32 +03:00
differentreality
ffadfca7a2 show conference until its last day and order by start date 2013-07-28 22:37:26 +03:00
differentreality
1686c61e7c change track from events list 2013-07-28 22:10:45 +03:00
differentreality
3b201f951a Hide stats by default 2013-07-28 21:37:25 +03:00
differentreality
071cd81029 edit event from admin panel, show actual submitter and update event details 2013-07-28 21:21:54 +03:00
differentreality
0590da056e Do not show New submission button if cfp is closed, unless organizer or admin 2013-07-28 13:11:34 +03:00
differentreality
d7ae2ba29b Allow title edit for confirmed proposal if organizer or admin and do not allow event type change for confirmed/unconfirmed proposals if schedule_changes is not set, unless it is done by an admin or organizer 2013-07-28 13:03:22 +03:00
differentreality
c91156ae0c Do not allow title change after proposal is confirmed 2013-07-28 11:49:47 +03:00
differentreality
d9d889eb9f Option for proposal changes 2013-07-28 11:48:56 +03:00
Ancor Gonzalez Sosa
f905bb8f8f added Speaker#full_name to the JSON API 2013-07-22 11:54:27 +02:00
Ancor Gonzalez Sosa
0c20151de8 Changing date format in JSON API to match suseconferenceclient expectations 2013-07-17 13:10:50 +02:00
Ancor Gonzalez Sosa
7f3c8a65de Only confirmed events in JSON API 2013-07-16 18:42:22 +02:00
Ancor Gonzalez Sosa
08637503e5 schedule renders 10x faster now. Caching disabled 2013-07-16 18:16:37 +02:00
Ancor Gonzalez Sosa
740a604c01 Adding api/v1/conferences/x/conferences 
* A little weird, but needed by suseconferenceclient
 2013-07-16 17:04:48 +02:00
Ancor Gonzalez Sosa
2553bd4e03 Fixes in registration#show after merging 2013-07-16 16:15:17 +02:00
Ancor Gonzalez Sosa
bae0be338a Use render instead of redirect if registration/create fails 2013-07-16 16:03:36 +02:00
Ancor Gonzalez Sosa
243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended 
Conflicts:
	app/controllers/admin/registrations_controller.rb
	app/models/registration.rb
 2013-07-16 15:59:00 +02:00
Ancor Gonzalez Sosa
7e930d8d40 Getting rid of plain sql in stats_controller 2013-07-16 15:50:32 +02:00
Ancor Gonzalez Sosa
26236424cc Fixing a typo 2013-07-16 15:50:13 +02:00
Ancor Gonzalez Sosa
45b95584e0 Merge branch 'statistics' of github.com:differentreality/osem into differentreality-statistics 2013-07-16 15:43:22 +02:00
Ancor Gonzalez Sosa
e30d1630c7 Merge pull request #25 from ancorgs/feature_xlsx 
xlsx export for registrations list
 2013-07-16 00:49:22 -07:00
Ancor Gonzalez Sosa
9af4393928 xlsx export for registrations list 2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
4eefbc17b4 Merge pull request #23 from miska/master 
Printable schedule
 2013-07-15 08:34:08 -07:00
Ancor Gonzalez Sosa
79b44f4eb1 Merge pull request #24 from ancorgs/fix_f53af55a 
Fixing a bug introduced in f53af55a74
 2013-07-15 08:31:01 -07:00
Ancor Gonzalez Sosa
b9cd54a256 Fixing a bug introduced in f53af55a74 2013-07-15 16:07:23 +02:00
Michal Hrusecky
bf1390166a First version of schedule printing style 2013-07-15 12:24:50 +02:00
Michal Hrusecky
d27b43f82d Apply styles to all media 
There are some media dependent parts of styles already and anyway, it's better
to have at least some style to begin with.
 2013-07-15 12:22:57 +02:00
Michal Hrusecky
11f75a16d2 Do not use <br> 
Using styles instead of hardcoded <br> tags.
 2013-07-15 12:22:07 +02:00
differentreality
094e0bb0d0 fix 2013-07-15 13:20:28 +03:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00