Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | LDAP: fix generation of alternate internal name on conflicts. Use also smalle... | Arthur Schiwon | 2013-05-30 | 1 | -2/+2 |
* | Merge pull request #3509 from owncloud/update_jquery_to_1_10 | Jörn Friedrich Dreyer | 2013-05-30 | 4 | -5/+10 |
|\ | |||||
| * | Update jquery to 1.10.0 & add jquery-migrate 1.2.1 | kondou | 2013-05-27 | 4 | -5/+10 |
* | | Merge pull request #3529 from owncloud/folder-permissions | icewind1991 | 2013-05-30 | 4 | -12/+62 |
|\ \ | |||||
| * | | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 | Michael Gapczynski | 2013-05-29 | 2 | -1/+31 |
| * | | Only retrieve the current user's permissions | Michael Gapczynski | 2013-05-29 | 2 | -5/+6 |
| * | | Cache: provide a function to get the permissions of all files in a folder wit... | Robin Appelman | 2013-05-29 | 2 | -11/+30 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 624 | -1663/+2479 |
* | | | Merge pull request #3533 from owncloud/signature-delimiter | Thomas Tanghus | 2013-05-29 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix wrong signature delimiter - fix #3523 | Morris Jobke | 2013-05-29 | 1 | -1/+1 |
* | | | | Merge pull request #3507 from owncloud/remove_unused_vars | Morris Jobke | 2013-05-29 | 16 | -722/+761 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | reformat code | Florin Peter | 2013-05-29 | 2 | -16/+16 |
| * | | | changed " to ' | Florin Peter | 2013-05-29 | 3 | -13/+13 |
| * | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 2 | -23/+34 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #3532 from owncloud/scan-update | Michael Gapczynski | 2013-05-29 | 1 | -6/+9 |
|\ \ \ \ | |||||
| * | | | | Organize conditionals in a better order | Michael Gapczynski | 2013-05-29 | 1 | -8/+4 |
| * | | | | Only update metadata that has changed | Michael Gapczynski | 2013-05-29 | 1 | -2/+9 |
* | | | | | Merge pull request #3530 from owncloud/cache-mimeicon | icewind1991 | 2013-05-29 | 1 | -17/+25 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Style fixes | Michael Gapczynski | 2013-05-29 | 1 | -21/+21 |
| * | | | | Cache mimetype icons | Robin Appelman | 2013-05-29 | 1 | -7/+15 |
|/ / / / | |||||
| | * | | changed l10n to full sentences | Florin Peter | 2013-05-29 | 1 | -14/+25 |
| | * | | changes l10n after review | Florin Peter | 2013-05-29 | 1 | -5/+5 |
| | * | | changes after review | Florin Peter | 2013-05-29 | 1 | -1/+5 |
| | * | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 692 | -33031/+2589 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 552 | -1868/+1887 |
|/ / / | |||||
* | | | Merge pull request #3511 from owncloud/sessionclass | icewind1991 | 2013-05-28 | 20 | -238/+336 |
|\ \ \ | |||||
| * | | | didn't mean to commit this yet | Robin Appelman | 2013-05-28 | 5 | -670/+0 |
| * | | | fixed missing convert to new session handler | Florin Peter | 2013-05-28 | 1 | -3/+2 |
| * | | | Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionc... | Florin Peter | 2013-05-28 | 5 | -8/+548 |
| |\ \ \ | |||||
| | * | | | implement ArrayInterface with Session | Robin Appelman | 2013-05-28 | 5 | -8/+548 |
| * | | | | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 5 | -11/+11 |
| |/ / / | |||||
| * | | | merge master into sessionclass | Robin Appelman | 2013-05-28 | 669 | -32892/+2398 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #3179 from pawl/patch-1 | Jörn Friedrich Dreyer | 2013-05-28 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Improve IE Compatibility | Paul Brown | 2013-04-29 | 1 | -1/+2 |
* | | | | | Merge pull request #2778 from Kondou-ger/optimize_pictures | Jörn Friedrich Dreyer | 2013-05-28 | 118 | -30919/+353 |
|\ \ \ \ \ | |||||
| * | | | | | Add shellscript for optimization. | kondou | 2013-04-13 | 1 | -0/+20 |
| * | | | | | Optimize svgs with scour. | kondou | 2013-04-12 | 61 | -30919/+333 |
| * | | | | | Optimize pictures with optipng. | kondou | 2013-04-07 | 56 | -0/+0 |
* | | | | | | Merge pull request #3488 from zafi/master | blizzz | 2013-05-28 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD | zafi | 2013-05-25 | 1 | -0/+6 |
| | | | * | | | fix syntax error | Robin Appelman | 2013-05-28 | 1 | -1/+1 |
| | | | * | | | provide a dummy session for CLI | Robin Appelman | 2013-05-28 | 1 | -0/+2 |
| | | | * | | | check fix if session start is successfull | Robin Appelman | 2013-05-28 | 1 | -1/+2 |
| | | | * | | | Fix session not working error | Robin Appelman | 2013-05-28 | 2 | -2/+4 |
| | | | * | | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 8 | -57/+57 |
| | | | * | | | Abstract the session away in a class | Robin Appelman | 2013-05-28 | 5 | -0/+221 |
| | | | | * | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 550 | -1978/+2058 |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3512 from owncloud/file_encryption_session_fix | FlorinPeter | 2013-05-28 | 3 | -17/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix for undefined index | Florin Peter | 2013-05-28 | 1 | -1/+1 |
| * | | | | | | | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 3 | -16/+55 |
|/ / / / / / / |