summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-2935-34/+463
|
* Fixed clicking on the "Home" breadcrumb in the trash appVincent Petry2013-10-281-5/+0
| | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app.
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-2752-54/+173
|
* Fix double not in newfile/newfolder language.Andreas Fischer2013-10-272-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-27188-1231/+1207
|
* Port PR #5457 to masterArthur Schiwon2013-10-251-4/+11
|
* make sure the shared ldap connection is rebound to the configured user after ↵Donald Buczek2013-10-251-1/+3
| | | | being used for password checking.
* Merge pull request #5532 from owncloud/ldap_fixesThomas Müller2013-10-243-12/+45
|\ | | | | Ldap fixes
| * LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518Arthur Schiwon2013-10-241-0/+15
| |
| * LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520Arthur Schiwon2013-10-241-10/+28
| |
| * LDAP: when multiline values are passed as array, do not try to preg_split ↵Arthur Schiwon2013-10-241-1/+1
| | | | | | | | them. Fixes #5521
| * typo, fixes #5517Arthur Schiwon2013-10-241-1/+1
| |
* | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-241-0/+1
|\ \ | |/ |/| introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
| * introducing new dav property {xmlns:oc="http://owncloud.org/ns}idThomas Müller2013-10-231-0/+1
| |
* | Merge pull request #5477 from ↵Thomas Müller2013-10-237-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 translationsJörn Friedrich Dreyer2013-10-232-10/+10
| | |
| * | Merge branch 'master' into ↵Jörn Friedrich Dreyer2013-10-238-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 Dreyer2013-10-232-3/+3
| | |
| * | cleanup array value assignmentJörn Friedrich Dreyer2013-10-231-8/+4
| | |
| * | cleanup precondition checking when creating new files / foldersJörn Friedrich Dreyer2013-10-232-19/+50
| | | | | | | | | | | | | | | | | | - use i18n - use trim when checking for empty file / folder name - use more verbose error descriptions
| * | use correct filename in error result jsonJörn Friedrich Dreyer2013-10-231-1/+1
| | |
| * | Merge branch 'master' into ↵Thomas Müller2013-10-221-3/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js
| * | | fixing js syntax errorThomas Müller2013-10-221-2/+2
| | | |
| * | | fixing undefined variable $newnameThomas Müller2013-10-221-1/+1
| | | |
| * | | adding PHPDoc commentsThomas Müller2013-10-221-0/+7
| | | |
| * | | prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-226-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-improvementsThomas Müller2013-10-231-1/+1
|\ \ \ \ | | | | | | | | | | Share improvements
| * | | | improve wording of permission noticeJan-Christoph Borchardt2013-10-201-1/+1
| | | | |
| * | | | beautify 'you dont have write permissions' notice, fix #2770Jan-Christoph Borchardt2013-10-201-1/+1
| | | | |
* | | | | run first getUsersItemShared() with the ownerBjoern Schiessle2013-10-231-1/+1
| | | | |
* | | | | update etags for user we haven't checked yetBjoern Schiessle2013-10-231-1/+1
| | | | |
* | | | | keep a list of users we already checked to avoid loopsBjoern Schiessle2013-10-231-3/+3
| | | | |
* | | | | fix infinite loop while updating etags, fix for #4365Bjoern Schiessle2013-10-231-2/+4
| | | | |
* | | | | files_encryption: Fix getFileSize()Markus Goetz2013-10-232-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 textArthur Schiwon2013-10-233-5/+11
| | | | |
* | | | | merge master with resolved conflictsArthur Schiwon2013-10-2331-49/+351
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #5472 from owncloud/enc_init_status_on_enableBjörn Schießle2013-10-233-1/+13
| |\ \ \ \ | | | | | | | | | | | | Encryption set init status on enable
| | * | | | remove debug outputBjoern Schiessle2013-10-221-1/+0
| | | | | |
| | * | | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-223-1/+14
| | | |/ / | | |/| |
| * | | | Merge pull request #5310 from owncloud/hide_filestable-header_when_emptyChristopher Schäpers2013-10-223-10/+24
| |\ \ \ \ | | | | | | | | | | | | Hide files list header, when theres no files to see
| | * | | | Fixed empty content logicVincent Petry2013-10-212-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 logickondou2013-10-213-6/+8
| | | | | |
| | * | | | Fix shared folder still showing fileheaderkondou2013-10-212-3/+3
| | | | | |
| | * | | | Improve updateEmptyContent logickondou2013-10-201-1/+1
| | | | | |
| | * | | | Create FileList.updateEmptyContent() and fix not showing emptycontent after ↵kondou2013-10-201-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | deletion
| | * | | | Hide files list header, when theres no files to seekondou2013-10-123-5/+12
| | | | | |
| * | | | | Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyleThomas Müller2013-10-221-2/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixed ugly white space while loading file thumbnail
| | * | | | | Fixed ugly white space while loading file thumbnailVincent Petry2013-10-221-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-masterThomas Müller2013-10-221-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 renamesThomas Müller2013-10-221-3/+3
| | |/ / /