Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | only set the values we need and make sure that we write the file info for both | Bjoern Schiessle | 2014-11-07 | 1 | -3/+7 | |
* | | | | | | | also try to get file info from part file | Bjoern Schiessle | 2014-11-07 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_... | Lukas Reschke | 2014-11-07 | 4 | -2/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 3 | -0/+14 | |
| * | | | | | | still try to encrypt files, even if the session is not initialized. The strea... | Bjoern Schiessle | 2014-11-04 | 1 | -2/+1 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-07 | 100 | -100/+80 | |
* | | | | | | | Fix sharing tests | Robin Appelman | 2014-11-06 | 3 | -2/+15 | |
* | | | | | | | Setup shared mounts for the correct user when setting up the filesystem for t... | Robin Appelman | 2014-11-06 | 3 | -6/+33 | |
* | | | | | | | Dont make real users in tests | Robin Appelman | 2014-11-06 | 1 | -3/+5 | |
* | | | | | | | check if the provided password is really the current log-in password | Bjoern Schiessle | 2014-11-06 | 1 | -1/+15 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | manage select2 via bower | Morris Jobke | 2014-11-06 | 1 | -2/+2 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-06 | 78 | -280/+86 | |
* | | | | | | unbold labels and folders | Jan-Christoph Borchardt | 2014-11-05 | 1 | -1/+0 | |
* | | | | | | Merge pull request #11962 from owncloud/fix-server-sharing-strings | Thomas Müller | 2014-11-05 | 1 | -3/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | adjust strings - fixed #11930 | Thomas Müller | 2014-11-05 | 1 | -3/+11 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #11853 from owncloud/close-session-for-trashbin | Vincent Petry | 2014-11-05 | 5 | -0/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Close session for files_trashbin | Lukas Reschke | 2014-10-29 | 5 | -0/+6 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-05 | 4 | -0/+20 | |
* | | | | | | Store curl error message directly | Vincent Petry | 2014-11-04 | 1 | -5/+2 | |
* | | | | | | Check for cert bundle existence before using it | Vincent Petry | 2014-11-04 | 1 | -1/+11 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder | Vincent Petry | 2014-11-04 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Only rescan trash folder when checking deleted versions | Vincent Petry | 2014-11-04 | 1 | -1/+1 | |
* | | | | | | Merge pull request #11362 from mark0n/rm_ldap_conf_cli | blizzz | 2014-11-04 | 3 | -3/+45 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a CLI command that deletes an LDAP config | Martin Konrad | 2014-09-30 | 3 | -3/+45 | |
* | | | | | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null) | Morris Jobke | 2014-11-04 | 1 | -7/+7 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-04 | 4 | -0/+12 | |
* | | | | | | Merge pull request #11172 from owncloud/user-ldap-no-bcmath | blizzz | 2014-11-03 | 3 | -54/+57 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | user_ldap: Reimplement convertSID2Str() without BCMath dependency. | Andreas Fischer | 2014-11-03 | 3 | -54/+57 | |
* | | | | | | | Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder | Björn Schießle | 2014-11-03 | 3 | -13/+177 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
* | | | | | | | | [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 to t... | Thomas Müller | 2014-10-30 | 27 | -110/+45 | |
* | | | | | | | 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 toggling... | Arthur Schiwon | 2014-10-29 | 2 | -14/+10 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | [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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |