summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Add "Global Auth" option to external storageRobin Appelman2016-06-219-3/+282
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2170-153/+608
|\
| * Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| * Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
| * Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
| |\
| | * Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| * | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-7/+87
| |\ \
| | * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| | * | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
| | * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-172-6/+29
| * | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
| |\ \ \
| | * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| * | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
| |\ \ \ \
| | * | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
| * | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
| |\ \ \ \ \
| | * | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
| |\ \ \ \ \
| | * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | | |_|_|/ | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2010-2/+56
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
| |/ / / /
| * / / / Changed global variable to localSergio Bertolín2016-06-171-1/+1
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1718-4/+116
| * | | Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-165-52/+39
| |\ \ \
| | * | | update icewind/streams to 0.4.1Robin Appelman2016-06-155-52/+39
| | | |/ | | |/|
| * | | Move birthday calendar generation to a live migration job (#25135)Thomas Müller2016-06-165-66/+84
| * | | Merge pull request #25104 from owncloud/dropbox-catchratelimitVincent Petry2016-06-161-0/+5
| |\ \ \
| | * | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-141-0/+5
| * | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolderVincent Petry2016-06-162-1/+43
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| | |/ /
| * | | Merge pull request #25082 from owncloud/fix-sessionless-clientsVincent Petry2016-06-152-14/+6
| |\ \ \
| | * | | create session token only for clients that support cookiesChristoph Wurst2016-06-131-12/+5
| | * | | create session token on all APIsChristoph Wurst2016-06-131-2/+1
| * | | | Update start-swift-ceph.sh (#25109)Jürgen Weigert2016-06-151-0/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-158-2/+10
| | |/ / | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-146-0/+56
* | | | no need to mention ownCloud explicitelyBjoern Schiessle2016-06-202-4/+4
* | | | Merge pull request #165 from nextcloud/fix-owncloud-references-federatedBjörn Schießle2016-06-2078-218/+218
|\ \ \ \
| * | | | s/ownCloud/NextcloudBjoern Schiessle2016-06-2078-218/+218
* | | | | Merge pull request #162 from nextcloud/fix-owncloud-referenceMorris Jobke2016-06-2079-171/+171
|\ \ \ \ \
| * | | | | fix more stringsMorris Jobke2016-06-201-1/+1
| * | | | | fix more stringsMorris Jobke2016-06-202-2/+2
| * | | | | fix federation stringsMorris Jobke2016-06-206-12/+12
| * | | | | fix l10nMorris Jobke2016-06-2044-44/+44
| * | | | | fix l10nMorris Jobke2016-06-2064-64/+64
| * | | | | fix l10nMorris Jobke2016-06-2044-44/+44
| * | | | | fix stringsMorris Jobke2016-06-204-4/+4
| |/ / / /
* / / / / don't try to log the currently logged in user, this fails on cronjobs. The us...Bjoern Schiessle2016-06-202-31/+5
|/ / / /
* | | | Fix failing JS unit testsMorris Jobke2016-06-161-4/+2
* | | | Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-155-89/+277
|\ \ \ \
| * | | | store icons in classVincent Chan2016-06-152-6/+5