summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11172 from owncloud/user-ldap-no-bcmathblizzz2014-11-033-54/+57
|\ | | | | Fix ldap convertSID2Str() / Remove BCMath dependency
| * user_ldap: Reimplement convertSID2Str() without BCMath dependency.Andreas Fischer2014-11-033-54/+57
| | | | | | | | | | Also explicitly format sub-id integers as unsigned, which is required for 32-bit systems.
* | Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folderBjörn Schießle2014-11-033-13/+177
|\ \ | | | | | | move versions if a file was renamed in a shared folder
| * | don't move versions if only the mount point was renamedBjoern Schiessle2014-10-312-0/+53
| | |
| * | Fix typoLukas Reschke2014-10-291-2/+2
| | |
| * | get the source path and owner in a pre hook and the target path and owner in aBjoern Schiessle2014-10-293-13/+124
| | | | | | | | | | | | post hook
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-022-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-028-4/+16
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0122-2/+22
| | |
* | | test files external amazon s3 storage id migrationJörn Friedrich Dreyer2014-10-311-0/+117
| | |
* | | fix files_external storage id migrationJörn Friedrich Dreyer2014-10-311-3/+20
| | |
* | | Merge pull request #11876 from owncloud/remove-pointless-requiresLukas Reschke2014-10-3127-110/+45
|\ \ \ | | | | | | | | remove unnecessary require calls - the ownCloud class loader is supposed...
| * | | remove unnecessary require calls - the ownCloud class loader is supposed to ↵Thomas Müller2014-10-3027-110/+45
| | | | | | | | | | | | | | | | take care of this
* | | | Merge pull request #11850 from owncloud/fix-11848Vincent Petry2014-10-312-14/+10
|\ \ \ \ | | | | | | | | | | on xp'ed mode and switching configurations: save raw mode instead of tog...
| * | | | on xp'ed mode and switching configurations: save raw mode instead of ↵Arthur Schiwon2014-10-292-14/+10
| | | | | | | | | | | | | | | | | | | | toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-312-2/+4
| | | | |
* | | | | Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\ \ \ \ \ | | | | | | | | | | | | rework getFileSize
| * | | | | initialisation of cipherjknockaert2014-10-281-1/+1
| | | | | |
| * | | | | small fixjknockaert2014-10-201-0/+1
| | | | | |
| * | | | | bugfixesjknockaert2014-10-201-5/+6
| | | | | |
| * | | | | ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| | | | | |
| * | | | | small fixjknockaert2014-10-191-1/+2
| | | | | |
| * | | | | rework getFileSizejknockaert2014-10-191-28/+45
| | | | | |
* | | | | | Merge pull request #11867 from owncloud/settings-sidebar-adminJan-Christoph Borchardt2014-10-301-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | introduce sidebar for admin page
| * | | | | admin settings: fix LDAP settings header layoutJan-Christoph Borchardt2014-10-301-2/+3
| | | | | |
| * | | | | fixing ldap listing in admin sidebar - needs styling reviewThomas Müller2014-10-301-2/+3
| | | | | |
* | | | | | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix failing tests when shares weren't cleant up on delete due to missing hooks. Added login for user1 in setUp().
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-3058-56/+406
| | | | |
* | | | | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-292-19/+18
|\ \ \ \ \ | | | | | | | | | | | | Pass the cached data to the filesystem watcher
| * | | | | Fix shared cache getFolderContentsRobin Appelman2014-10-241-17/+14
| | | | | |
| * | | | | also update shared watcherRobin Appelman2014-10-241-2/+4
| | | | | |
* | | | | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-293-35/+42
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix moving share keys as non-owner to subdir
| * | | | | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| | | | | |
| * | | | | Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
| | | | | |
| * | | | | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix gathers the share keys BEFORE a file is moved to make sure that findShareKeys() is able to find all relevant keys when the file still exists. After the move/copy operation the keys are moved/copied to the target dir. Also: refactored preRename and preCopy into a single function to avoid duplicate code.
* | | | | update all translation files to js and jsonThomas Müller2014-10-292037-20311/+40385
| | | | |
* | | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-298-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-295-0/+14
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-282-3/+18
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-272-3/+37
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-264-16/+55
| | | |
* | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-254-19/+39
|\ \ \ \ | | | | | | | | | | Add type hinting to functions
| * | | | Add type hinting to functionsLukas Reschke2014-10-244-19/+39
| | | | | | | | | | | | | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-251-0/+4
|/ / / /
* | | | Use function outside of loopLukas Reschke2014-10-243-6/+8
| | | | | | | | | | | | | | | | Otherwise the function is executed n times which is a lot of overhead
* | | | Merge pull request #11758 from owncloud/fix-permissionsLukas Reschke2014-10-2411-0/+0
|\ \ \ \ | |/ / / |/| | | Make files non executable
| * | | Make files non executableLukas Reschke2014-10-2411-0/+0
| | | | | | | | | | | | | | | | There is not much sense in having these files marked executable, we should avoid that.
* | | | Merge pull request #11754 from owncloud/fix-division-nullLukas Reschke2014-10-241-1/+1
|\ \ \ \ | |/ / / |/| | | Prevent division by zero
| * | | Prevent division by zeroLukas Reschke2014-10-241-1/+1
| | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11742
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-245-11/+44
|/ / /