Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | fixing some unit tests | Bjoern Schiessle | 2013-07-30 | 2 | -6/+6 | |
| * | | | | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 | |
| * | | | | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 2 | -2/+7 | |
| * | | | | | remove unused method, the right one is in util.php | Bjoern Schiessle | 2013-07-30 | 1 | -4/+0 | |
| * | | | | | adapt unit tests to the modified stream wrapper | Bjoern Schiessle | 2013-07-30 | 5 | -35/+35 | |
| * | | | | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 | |
| * | | | | | check if app is enabled | Bjoern Schiessle | 2013-07-30 | 1 | -7/+8 | |
| * | | | | | only write keyfiles if it was a new file, otherwise nothing changed | Bjoern Schiessle | 2013-07-30 | 1 | -38/+45 | |
| * | | | | | use path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 | |
| * | | | | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -10/+26 | |
| * | | | | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 2 | -18/+97 | |
| * | | | | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 1 | -0/+4 | |
| * | | | | | user interface to allow user to decrypt all his files once the encryption app... | Björn Schießle | 2013-07-29 | 4 | -9/+40 | |
* | | | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton | Christopher | 2013-08-18 | 1 | -4/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unneeded extra ID selectors | Jan-Christoph Borchardt | 2013-08-18 | 1 | -2/+2 | |
| * | | | | | | move upload progress bar near upload button, more contextual | Jan-Christoph Borchardt | 2013-08-18 | 1 | -3/+13 | |
* | | | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 43 | -43/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 43 | -43/+43 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4483 from owncloud/compare-true-false | Bart Visscher | 2013-08-18 | 7 | -14/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use boolean casting for bitwise and result. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 | |
| * | | | | | | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 | |
| * | | | | | | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 7 | -14/+14 | |
* | | | | | | | | Merge pull request #4486 from owncloud/ldap_adjust_cache | Bart Visscher | 2013-08-18 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | LDAP: use memcache if available | Arthur Schiwon | 2013-08-17 | 1 | -1/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #4426 from owncloud/ldap_settings_design | Jan-Christoph Borchardt | 2013-08-18 | 5 | -9/+49 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | LDAP: Update Host in configuration chooser on Save | Arthur Schiwon | 2013-08-15 | 1 | -0/+7 | |
| * | | | | | | LDAP: Show Host name in configuration drop down | Arthur Schiwon | 2013-08-15 | 3 | -1/+31 | |
| * | | | | | | LDAP: slightly smaller input fields | Arthur Schiwon | 2013-08-15 | 1 | -1/+1 | |
| * | | | | | | LDAP: move small info text strings into tooltips | Arthur Schiwon | 2013-08-14 | 1 | -7/+4 | |
| * | | | | | | LDAP: right align labels on settings page | Arthur Schiwon | 2013-08-14 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 4 | -315/+331 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 3 | -310/+316 | |
| * | | | | | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 514 | -1095/+2078 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | actually register html template | Robin Appelman | 2013-08-07 | 1 | -5/+9 | |
| * | | | | | | | | add the option to have templates for newly created files | Robin Appelman | 2013-08-07 | 1 | -34/+38 | |
* | | | | | | | | | Merge pull request #4427 from owncloud/fix_4425 | Morris Jobke | 2013-08-17 | 1 | -9/+21 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | switched to dirname() | Bjoern Schiessle | 2013-08-17 | 1 | -1/+1 | |
| * | | | | | | | | | added missing parameter documentation | Bjoern Schiessle | 2013-08-17 | 1 | -1/+2 | |
| * | | | | | | | | | added createMissingDirectories() method | Bjoern Schiessle | 2013-08-17 | 1 | -26/+27 | |
| * | | | | | | | | | also create root dir if it doesn't exist yet | Bjoern Schiessle | 2013-08-14 | 1 | -6/+13 | |
| * | | | | | | | | | use OC files API to create missing directory which should handle special char... | Bjoern Schiessle | 2013-08-14 | 1 | -4/+7 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4481 from owncloud/fix_versioning_size_check | Björn Schießle | 2013-08-17 | 1 | -10/+9 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | first check if file exists before checking the files size | Bjoern Schiessle | 2013-08-17 | 1 | -10/+9 | |
* | | | | | | | | | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 5 | -445/+50 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 | |
| * | | | | | | | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio... | Bjoern Schiessle | 2013-08-09 | 2 | -7/+7 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | fixing typos and PHPDoc | Thomas Müller | 2013-08-08 | 2 | -7/+7 | |
| * | | | | | | | | | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 2 | -66/+0 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | remove todo item | Bjoern Schiessle | 2013-08-08 | 1 | -4/+0 | |
| * | | | | | | | | adapt tests to the changes in crypt.php | Bjoern Schiessle | 2013-08-08 | 2 | -244/+31 |