summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-02180-3035/+3004
* Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\
| * Fixed broken delete file actionVincent Petry2014-04-012-8/+20
* | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-012-0/+12
|\ \
| * | idn_to_ascii is only used if availableThomas Müller2014-03-262-0/+12
* | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-014-14/+120
|\ \ \
| * | | Improve phpdocRobin Appelman2014-03-312-1/+10
| * | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
| * | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
* | | | Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-014-60/+50
|\ \ \ \
| * | | | apply proposed changeMorris Jobke2014-04-011-2/+2
| * | | | merge CSS rulesMorris Jobke2014-03-311-4/+2
| * | | | Removes highlighting of selected items, padding from apps management.raghunayyar2014-03-302-3/+3
| * | | | Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-242-4/+13
| * | | | Makes #app-navigation a part of app management.raghunayyar2014-03-203-59/+42
* | | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \ \ \
| * | | | | Remember before change works betterBart Visscher2014-04-011-3/+3
* | | | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexistsVincent Petry2014-04-011-1/+1
|\ \ \ \ \ \
| * | | | | | Fix dirInfo check when dir does not existVincent Petry2014-04-011-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #7984 from owncloud/wording-applicable2Morris Jobke2014-04-011-4/+7
|\ \ \ \ \ \
| * | | | | | external storage: set storages to be available for All Users by defaultJan-Christoph Borchardt2014-04-011-3/+6
| * | | | | | external storage: change confusing 'applicable' to 'available for'Jan-Christoph Borchardt2014-04-011-1/+1
* | | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48
* | | | | | | Merge pull request #7293 from owncloud/update-shares-postgresVincent Petry2014-04-014-16/+109
|\ \ \ \ \ \ \
| * | | | | | | Fixed share upgrade cleanup tests to use the correct idsVincent Petry2014-03-261-9/+9
| * | | | | | | Fixed share updater unit testVincent Petry2014-03-251-8/+10
| * | | | | | | remove invalid shares with one SQL statementMorris Jobke2014-03-131-12/+5
| * | | | | | | Added backticks for Oracle in sharing updater unit testVincent Petry2014-03-131-8/+8
| * | | | | | | Clean up database before setup the database for testingMorris Jobke2014-03-131-0/+4
| * | | | | | | Refactor update script to class and add unit testMorris Jobke2014-03-133-13/+108
| * | | | | | | fix update to remove shares where file doesn't exist on postgresJamie McClelland2014-03-132-15/+14
* | | | | | | | Merge pull request #7940 from owncloud/settings-userlistajaxcallfixblizzz2014-04-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fixed user list offset callVincent Petry2014-03-281-1/+1
* | | | | | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * | | | | | | | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #7943 from hjort/masterVincent Petry2014-04-011-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Correction: failure on sharing when user ID was prefixed by zeroRodrigo Hjort2014-03-281-3/+3
* | | | | | | | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-0115-2569/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove pl_PL - fixes #7973Thomas Müller2014-03-3115-2569/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-0111-430/+407
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-31119-2126/+3046
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace last personalblock fieldset within files_externalJan-Christoph Borchardt2014-03-311-3/+1
| * | | | | | | | | | remove CSS rules for personalblock, remove it from coreJan-Christoph Borchardt2014-03-272-17/+4
| * | | | | | | | | | replace personalblock fieldset with section class in core user_ appsJan-Christoph Borchardt2014-03-272-9/+7
| * | | | | | | | | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-274-271/+261
| * | | | | | | | | | replace personalblock fieldset with section div in admin and personal settingsJan-Christoph Borchardt2014-03-272-124/+112
| * | | | | | | | | | general styles for the content areaJan-Christoph Borchardt2014-03-271-3/+19
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7966 from owncloud/url_generation_hackMorris Jobke2014-04-011-1/+6
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 09:05:55 +0000