summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-27275-2289/+4008
|
* Merge pull request #3208 from owncloud/api_capabilities_quotaMorris Jobke2013-08-272-6/+49
|\ | | | | Add the quota to the external API for use with the mobile and desktop clients
| * add documentationMorris Jobke2013-08-271-0/+13
| |
| * Code styleTom Needham2013-08-271-2/+2
| |
| * Add quota to core apiTom Needham2013-08-272-6/+36
| |
* | Merge pull request #4596 from owncloud/fix_isEmpty_trashBjörn Schießle2013-08-271-4/+5
|\ \ | |/ |/| trash bin: fix isEmpty() function
| * the trash bin can also contain empty files. Don't use the trash bin size as ↵Bjoern Schiessle2013-08-271-4/+5
|/ | | | indicator to decide if the trash bin is empty or not
* Merge pull request #4348 from owncloud/fixing-4343-masterJörn Friedrich Dreyer2013-08-272-27/+165
|\ | | | | fixes #4343
| * lacy initialization of fileView - in case basic auth is used FileSystem is ↵Thomas Müller2013-08-261-4/+16
| | | | | | | | not yet initialized during the initialize() call
| * Merge branch 'master' into fixing-4343-masterThomas Müller2013-08-221613-29093/+28175
| |\ | | | | | | | | | | | | Conflicts: lib/connector/sabre/quotaplugin.php
| * | adding unit tests for quota checksThomas Müller2013-08-082-33/+98
| | |
| * | adding unit tests to determine lengthThomas Müller2013-08-082-1/+48
| | |
| * | fixes #4343Thomas Müller2013-08-081-2/+16
| | |
* | | Merge pull request #4507 from owncloud/existingusersfromgroupblizzz2013-08-272-19/+29
|\ \ \ | | | | | | | | return only existing users in group
| * | | consolidate validity check for users in group classArthur Schiwon2013-08-262-28/+29
| | | |
| * | | no assoc index here, makes tests pass againArthur Schiwon2013-08-191-1/+1
| | | |
| * | | return only existing users in groupArthur Schiwon2013-08-191-3/+12
| | | |
* | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-2721-3253/+0
|\ \ \ \ | | | | | | | | | | kill zh_CN.GB2312
| * | | | revert debugging code which accidentially entered this pull requestThomas Müller2013-08-271-4/+0
| | | | |
| * | | | kill zh_CN.GB2312Thomas Müller2013-08-2722-3253/+4
| | | | |
* | | | | Merge pull request #4585 from owncloud/fixing-4385-masterMorris Jobke2013-08-275-10/+13
|\ \ \ \ \ | | | | | | | | | | | | Fixing 4385 master
| * | | | | storage information is path specificThomas Müller2013-08-274-5/+8
| | | | | |
| * | | | | webdav quota now displays the same values as the web interface doesThomas Müller2013-08-272-6/+6
| |/ / / /
* | | | | Merge pull request #4584 from owncloud/fixing-4575-masterMorris Jobke2013-08-271-12/+13
|\ \ \ \ \ | |/ / / / |/| | | | adding translations to update events
| * | | | adding translations to update eventsThomas Müller2013-08-271-12/+13
|/ / / /
* | | | Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core ↵Morris Jobke2013-08-261-3/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into riso-xsendfile_complete_zip_fix from pull request #3307 Conflicts: lib/helper.php
| * | | | final fix for xsendfile zip generation race conditionValerio Ponte2013-08-081-3/+20
| | | | |
* | | | | Merge pull request #4292 from owncloud/add_appconfig_unittestBart Visscher2013-08-261-0/+132
|\ \ \ \ \ | | | | | | | | | | | | Add \OC_Appconfig Unittest
| * | | | | Use setUpBeforeClass() and tearDownAfterClass()kondou2013-08-061-3/+9
| | | | | |
| * | | | | Revert "Add null and emptystring tests to check NOT NULL"kondou2013-08-021-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c74f3d0b90227f95c1b6d21bbb7ee28561b67446.
| * | | | | Add null and emptystring tests to check NOT NULLkondou2013-08-021-0/+14
| | | | | |
| * | | | | Add \OC_Appconfig Unittestkondou2013-08-021-0/+126
| | | | | |
* | | | | | Merge pull request #4281 from owncloud/ie8-multiselectMorris Jobke2013-08-261-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Better ie8 multiselect
| * | | | | | Better ie8 multiselectVictor Dubiniuk2013-08-011-0/+7
| | | | | | |
* | | | | | | Merge pull request #4542 from owncloud/fixing-4504-masterMorris Jobke2013-08-262-198/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove duplicate code
| * | | | | | | remove duplicate codeThomas Müller2013-08-222-198/+7
| | | | | | | |
* | | | | | | | Merge pull request #4519 from owncloud/style-fixesMorris Jobke2013-08-261-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix minor style issue in the app navigation
| * | | | | | | | fix reviewers concernsMorris Jobke2013-08-261-1/+1
| | | | | | | | |
| * | | | | | | | fix minor style issue in the app navigationMorris Jobke2013-08-191-1/+5
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-25247-2599/+8182
| | | | | | | | |
* | | | | | | | | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-257-66/+92
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve app-management
| * \ \ \ \ \ \ \ \ Merge branch 'master' into improve_app-managementkondou2013-08-21926-14253/+14568
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/js/apps.js
| * | | | | | | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-184-15/+17
| | | | | | | | | |
| * | | | | | | | | Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some wrong data storages
| * | | | | | | | | Don't use an alert for displaying app-mgmt-errorskondou2013-08-184-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305
| * | | | | | | | | Merge branch 'master' into improve_app-managementkondou2013-08-18760-14393/+10729
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Throw exceptions instead of only logging in \OC_Installer::installApp()kondou2013-08-091-35/+18
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into improve_app-managementkondou2013-08-091257-3494/+11388
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Log exception at the catching codekondou2013-08-092-5/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Improve app-managementkondou2013-08-063-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 15:03:00 +0000