summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Properly return 304Roeland Jago Douma2015-09-012-1/+9
* | | | | Merge pull request #18396 from owncloud/autoloader-check-pathLukas Reschke2015-09-015-42/+86
|\ \ \ \ \
| * | | | | verify the path in the autoloaderRobin Appelman2015-09-015-42/+86
* | | | | | Merge pull request #12088 from AdamWill/google-opendir-rootVincent Petry2015-09-011-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | google: drop duplicate path trim from opendir()Adam Williamson2014-11-101-2/+0
* | | | | | Merge pull request #18631 from owncloud/more_ocs_share_dataVincent Petry2015-09-012-22/+120
|\ \ \ \ \ \
| * | | | | | Return permissions and expiration on create share responsesRoeland Jago Douma2015-08-302-22/+120
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #18635 from owncloud/stickify-files-and-sharing-notificati...Vincent Petry2015-08-311-1/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Sticky the notification types of files and sharingJoas Schilling2015-08-281-1/+13
* | | | | | Merge pull request #18715 from owncloud/language-code-englishMorris Jobke2015-08-311-0/+1
|\ \ \ \ \ \
| * | | | | | add english language code translationMorris Jobke2015-08-311-0/+1
|/ / / / / /
* | | | | | Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurableVincent Petry2015-08-3114-44/+939
|\ \ \ \ \ \
| * | | | | | don't read certificates if ownCloud is not installedBjoern Schiessle2015-08-304-4/+22
| * | | | | | make system root of key storage configurableBjoern Schiessle2015-08-3011-42/+919
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18702 from owncloud/ext-emptymountRobin Appelman2015-08-313-2/+35
|\ \ \ \ \ \
| * | | | | | Unit test storages with an empty mount pointRobin McCorkell2015-08-312-0/+33
| * | | | | | Allow an empty mount pointRobin McCorkell2015-08-311-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #18691 from owncloud/request-no-readMorris Jobke2015-08-311-34/+49
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Decode request content only on getContentRobin McCorkell2015-08-311-34/+49
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-318-0/+30
* | | | | | Merge pull request #18671 from owncloud/cleanup-sidebar-semanticsMorris Jobke2015-08-314-23/+36
|\ \ \ \ \ \
| * | | | | | Fixes failing testsRaghu Nayyar2015-08-311-4/+4
| * | | | | | Removes unecessary divs and adds max width to longer names.Raghu Nayyar2015-08-303-19/+32
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18689 from owncloud/app-navigation-lineRaghu Nayyar2015-08-302-0/+6
|\ \ \ \ \ \
| * | | | | | Introduce small line for navigation sidebarMorris Jobke2015-08-302-0/+6
|/ / / / / /
* | | | | | Merge pull request #10149 from owncloud/storage-wrapper-checkMorris Jobke2015-08-301-0/+3
|\ \ \ \ \ \
| * | | | | | Check result of storage wrappersRobin Appelman2015-08-301-0/+3
* | | | | | | Merge pull request #18681 from owncloud/apps-unit-testRaghu Nayyar2015-08-301-0/+48
|\ \ \ \ \ \ \
| * | | | | | | Add apps unit testVincent Petry2015-08-301-0/+48
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #18556 from owncloud/fix_password_resetBjörn Schießle2015-08-305-12/+56
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | return false if private key is not validBjoern Schiessle2015-08-302-1/+16
| * | | | | | use login name for password resetBjoern Schiessle2015-08-303-11/+40
|/ / / / / /
* | | | | | Merge pull request #18651 from owncloud/ocs_share_create_with_expireVincent Petry2015-08-303-3/+198
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Actually validate the expire date on shareRoeland Jago Douma2015-08-303-5/+110
| * | | | | Allow to directly set the expireDate on a new (link)shareRoeland Jago Douma2015-08-292-2/+92
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-3010-2/+24
* | | | | | Merge pull request #14856 from rullzer/remote_avatarsMorris Jobke2015-08-292-13/+22
|\ \ \ \ \ \
| * | | | | | Allow remote avatarsRoeland Jago Douma2015-08-292-13/+22
* | | | | | | Merge pull request #18620 from owncloud/add-public-interface-for-factoryVincent Petry2015-08-296-17/+64
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add since tagJoas Schilling2015-08-281-0/+4
| * | | | | | Add a test for the interfaceJoas Schilling2015-08-281-0/+1
| * | | | | | Deprecate OC_L10N::get()Joas Schilling2015-08-282-7/+4
| * | | | | | Add a public interface for the language factory so apps can use itJoas Schilling2015-08-273-10/+55
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #18393 from owncloud/objectstore-check-classLukas Reschke2015-08-291-0/+3
|\ \ \ \ \ \
| * | | | | | make sure we actually have an object storeRobin Appelman2015-08-281-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-29112-0/+236
* | | | | | Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debugJoas Schilling2015-08-281-22/+22
|\ \ \ \ \ \
| * | | | | | Change log level of debugging logs to debugJoas Schilling2015-08-241-22/+22
* | | | | | | Merge pull request #18423 from owncloud/occ_encrypt_allBjörn Schießle2015-08-2815-84/+1101
|\ \ \ \ \ \ \
| * | | | | | | copy always file by file to encrypt/decrypt it if neededBjoern Schiessle2015-08-262-82/+23