Skip to content

ding_reservation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guddo wants to merge 153 commits into
base: develop
Choose a base branch
from
Open

ding_reservation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
1ab722a
ding2 -> ding2tal
ubcudvikler Aug 15, 2012
46d3b09
tag -> branch
ubcudvikler Aug 27, 2012
4f040ad
fixed reserved message (it is set to getProviderId() instead of getTi…
impara Dec 4, 2012
c9e463a
Merge pull request #1 from odensecentralbibliotek/reserved_message
cableman Dec 17, 2012
b2eea1c
renaming function names to clarify difference between reservation upd…
wiredloose Jan 31, 2013
d64bc89
re-implementing reservation delete functions to include a confirm pop…
wiredloose Jan 31, 2013
6979ed7
re-implementing row delete button's submit handler
wiredloose Feb 6, 2013
d41bd9b
Added a submit button to the top of the form, made in a hurry just be…
zorp Mar 15, 2013
9b3173e
Added handling of order_arrived == false in reservation list
JrgenGNielsen Mar 1, 2012
2774add
Fixed merge conflict from PH libraries
Sep 7, 2012
de64ee6
case-559 - Refactoring of calling alma-openruth instances.
IliaDragan Sep 26, 2012
cbb4880
Removed debug statements
cableman Mar 20, 2013
2fd1f28
Resolved merge conflict in inter library loans
Oct 5, 2012
7afd9f5
Show pickup id in a separate column
cableman Mar 20, 2013
1b936d4
case 1510 - Interest period field validation and display logic.
Nov 13, 2012
718d716
Corrected order and pickup id
cableman Mar 20, 2013
513b689
case 1510 - Improved check for empty profile fields when reserving.
Nov 20, 2012
9e7eb83
Mising return, caused fatal errors with operand types on form build
cableman Mar 20, 2013
28d7a0b
case 1495 - Better hadnling of return values and properties.
Nov 30, 2012
8687b84
case 1495 - Handle missing title.
Nov 30, 2012
e95959e
Minor correction to make reservations work properly
cableman Mar 20, 2013
3981149
case 1770 - Translate interest period values.
Dec 11, 2012
772f580
Translatable ILL loans status
cableman Mar 20, 2013
74685f7
Pickup ID column should be removed from Inter library loans
cableman Mar 20, 2013
c29aeb4
Ability to control reservation deletion from PH libraries
cableman Mar 20, 2013
7715211
Fixed logic for reservation update
cableman Mar 20, 2013
c132229
Use defalt interest period values when no user value has been entered
cableman Mar 20, 2013
1b648dc
Fix unsupported operand types PHP error
cableman Mar 20, 2013
0700c83
Fixed order_nr vs. pickup_id in reservation form
cableman Mar 20, 2013
72d404f
Fixed logic in deletion of reservation buttons
cableman Mar 20, 2013
c878344
Updated coding style in the panels plugin to reservations
cableman Mar 21, 2013
3e2f90e
Fixed reservation (provider_id) and delete submit callback function name
cableman Mar 21, 2013
e025bb2
Merge remote-tracking branch 'origin/artesis' into development
cableman Mar 27, 2013
0c5c263
Wrapped reservation validation in a check for that users login status
cableman Apr 19, 2013
8dd4a4a
Change reservation to use new ding_provider_get_pseudo_entity function
cableman Apr 19, 2013
96a0e98
Removed the ding_reservation_replace_entity function that have been r…
cableman Apr 19, 2013
542cd6c
Fixed missing function call in user_is_logged_in
cableman Apr 22, 2013
7dae915
Updated reserve button with class attributes
zorp Apr 22, 2013
6cead4a
Merge branch 'development' of github.com:ding2tal/ding_reservation in…
zorp Apr 22, 2013
3e38032
Stream line of make file
cableman Apr 22, 2013
4ec5d90
Minor coding style fixes
cableman Apr 30, 2013
f5ed0b5
Merge branch 'release' into development
cableman Apr 30, 2013
6bbb1cd
Changed makefile to point to ding2 on github
cableman May 6, 2013
3034427
Removed hardcode default interest period and some clean up
cableman May 16, 2013
3a4892c
Removed hardcode default interest period and some clean up
cableman May 16, 2013
b13b255
Merge branch 'release' into development
cableman May 16, 2013
5c64efc
Added the new hook_default_interest_period() to reservation form
cableman Jun 4, 2013
bc896a4
Fixed reservation form by using new hook_reservation_deletion_enabled()
cableman Jun 4, 2013
5721484
Resolved merge conflict in function comment
cableman Jun 4, 2013
a62a3aa
Merge branch 'release' into development
cableman Jun 4, 2013
aed7a7e
Merge remote-tracking branch 'origin' into release
cableman Jun 4, 2013
dd3ce92
Merge branch 'release' into development
cableman Jun 5, 2013
232e59e
Moved sorting of reservation types back into the providers
cableman Jun 6, 2013
40590ae
Added more configuration options to reservation lists panel panes
cableman Jun 6, 2013
8c44bca
Added support for user session cache
cableman Jun 6, 2013
4f180f5
Merge branch 'release' into development
cableman Jun 6, 2013
bc60f1f
Merge remote-tracking branch 'origin' into release
cableman Jun 10, 2013
529a2f7
Changed reservation lists date format to include year as reservation …
cableman Jun 10, 2013
473369b
Updated reservation lists with new date format
cableman Jun 10, 2013
4fec695
Changed default reservation form list to "not ready for pickup"
cableman Jun 10, 2013
f52d140
Merge remote-tracking branch 'origin' into release
cableman Jun 11, 2013
d1debfd
Updated make file to point to ding2tal
cableman Jun 24, 2013
372309d
Changed makefile to use development branch
cableman Jun 24, 2013
8ba450b
Merge pull request #3 from ding2tal/core-pr-3
kasperg Jul 3, 2013
12e2d69
Merge branch 'master' into release
cableman Jul 3, 2013
8088953
Updated makefile to point to development branch and ding2tal
cableman Jul 3, 2013
93163dc
Resolved merge conflict with release branch
cableman Jul 3, 2013
82195dd
Merge remote-tracking branch 'origin' into release
cableman Jul 3, 2013
22fbb4c
Fixed indention of switch statment
cableman Aug 29, 2013
a55adc0
Moved the reservation "entity" class into own file
cableman Aug 29, 2013
4c26033
Tried to fix coding style
cableman Aug 29, 2013
95e3586
Cleaned up reservation lists empty texts
cableman Aug 29, 2013
75bea43
Added even more comments to the code
cableman Aug 29, 2013
be11903
Merge branch 'reservation_list' into development
cableman Aug 29, 2013
d5dd158
Changed reservation list to use new material item theme function
cableman Sep 2, 2013
eccf2bf
Merge branch 'reservation_list' into development
cableman Sep 2, 2013
a9d5136
Change information order in reservation lists
cableman Sep 2, 2013
439642e
Fixed entity type in view of ting cover field
cableman Sep 2, 2013
9dd80a1
Added support for a select all checkboxes in the reservation list
cableman Sep 2, 2013
08bac05
Moved reservation sort functions and re-add the sort to the list
cableman Sep 2, 2013
ad89740
Added checkbox count to buttons on the reservation list
cableman Sep 2, 2013
1e2bb8e
Re-activated session cache for reservations
cableman Sep 2, 2013
04eae92
Change the way periodical number gets add to a material item
cableman Sep 2, 2013
c20eb1c
Updated javascript to match correct class names
cableman Sep 4, 2013
01146f0
Added wrapper to check-all checkboxes to better style them
cableman Sep 4, 2013
14c3838
Ensured that check all checkbox is checked when all reservation are s…
cableman Sep 4, 2013
92fc7af
Add wrapper for action buttons
zorp Sep 4, 2013
45a3713
Modify class name
zorp Sep 4, 2013
3607bab
Ensured that the form title element for reservations can be translated
cableman Sep 5, 2013
fcb3012
Fixed coding style issues
cableman Sep 9, 2013
3a3094b
Fixed updated and deletion of reservations
cableman Sep 9, 2013
11262cf
Addded count to string translation for buttons text
cableman Sep 10, 2013
b1666e8
Added #weight to reservation list form
cableman Sep 10, 2013
17f448f
Added better function documentation
cableman Sep 11, 2013
8e109a5
Removed floating comment, not allowed due to coding style
cableman Sep 11, 2013
6c36248
Reworked the reserve process to handle better branch seletion and bet…
cableman Sep 11, 2013
a9d5b49
Added more documentation to the reserve form validation handler
cableman Sep 11, 2013
4971257
Added better selection of default branch based on the reservations th…
cableman Sep 11, 2013
75a3dff
Disabled action buttons when no reservations are selected
cableman Sep 12, 2013
4ec1592
Fixed weight of the different form elements in the reservation list form
cableman Sep 12, 2013
8cc5369
Changed title in reservation list to link to the entity
cableman Sep 12, 2013
1fb5b53
Updated JS comment
cableman Sep 13, 2013
1cefc29
Added expire message to the reservation list when reservation is abou…
cableman Sep 16, 2013
47a9f13
Updated reservation expire message with configurable expire time
cableman Sep 16, 2013
4200a50
Fixed problem with deletion of reservertion with only one reservation
cableman Sep 16, 2013
ddb3928
Added title to reservation list
cableman Sep 16, 2013
cc4e9ed
Added exception to when to add periodicl information in the reservati…
cableman Sep 20, 2013
c6c26c9
Merge remote-tracking branch 'origin' into release
cableman Sep 20, 2013
85c62dd
Ensured that select-all checkboxes is not selected when disabled
cableman Sep 30, 2013
08fb4ff
Added support for scrolling action buttons
cableman Sep 30, 2013
6323d15
Added comment and if statement to JS
cableman Sep 30, 2013
04fb28d
Changed date format to ding material list
cableman Oct 17, 2013
907f4c8
Merge remote-tracking branch 'origin' into release
cableman Nov 4, 2013
3361870
Updated makefile to point to tag 7.x-1.0-beta2
cableman Nov 4, 2013
510a952
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
59bc379
Added more information to reservation list based on new reservation t…
cableman Dec 3, 2013
5102153
Fixed IIL label in reservation lists
cableman Dec 4, 2013
87393cb
Fixed title links in reservation lists
cableman Dec 10, 2013
7f37dc2
Merge remote-tracking branch 'origin' into release
cableman Dec 12, 2013
715fe13
Updated makefile to point to tag 7.x-1.0-beta4
cableman Dec 12, 2013
61f9d17
Updated makefile to point to tag 7.x-1.0-beta5
cableman Dec 18, 2013
c9e7c9b
Updated makefile to point to tag 7.x-1.0-rc1
cableman Dec 20, 2013
4af87e8
Updated makefile to point to tag 7.x-1.0-rc2
cableman Jan 8, 2014
7c879ff
Updated makefile to point to tag 7.x-1.0-rc3
cableman Jan 20, 2014
3a71d55
Updated makefile to point to ding2 master branches
cableman Feb 3, 2014
0782dbd
Added ajax reservation callback without generating a form for each re…
cableman Feb 24, 2014
c5f1dae
Added support for periodical reservation in ajax callback function
cableman Feb 26, 2014
5416181
Added exception handling to ajax reservation callback
cableman Feb 26, 2014
2e5fd55
Fixed missing assingement
cableman Feb 27, 2014
1f47f4d
Added missing new line in info file
cableman May 5, 2014
a4464df
Added missing new line in info file
cableman May 5, 2014
fdd1b6a
Fixed typo in ding_reservation_reserve_form_validate
cableman May 5, 2014
deab177
Fixed typo in ding_reservation_reserve_form_validate
cableman May 5, 2014
34dd03a
Updated date to version 2.7
cableman May 6, 2014
a9a3d69
Ensured that the provider is asked for entity details for inter libra…
cableman May 9, 2014
ae4d419
Added check for preferred branch doing reservation and gives the user…
cableman May 13, 2014
7751852
Updated comment about branch
cableman May 13, 2014
d84f0f2
Updated date to 2.8
cableman Sep 8, 2014
f940b41
Merge pull request #4 from ding2tal/core-pr-4
kasperg Sep 26, 2014
c5e5600
Merge branch 'master' into development
cableman Oct 6, 2014
363b84c
Updated make file to point to development branch
cableman Oct 6, 2014
59c0198
Updated make file to point to master branch
cableman Oct 7, 2014
e363353
Reviewed: Added new permission to preform reservations
cableman Oct 21, 2014
b3c56a2
Reviewed: Added new permission to preform reservations
cableman Oct 21, 2014
9bd1bea
Issue #624 by cableman: Fixed typo in reservation permissions
cableman Oct 28, 2014
ab5c503
Reviewed: Change logic in if statements in ding_reservation_reserve_ajax
cableman Nov 17, 2014
681dbb5
Reviewed: Change logic in if statements in ding_reservation_reserve_ajax
cableman Nov 17, 2014
3350ae0
Merge pull request #5 from ding2tal/core-pr-5
kasperg Nov 19, 2014
68f8785
Resolved conflict
cableman Jan 13, 2015
f1eb36c
Merge branch 'development' into core-pr-6
cableman Jan 13, 2015
98e3228
Merge pull request #7 from ding2tal/core-pr-6
kasperg Jan 19, 2015
a3ce415
Feature #187 by bartvig: Don't set action-buttons-is-visible css clas…
bartvig Oct 13, 2015
bdc0c56
Merge pull request #12 from bartvig/master
cableman Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ding_reservation.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = Allows users to reserve materials.
package = Ding!
version = "7.x-0.18"
core = 7.x
files[] = ding_reservation.module
files[] = includes/ding_reservation_entity.inc
files[] = ding_reservation.test
dependencies[] = ding_base
dependencies[] = ding_provider
Expand Down
12 changes: 6 additions & 6 deletions ding_reservation.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ core = 7.x

; Contrib

projects[date][subdir] = contrib
projects[date][version] = "2.6"
projects[date][subdir] = "contrib"
projects[date][version] = "2.8"

; Ding 2 modules

projects[ding_base][type] = "module"
projects[ding_base][download][type] = "git"
projects[ding_base][download][url] = "git@github.com:ding2/ding_base.git"
projects[ding_base][download][tag] = "7.x-0.4"
projects[ding_base][download][branch] = "master"

projects[ding_popup][type] = "module"
projects[ding_popup][download][type] = "git"
projects[ding_popup][download][url] = "git@github.com:ding2/ding_popup.git"
projects[ding_popup][download][tag] = "7.x-0.4"
projects[ding_popup][download][branch] = "master"

projects[ding_user][type] = "module"
projects[ding_user][download][type] = "git"
projects[ding_user][download][url] = "git@github.com:ding2/ding_user.git"
projects[ding_user][download][tag] = "7.x-0.19"
projects[ding_user][download][branch] = "master"

projects[ding_provider][type] = "module"
projects[ding_provider][download][type] = "git"
projects[ding_provider][download][url] = "git@github.com:ding2/ding_provider.git"
projects[ding_provider][download][tag] = "7.x-0.13"
projects[ding_provider][download][branch] = "master"
Loading