my #170

Merged
merged 20 commits into from Oct 4, 2013

Projects

None yet

3 participants

@sbroecker84

No description provided.

Romain LE DISEZ and others added some commits Apr 17, 2011
Romain LE DISEZ Sync with wind and other stuff... 38c9dc4
@rledisez rledisez Fix indentation ff1fa34
@rledisez rledisez Add a new permission "downloadalbum". it is now possible to choose pe…
…r albums and per group if user can download an album.
f92ae0b
@rledisez rledisez Show "Download album" link only if there is something to download.
Not fully reliable:
 - on an album that only contains sub-albums, if a user is allowed
   to "downloadalbum" the album but disallowed to "downloadalbum"
   all the sub-albums, the link appears and throw an exception.
 - on a tag, same situation. If a user is not allowed to "downloadalbum"
   any of the items tagged, it will throw an exception.
52b9a99
@rledisez rledisez Merge remote-tracking branch 'upstream/master'
Conflicts:
	3.0/modules/downloadalbum/module.info
	3.0/themes/sobriety/theme.info
4ca5df3
@rledisez rledisez Sync with wind d8d7bf7
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 60cc901
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 4bd2abc
@rledisez rledisez Merge remote-tracking branch 'upstream/master' de1c2ac
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 86ca663
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 888ec7c
@rledisez rledisez Sync with wind to 68437993b90bb9cc02ca1134e73c754e1f0d8273 f2d7511
@rledisez rledisez Sync with wind to 68437993b90bb9cc02ca1134e73c754e1f0d8273 6360f0b
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 82cb8b6
@rledisez rledisez Do not rely on Kohana::close_buffers() to close the buffers, because …
…it does not work on PHP 5.4+. Let's do it ourself.
b3f97c8
@rledisez rledisez Merge remote-tracking branch 'upstream/master' fd72f64
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 906d497
@rledisez rledisez Merge remote-tracking branch 'upstream/master' d7f0aa4
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 25f9515
@rledisez rledisez Merge remote-tracking branch 'upstream/master' 73440ae
@bharat bharat merged commit 0353f3f into gallery:master Oct 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment