Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix) | Adam Williamson | 2014-11-06 | 4 | -11/+38 |
| | | | | | | | This is the upstream commit that merged my query separator fix. It's slightly after the 1.0.3-beta tag. I eyeballed the other post 1.0.3-beta changes and none of them looks like any kind of problem, so we may as well just use this upstream state. | ||||
* | google drive: set access type to 'offline' when requesting token | Adam Williamson | 2014-11-06 | 1 | -0/+1 |
| | | | | | | We need to do this in order to be able to refresh the access token without prompting the user for their credentials every hour. This was the default in 0.6 of the Google library, but needs to be explicitly specified in 1.0. | ||||
* | fix a bug in google-api-php-client: generates an auth url that doesn't work | Adam Williamson | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | Submitted upstream as https://github.com/google/google-api-php-client/issues/76 Google's php lib has a function to generate a URL for OAuth2 authentication. It uses http_build_query() to generate the query part of the URL, and in PHP 5.3 or later, this uses an encoded ampersand - & - as the query separator, not a raw one. However, Google's OAuth server apparently can't handle encoded ampersands as separators and so it fails. This patch explicitly sets a raw ampersand as the separator. If Google decides to fix their OAuth server instead of merging this patch into google-api-php- client, we can drop this patch as soon as that happens. | ||||
* | files_external/3rdparty: update google-api-php-client to 1.0.2-beta | Adam Williamson | 2014-11-06 | 53 | -6160/+10171 |
| | |||||
* | Migrate Google Drive storage app to v1.0.0 of the client library | Adam Williamson | 2014-11-06 | 2 | -25/+25 |
| | |||||
* | Fix sharing tests | Robin Appelman | 2014-11-06 | 3 | -2/+15 |
| | |||||
* | Setup shared mounts for the correct user when setting up the filesystem for ↵ | Robin Appelman | 2014-11-06 | 3 | -6/+33 |
| | | | | the non-logged in user | ||||
* | 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 | ||||
| * | 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 | ||||
| * | Close session for files_trashbin | Lukas Reschke | 2014-10-29 | 5 | -0/+6 |
| | | | | | | | | When restoring huge folders the interface will be unresponsive otherwise | ||||
* | | [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 | ||||
| * | | Only rescan trash folder when checking deleted versions | Vincent Petry | 2014-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This fix prevents the file scanner to rescan the WHOLE storage and reset the etags by mistake. | ||||
* | | | 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 | ||||
| * | | | Add a CLI command that deletes an LDAP config | Martin Konrad | 2014-09-30 | 3 | -3/+45 |
| | | | | | | | | | | | | | | | | | | | | With this change LDAP configurations can be managed completely from the command line. | ||||
* | | | | 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 |
|\ \ \ | | | | | | | | | 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 |
| | | | | | | |