Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | adding PHPDoc comments | Thomas Müller | 2013-10-22 | 1 | -0/+7 | |
| * | | | | | prevent user from creating or renaming sth. to an existing filename | Jörn Friedrich Dreyer | 2013-10-22 | 7 | -436/+524 | |
* | | | | | | Merge pull request #5497 from owncloud/ie8-placeholdershim | Thomas Müller | 2013-10-23 | 5 | -6/+226 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 3 | -0/+220 | |
| * | | | | | | Renamed current placeholder jquery plugin to imageplaceholder | Vincent Petry | 2013-10-23 | 2 | -6/+6 | |
* | | | | | | | Merge pull request #5464 from owncloud/fixing-5456-master | Thomas Müller | 2013-10-23 | 4 | -3/+59 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | test cases added for create/remove Shared folder and file | Thomas Müller | 2013-10-22 | 2 | -0/+41 | |
| * | | | | | | | creating and deleting of file and folder 'Shared' in root is not allowed | Thomas Müller | 2013-10-22 | 2 | -3/+18 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5492 from owncloud/admin-forcesslwrongid | Thomas Müller | 2013-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed wrong id when reading checkbox value for force SSL setting | Vincent Petry | 2013-10-23 | 1 | -1/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 3 | -53/+54 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed share dropdown checkbox wrapping | Vincent Petry | 2013-10-23 | 2 | -28/+43 | |
| * | | | | | | | better wording for share input field and share link | Jan-Christoph Borchardt | 2013-10-23 | 1 | -2/+2 | |
| * | | | | | | | Added left padding to notCreatable message | Vincent Petry | 2013-10-23 | 1 | -0/+1 | |
| * | | | | | | | improve wording of permission notice | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 | |
| * | | | | | | | beautify 'you dont have write permissions' notice, fix #2770 | Jan-Christoph Borchardt | 2013-10-20 | 2 | -1/+6 | |
| * | | | | | | | shorten string to 'notify by email', cut 'user' | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 | |
| * | | | | | | | remove hover hide/show stuff for share dropdown to make things more obvious | Jan-Christoph Borchardt | 2013-10-20 | 1 | -26/+3 | |
| * | | | | | | | bold share username | Jan-Christoph Borchardt | 2013-10-20 | 1 | -0/+1 | |
| * | | | | | | | properly align checkboxes to text | Jan-Christoph Borchardt | 2013-10-20 | 1 | -0/+1 | |
| * | | | | | | | more breathing space in share list | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+2 | |
* | | | | | | | | beta 1 | Frank Karlitschek | 2013-10-23 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts | Thomas Müller | 2013-10-23 | 2 | -14/+38 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Catch duplicate insertion errors while scanning files | Vincent Petry | 2013-10-23 | 2 | -14/+38 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | run first getUsersItemShared() with the owner | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 | |
* | | | | | | | update etags for user we haven't checked yet | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 | |
* | | | | | | | keep a list of users we already checked to avoid loops | Bjoern Schiessle | 2013-10-23 | 1 | -3/+3 | |
* | | | | | | | fix infinite loop while updating etags, fix for #4365 | Bjoern Schiessle | 2013-10-23 | 1 | -2/+4 | |
* | | | | | | | Merge branch 'master' of github.com:owncloud/core | Bjoern Schiessle | 2013-10-23 | 2 | -1/+35 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #5478 from owncloud/core-logexceptionstacktrace | Thomas Müller | 2013-10-23 | 2 | -1/+35 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Added $app parameter to logException | Vincent Petry | 2013-10-23 | 2 | -5/+5 | |
| | * | | | | | | Moved logException to OCP\Util class | Vincent Petry | 2013-10-23 | 2 | -29/+34 | |
| | * | | | | | | Expand exception stack trace in log in debug mode | Vincent Petry | 2013-10-22 | 1 | -1/+30 | |
* | | | | | | | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 2 | -3/+38 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5458 from owncloud/fixing-5222-master | VicDeo | 2013-10-23 | 4 | -4/+105 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add missing file header | Thomas Müller | 2013-10-23 | 1 | -0/+6 | |
| * | | | | | | | fixing php 5.3.3 error: | Thomas Müller | 2013-10-22 | 1 | -2/+3 | |
| * | | | | | | | Merge branch 'master' into fixing-5222-master | Thomas Müller | 2013-10-22 | 2 | -12/+11 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | php 5.3 compatibility regarding OC\DB\Connection fixed | Thomas Müller | 2013-10-21 | 3 | -2/+96 | |
* | | | | | | | | | Update CONTRIBUTING.md | Johannes Twittmann | 2013-10-23 | 1 | -1/+4 | |
* | | | | | | | | | Merge pull request #5404 from owncloud/ldap_settings_wizard | blizzz | 2013-10-23 | 20 | -481/+2721 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | LDAP Wizard: proper strings and translations for user and group count text | Arthur Schiwon | 2013-10-23 | 3 | -5/+11 | |
| * | | | | | | | | merge master with resolved conflicts | Arthur Schiwon | 2013-10-23 | 439 | -4410/+8340 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enable | Björn Schießle | 2013-10-23 | 4 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove debug output | Bjoern Schiessle | 2013-10-22 | 1 | -1/+0 | |
| * | | | | | | | | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 3 | -1/+14 | |
| * | | | | | | | | | add post_enable hook if a app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5482 from owncloud/fix_weird_http_namespace | Thomas Müller | 2013-10-23 | 13 | -10/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix namespace for OCP\Appframework\Http | Thomas Tanghus | 2013-10-23 | 13 | -10/+18 | |
* | | | | | | | | | | Merge pull request #5391 from owncloud/undefined-property-in-schema-master | Thomas Müller | 2013-10-22 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |