Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11172 from owncloud/user-ldap-no-bcmath | blizzz | 2014-11-03 | 3 | -54/+57 |
|\ | | | | | Fix ldap convertSID2Str() / Remove BCMath dependency | ||||
| * | user_ldap: Reimplement convertSID2Str() without BCMath dependency. | Andreas Fischer | 2014-11-03 | 3 | -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_folder | Björn Schießle | 2014-11-03 | 3 | -13/+177 |
|\ \ | | | | | | | move versions if a file was renamed in a shared folder | ||||
| * | | don't move versions if only the mount point was renamed | Bjoern Schiessle | 2014-10-31 | 2 | -0/+53 |
| | | | |||||
| * | | Fix typo | Lukas Reschke | 2014-10-29 | 1 | -2/+2 |
| | | | |||||
| * | | get the source path and owner in a pre hook and the target path and owner in a | Bjoern Schiessle | 2014-10-29 | 3 | -13/+124 |
| | | | | | | | | | | | | post hook | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-02 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-02 | 8 | -4/+16 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-01 | 22 | -2/+22 |
| | | | |||||
* | | | test files external amazon s3 storage id migration | Jörn Friedrich Dreyer | 2014-10-31 | 1 | -0/+117 |
| | | | |||||
* | | | fix files_external storage id migration | Jörn Friedrich Dreyer | 2014-10-31 | 1 | -3/+20 |
| | | | |||||
* | | | Merge pull request #11876 from owncloud/remove-pointless-requires | Lukas Reschke | 2014-10-31 | 27 | -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üller | 2014-10-30 | 27 | -110/+45 |
| | | | | | | | | | | | | | | | | take care of this | ||||
* | | | | Merge pull request #11850 from owncloud/fix-11848 | Vincent Petry | 2014-10-31 | 2 | -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 Schiwon | 2014-10-29 | 2 | -14/+10 |
| | | | | | | | | | | | | | | | | | | | | toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-31 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | Merge pull request #11659 from jknockaert/master | Vincent Petry | 2014-10-30 | 1 | -38/+54 |
|\ \ \ \ \ | | | | | | | | | | | | | rework getFileSize | ||||
| * | | | | | initialisation of cipher | jknockaert | 2014-10-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | small fix | jknockaert | 2014-10-20 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | bugfixes | jknockaert | 2014-10-20 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | ok; still some bugs that had to be fixed | jknockaert | 2014-10-20 | 1 | -39/+35 |
| | | | | | | |||||
| * | | | | | small fix | jknockaert | 2014-10-19 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | rework getFileSize | jknockaert | 2014-10-19 | 1 | -28/+45 |
| | | | | | | |||||
* | | | | | | Merge pull request #11867 from owncloud/settings-sidebar-admin | Jan-Christoph Borchardt | 2014-10-30 | 1 | -2/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | introduce sidebar for admin page | ||||
| * | | | | | admin settings: fix LDAP settings header layout | Jan-Christoph Borchardt | 2014-10-30 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | fixing ldap listing in admin sidebar - needs styling review | Thomas Müller | 2014-10-30 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Properly register sharing hooks and proxies | Vincent Petry | 2014-10-30 | 1 | -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 transifex | Jenkins for ownCloud | 2014-10-30 | 58 | -56/+406 |
| | | | | | |||||
* | | | | | Merge pull request #11409 from owncloud/watcher-reuse | Vincent Petry | 2014-10-29 | 2 | -19/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Pass the cached data to the filesystem watcher | ||||
| * | | | | | Fix shared cache getFolderContents | Robin Appelman | 2014-10-24 | 1 | -17/+14 |
| | | | | | | |||||
| * | | | | | also update shared watcher | Robin Appelman | 2014-10-24 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder | Morris Jobke | 2014-10-29 | 3 | -35/+42 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix moving share keys as non-owner to subdir | ||||
| * | | | | | Added encryption test when moving file as non-owner | Vincent Petry | 2014-10-29 | 1 | -2/+15 |
| | | | | | | |||||
| * | | | | | Fix warning with unset extension check | Vincent Petry | 2014-10-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix moving share keys as non-owner to subdir | Vincent Petry | 2014-10-29 | 1 | -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 json | Thomas Müller | 2014-10-29 | 2037 | -20311/+40385 |
| | | | | | |||||
* | | | | | Added OC.L10N namespace with translation functions | Vincent Petry | 2014-10-29 | 8 | -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 transifex | Jenkins for ownCloud | 2014-10-29 | 5 | -0/+14 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-28 | 2 | -3/+18 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-27 | 2 | -3/+37 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-26 | 4 | -16/+55 |
| | | | | |||||
* | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensible | Lukas Reschke | 2014-10-25 | 4 | -19/+39 |
|\ \ \ \ | | | | | | | | | | | Add type hinting to functions | ||||
| * | | | | Add type hinting to functions | Lukas Reschke | 2014-10-24 | 4 | -19/+39 |
| | | | | | | | | | | | | | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-25 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Use function outside of loop | Lukas Reschke | 2014-10-24 | 3 | -6/+8 |
| | | | | | | | | | | | | | | | | Otherwise the function is executed n times which is a lot of overhead | ||||
* | | | | Merge pull request #11758 from owncloud/fix-permissions | Lukas Reschke | 2014-10-24 | 11 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | Make files non executable | ||||
| * | | | Make files non executable | Lukas Reschke | 2014-10-24 | 11 | -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-null | Lukas Reschke | 2014-10-24 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Prevent division by zero | ||||
| * | | | Prevent division by zero | Lukas Reschke | 2014-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11742 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-24 | 5 | -11/+44 |
|/ / / |