summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9721 from owncloud/enc_define_type_in_pre_hookBjörn Schießle2014-07-291-4/+7
|\
| * define type in pre hookBjoern Schiessle2014-07-181-4/+7
* | Merge pull request #9951 from owncloud/enc_inproved_error_messagesBjörn Schießle2014-07-293-3/+13
|\ \
| * | show a warning in the personal settings and admin settins if the encyption ke...Bjoern Schiessle2014-07-283-3/+13
* | | Merge pull request #9983 from owncloud/sharing_add_unshare_to_overviewBjörn Schießle2014-07-291-0/+3
|\ \ \
| * | | update attributes for share with user list, file should always have delete pe...Bjoern Schiessle2014-07-281-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-294-3/+17
|/ / /
* | | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-282-3/+100
|\ \ \
| * | | adjust error codeBjoern Schiessle2014-07-281-2/+2
| * | | add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-2/+99
* | | | Merge pull request #9585 from owncloud/design-fix-public-footerJan-Christoph Borchardt2014-07-281-16/+0
|\ \ \ \
| * | | | move public page footer rules from sharing app to core so it is used by other...Jan-Christoph Borchardt2014-07-071-16/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2810-3/+47
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-278-4/+24
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2611-12/+39
| |_|/ / |/| | |
* | | | Merge pull request #9867 from owncloud/fix_sharing_updateBjörn Schießle2014-07-252-2/+5
|\ \ \ \
| * | | | fix sharing update, add proper escapingBjoern Schiessle2014-07-242-2/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-252-2/+7
|/ / / /
* | | | Merge pull request #9703 from owncloud/files-preview-animateMorris Jobke2014-07-242-3/+4
|\ \ \ \
| * | | | Fix preview animation on uploadingVincent Petry2014-07-172-3/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-243-1/+9
* | | | | Fix remote share when remote server is installed at the rootRobin Appelman2014-07-231-2/+7
| |_|/ / |/| | |
* | | | Merge pull request #9683 from owncloud/fix_#8819_sortingVincent Petry2014-07-223-29/+58
|\ \ \ \
| * | | | Sorting triangles pointing up for ascending, down for descendingRemco Brenninkmeijer2014-07-211-2/+2
| * | | | Before I get spanked ;)Remco Brenninkmeijer2014-07-171-1/+1
| * | | | Adjusted tests for new default sortingRemco Brenninkmeijer2014-07-171-19/+32
| * | | | While busy cleaning, also removed extra entersRemco Brenninkmeijer2014-07-172-3/+0
| * | | | Corrected (Netbeans?) inserted spacesRemco Brenninkmeijer2014-07-172-17/+17
| * | | | Fixed comments from PVince81Remco Brenninkmeijer2014-07-161-6/+5
| * | | | Cleanup of unnecesary additionRemco Brenninkmeijer2014-07-161-1/+1
| * | | | Show sorting icons when hovering overRemco Brenninkmeijer2014-07-162-12/+27
| * | | | Changed default sorting except for names.Remco Brenninkmeijer2014-07-081-1/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-222-0/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-212-1/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-207-3/+40
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-198-10/+172
* | | | | Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connectionVincent Petry2014-07-181-3/+9
|\ \ \ \ \
| * | | | | Pass existing Net_SFTP object into Net_SFTP_Stream.Andreas Fischer2014-07-181-3/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #9576 from owncloud/bcmath-checkblizzz2014-07-182-0/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make tests deal with missing bcmathArthur Schiwon2014-07-112-1/+30
| * | | | warn and continue gracefully if bcmath is not installedArthur Schiwon2014-07-101-0/+6
* | | | | Merge pull request #9718 from owncloud/sftp-early-loginblizzz2014-07-181-5/+5
|\ \ \ \ \
| * | | | | login() must be called after getServerPublicHostKey().Andreas Fischer2014-07-121-5/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-188-20/+86
* | | | | | check that the file proxies are enabled after each testBjoern Schiessle2014-07-171-0/+2
* | | | | | update keys recursively if a folder was movedBjoern Schiessle2014-07-172-26/+81
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1767-83/+190
* | | | | | Merge pull request #9653 from owncloud/fix-9590Vincent Petry2014-07-163-14/+27
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix CSS coding styleMorris Jobke2014-07-161-5/+6
| * | | | | Fix #9590. Fix #9612.Stephane V2014-07-153-14/+26