summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5532 from owncloud/ldap_fixesThomas Müller2013-10-243-12/+45
|\
| * 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 the...Arthur Schiwon2013-10-241-1/+1
| * 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}idThomas Müller2013-10-231-0/+1
* | Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming...Thomas Müller2013-10-237-457/+579
|\ \
| * | fix translationsJörn Friedrich Dreyer2013-10-232-10/+10
| * | Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist...Jörn Friedrich Dreyer2013-10-238-17/+50
| |\|
| * | 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 correct filename in error result jsonJörn Friedrich Dreyer2013-10-231-1/+1
| * | Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist...Thomas Müller2013-10-221-3/+29
| |\ \
| * | | 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
* | | | Merge pull request #5435 from owncloud/share-improvementsThomas Müller2013-10-231-1/+1
|\ \ \ \
| * | | | 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
* | | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | Fixed empty content logicVincent Petry2013-10-212-2/+2
| | * | | | 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 d...kondou2013-10-201-5/+10
| | * | | | 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 thumbnailVincent Petry2013-10-221-2/+10
| | | |/ / / | | |/| | |
| * | | | | 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 renamesThomas Müller2013-10-221-3/+3
| | |/ / /
| * / / / Added FileList.setViewerMode to hide controlsVincent Petry2013-10-221-0/+25
| |/ / /
| * | | Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-221-1/+1
| |\ \ \
| | * | | introduce link_to_docs() and migrate linksThomas Müller2013-10-211-1/+1
| * | | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfixVincent Petry2013-10-212-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed share with link checkbox missing as regular userVincent Petry2013-10-212-0/+3
| | | |/ | | |/|
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-211-0/+2
| * | | Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
| |\ \ \ | | |/ / | |/| |