summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)Adam Williamson2014-11-064-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 tokenAdam Williamson2014-11-061-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 workAdam Williamson2014-11-061-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-betaAdam Williamson2014-11-0653-6160/+10171
|
* Migrate Google Drive storage app to v1.0.0 of the client libraryAdam Williamson2014-11-062-25/+25
|
* Fix sharing testsRobin Appelman2014-11-063-2/+15
|
* Setup shared mounts for the correct user when setting up the filesystem for ↵Robin Appelman2014-11-063-6/+33
| | | | the non-logged in user
* Dont make real users in testsRobin Appelman2014-11-061-3/+5
|
* check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-1/+15
|
* manage select2 via bowerMorris Jobke2014-11-061-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-0678-280/+86
|
* unbold labels and foldersJan-Christoph Borchardt2014-11-051-1/+0
|
* Merge pull request #11962 from owncloud/fix-server-sharing-stringsThomas Müller2014-11-051-3/+11
|\ | | | | adjust strings - fixed #11930
| * adjust strings - fixed #11930Thomas Müller2014-11-051-3/+11
| |
* | Merge pull request #11853 from owncloud/close-session-for-trashbinVincent Petry2014-11-055-0/+6
|\ \ | |/ |/| Close session for files_trashbin
| * Close session for files_trashbinLukas Reschke2014-10-295-0/+6
| | | | | | | | When restoring huge folders the interface will be unresponsive otherwise
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-054-0/+20
| |
* | Store curl error message directlyVincent Petry2014-11-041-5/+2
| |
* | Check for cert bundle existence before using itVincent Petry2014-11-041-1/+11
| |
* | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolderVincent Petry2014-11-041-1/+1
|\ \ | | | | | | Only rescan trash folder when checking deleted versions
| * | Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-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_cliblizzz2014-11-043-3/+45
|\ \ \ | | | | | | | | Add a CLI command that deletes an LDAP config
| * | | Add a CLI command that deletes an LDAP configMartin Konrad2014-09-303-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 Jobke2014-11-041-7/+7
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-044-0/+12
| | |
* | | 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
| | | | | | |