summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3156 from ↵FlorinPeter2013-04-301-86/+309
|\ | | | | | | | | owncloud/trashbin_for_encryption_keys_against_master Trashbin for encryption keys now against master
| * delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| | | | | | | | fix restore of the same file name
| * added handling for share-keysFlorin Peter2013-04-281-13/+88
| | | | | | | | this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
| * restore fixedFlorin Peter2013-04-281-22/+40
| |
| * fixed some problems and broken codeFlorin Peter2013-04-281-42/+83
| |
| * restore encryption keys from trash bin (development snapshot)Björn Schießle2013-04-281-45/+72
| |
| * move encryption keys to trash binBjörn Schießle2013-04-281-31/+76
| |
* | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cacheFlorinPeter2013-04-292-2/+2
|\ \ | | | | | | fix for infinite loop causing on files_encryption branch when testing
| * | fix for infinite loop causing on files_encryption branch when testing ↵Florin Peter2013-04-292-2/+2
| | | | | | | | | | | | "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-30118-631/+852
|/ /
* | Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
|\ \ | | | | | | Reword sentence and move HTML out of translation
| * | Reword sentence and move HTML out of translationLukas Reschke2013-04-291-1/+1
| |/
* | Merge pull request #3160 from owncloud/remove-onclickMorris Jobke2013-04-292-2/+6
|\ \ | | | | | | Remove onclick
| * | It's a classLukas Reschke2013-04-281-1/+1
| | |
| * | Remove uneeded onclick handlerLukas Reschke2013-04-281-1/+1
| | |
| * | Move onclick handlerLukas Reschke2013-04-282-1/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2951-135/+199
| |/ |/|
* | Merge pull request #3154 from owncloud/fix_3153Frank Karlitschek2013-04-282-10/+66
|\ \ | | | | | | Change app identifier for core api routes
| * | Fix typoTom Needham2013-04-271-1/+1
| | |
| * | Code style for ocs/routes.phpTom Needham2013-04-271-9/+65
| | |
| * | Change app identifier for core api routesTom Needham2013-04-271-8/+8
| | |
| * | Use correct variable when checking authTom Needham2013-04-271-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-28233-1591/+876
| |/ |/|
* | Merge pull request #3121 from owncloud/ocs_fix_api_responseLukas Reschke2013-04-271-2/+2
|\ \ | |/ |/| Fix the api response when a shipped and third party app both fail.
| * Correct the api response when both a shipped app and/or a third party app failTom Needham2013-04-251-2/+2
| |
* | Merge pull request #3146 from owncloud/restart-hintMorris Jobke2013-04-271-13/+13
|\ \ | | | | | | web_server_restart needs to be true to display the hint
| * | web_server_restart needs to be true to display the hintBart Visscher2013-04-261-13/+13
| | |
* | | Merge pull request #3145 from owncloud/magic_quotes_gpc-checkMorris Jobke2013-04-271-0/+5
|\ \ \ | | | | | | | | Add check for Magic Quotes
| * | | Add check for Magic QuotesBart Visscher2013-04-261-0/+5
| |/ /
* | | Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-265-38/+32
|\ \ \ | | | | | | | | Add an update notification
| * | | Remove uneeded linkLukas Reschke2013-04-241-1/+1
| | | |
| * | | Clubbing Exact styles together.raghunayyar2013-04-241-5/+2
| | | |
| * | | Add an update notification on every page for admin usersLukas Reschke2013-04-245-36/+33
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-27934-28068/+28442
| | | |
* | | | Code styleRobin Appelman2013-04-261-206/+231
| | | |
* | | | Merge pull request #3136 from owncloud/mount-cleanupicewind19912013-04-2615-201/+326
|\ \ \ \ | | | | | | | | | | Separation of mount management
| * | | | Further seperation of mount management logicRobin Appelman2013-04-2611-171/+235
| | | | |
| * | | | Cache: seperate handing of numeric storage id's to it's own classRobin Appelman2013-04-264-30/+91
| | | | |
* | | | | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-263-4/+21
|\ \ \ \ \ | |_|_|/ / |/| | | | Priorize common languages.
| * | | | Make divider not selectablekondou2013-04-192-5/+4
| | | | | | | | | | | | | | | | | | | | Very hacky
| * | | | Priorize common languages.kondou2013-04-183-4/+22
| | | | |
* | | | | Merge pull request #3026 from owncloud/cli-no-sessionBart Visscher2013-04-261-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Don't start the session when in cli mode
| * | | | | Don't start the session when in cli modeRobin Appelman2013-04-261-1/+3
| | | | | |
* | | | | | Merge pull request #3028 from owncloud/simplyfy-resource-locatingBart Visscher2013-04-261-42/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simplify resource locating in templatelayout
| * | | | | | Simplify app js locating for layout pagesBart Visscher2013-04-261-11/+8
| | | | | | |
| * | | | | | Simplify app css locating for layout pagesBart Visscher2013-04-261-31/+9
| |/ / / / /
* | | | | | Merge pull request #2955 from owncloud/displaynames-numericBart Visscher2013-04-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix OC_User::getDisplaynames when using numeric user id's
| * | | | | | Fix OC_User::getDisplaynames when using numeric user id'sRobin Appelman2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #2948
* | | | | | | Merge pull request #2783 from Kondou-ger/improve_passwordresetscreenBart Visscher2013-04-262-12/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the password reset screen.
| * | | | | | | Fis syntax error and add user icon.kondou2013-04-241-2/+3
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 10:34:35 +0000