summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | |/ / | |/| |
| | * | unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| | * | reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| | * | Added direct link in public share pageVincent Petry2013-10-183-0/+11
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-199-0/+54
| * | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @...Arthur Schiwon2013-10-191-1/+1
| |/ /
| * | Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-182-0/+46
| |\ \
| | * | Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-182-0/+46
| * | | Merge pull request #5412 from owncloud/fix_5141Björn Schießle2013-10-181-5/+5
| |\ \ \
| | * | | give getSelectedFilesTrash() a unique name for the trash.js to avoid confusio...Bjoern Schiessle2013-10-181-5/+5
| * | | | Merge pull request #5411 from owncloud/ocs_share_api_cleanupVincent Petry2013-10-181-13/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | filter duplicates directly in the sql queryBjoern Schiessle2013-10-181-13/+4
| | |/ /
| * / / Disable versions app JS in public modeVincent Petry2013-10-171-0/+7
| |/ /
| * | Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
| |\ \
| | * | split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| | * | add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| | * | adjust testsBjoern Schiessle2013-10-172-4/+3
| | * | new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-175-0/+8
* | | | LDAP Wizard: l10n improvementsArthur Schiwon2013-10-214-6/+7
* | | | Don't set Base User and Base Group when Base DN was detected, would case prob...Arthur Schiwon2013-10-172-5/+3
* | | | Fix Spinner issues with Base DN fieldArthur Schiwon2013-10-171-2/+11
* | | | resolve merge conflicts from rebaseArthur Schiwon2013-10-172-46/+32