Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 35 | -34/+463 |
| | |||||
* | Fixed clicking on the "Home" breadcrumb in the trash app | Vincent Petry | 2013-10-28 | 1 | -5/+0 |
| | | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 52 | -54/+173 |
| | |||||
* | Fix double not in newfile/newfolder language. | Andreas Fischer | 2013-10-27 | 2 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 188 | -1231/+1207 |
| | |||||
* | Port PR #5457 to master | Arthur Schiwon | 2013-10-25 | 1 | -4/+11 |
| | |||||
* | make sure the shared ldap connection is rebound to the configured user after ↵ | Donald Buczek | 2013-10-25 | 1 | -1/+3 |
| | | | | being used for password checking. | ||||
* | Merge pull request #5532 from owncloud/ldap_fixes | Thomas Müller | 2013-10-24 | 3 | -12/+45 |
|\ | | | | | Ldap fixes | ||||
| * | LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 | Arthur Schiwon | 2013-10-24 | 1 | -0/+15 |
| | | |||||
| * | LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 | Arthur Schiwon | 2013-10-24 | 1 | -10/+28 |
| | | |||||
| * | LDAP: when multiline values are passed as array, do not try to preg_split ↵ | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | | | | | | | them. Fixes #5521 | ||||
| * | typo, fixes #5517 | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 1 | -0/+1 |
|\ \ | |/ |/| | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | ||||
| * | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #5477 from ↵ | Thomas Müller | 2013-10-23 | 7 | -457/+579 |
|\ \ | | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename | ||||
| * | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| | | | |||||
| * | | Merge branch 'master' into ↵ | Jörn Friedrich Dreyer | 2013-10-23 | 8 | -17/+50 |
| |\| | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| * | | use a more descriptive error message when the user tries to create '/Shared' | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -3/+3 |
| | | | |||||
| * | | cleanup array value assignment | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -8/+4 |
| | | | |||||
| * | | cleanup precondition checking when creating new files / folders | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -19/+50 |
| | | | | | | | | | | | | | | | | | | - use i18n - use trim when checking for empty file / folder name - use more verbose error descriptions | ||||
| * | | use correct filename in error result json | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into ↵ | Thomas Müller | 2013-10-22 | 1 | -3/+29 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| * | | | fixing js syntax error | Thomas Müller | 2013-10-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | fixing undefined variable $newname | Thomas Müller | 2013-10-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 6 | -435/+523 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files | ||||
* | | | | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Share improvements | ||||
| * | | | | 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 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | |||||
* | | | | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 2 | -3/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php | ||||
* | | | | | 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 | 31 | -49/+351 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enable | Björn Schießle | 2013-10-23 | 3 | -1/+13 |
| |\ \ \ \ | | | | | | | | | | | | | Encryption set init status on enable | ||||
| | * | | | | 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 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #5310 from owncloud/hide_filestable-header_when_empty | Christopher Schäpers | 2013-10-22 | 3 | -10/+24 |
| |\ \ \ \ | | | | | | | | | | | | | Hide files list header, when theres no files to see | ||||
| | * | | | | Fixed empty content logic | Vincent Petry | 2013-10-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove obsolete code that used another approach for hiding emptycontent - Fixed logic for the showing of the empty content message | ||||
| | * | | | | Fix mind-boggling emptycontent logic | kondou | 2013-10-21 | 3 | -6/+8 |
| | | | | | | |||||
| | * | | | | Fix shared folder still showing fileheader | kondou | 2013-10-21 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Improve updateEmptyContent logic | kondou | 2013-10-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Create FileList.updateEmptyContent() and fix not showing emptycontent after ↵ | kondou | 2013-10-20 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | deletion | ||||
| | * | | | | Hide files list header, when theres no files to see | kondou | 2013-10-12 | 3 | -5/+12 |
| | | | | | | |||||
| * | | | | | Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle | Thomas Müller | 2013-10-22 | 1 | -2/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed ugly white space while loading file thumbnail | ||||
| | * | | | | | Fixed ugly white space while loading file thumbnail | Vincent Petry | 2013-10-22 | 1 | -2/+10 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview images are now pre-loaded before being set on the file element. This fixes #5135 and prevents a white space to be displayed while the thumbnails is being loaded. | ||||
| * | | | | | Merge pull request #5467 from owncloud/fixing-5063-master | Thomas Müller | 2013-10-22 | 1 | -3/+3 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | display the original file name - this will change in case of renames | ||||
| | * | | | | display the original file name - this will change in case of renames | Thomas Müller | 2013-10-22 | 1 | -3/+3 |
| | |/ / / |