Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reformat long line | Michael Gapczynski | 2013-01-05 | 1 | -1/+5 |
| | |||||
* | Tweak failure message and throw exceptions from updateDbFromStructure() | Michael Gapczynski | 2013-01-05 | 3 | -9/+12 |
| | |||||
* | Modify and include additional update messages from updating apps | Michael Gapczynski | 2013-01-05 | 1 | -1/+4 |
| | |||||
* | Remove old data directory protection from update, should already have taken ↵ | Michael Gapczynski | 2013-01-05 | 1 | -8/+0 |
| | | | | place or not working because the server isn't Apache | ||||
* | Only show the version updating to instead of worrying about converting ↵ | Michael Gapczynski | 2013-01-04 | 2 | -3/+2 |
| | | | | internal to a formatted version | ||||
* | Add back check if installed around background jobs | Michael Gapczynski | 2013-01-04 | 1 | -2/+4 |
| | |||||
* | Add maintenance mode entry to config.sample.php | Michael Gapczynski | 2013-01-04 | 1 | -0/+3 |
| | |||||
* | Use hooks to send updates from apps | Michael Gapczynski | 2013-01-04 | 2 | -8/+47 |
| | |||||
* | Basic update progress of database update only | Michael Gapczynski | 2013-01-03 | 4 | -38/+77 |
| | |||||
* | Rearrange code to prepare for updater feedback | Michael Gapczynski | 2013-01-03 | 1 | -37/+63 |
| | |||||
* | Merge pull request #1067 from owncloud/fix-logout | Michael Gapczynski | 2013-01-03 | 1 | -1/+3 |
|\ | | | | | Check if oc_token cookie exists during logout | ||||
| * | Check if oc_token cookie exists before trying to use it | Michael Gapczynski | 2013-01-02 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #1063 from owncloud/translate_not_enough_space_available | Thomas Müller | 2013-01-03 | 1 | -5/+6 |
|\ \ | |/ |/| | add translation call for 'Not enough space available' upload error | ||||
| * | fix error when wrong dir was specified | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| | | |||||
| * | move $l to top | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -0/+1 |
| |\ | |||||
| | * | fixing undefined variable $l | Thomas Mueller | 2013-01-02 | 1 | -1/+3 |
| | | | |||||
| * | | also translate 'No file was uploaded. Unknown error' | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| |/ | |||||
| * | add translation call for 'Not enough space available' upload error | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| | | |||||
* | | fixing indent | Thomas Mueller | 2013-01-03 | 1 | -94/+94 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-03 | 40 | -286/+2271 |
| | | |||||
* | | Merge pull request #1041 from owncloud/fixing-856-master | Thomas Müller | 2013-01-02 | 2 | -5/+7 |
|\ \ | | | | | | | Fixing #856 master | ||||
| * | | only show the max possible upload of 2GB on a 32 bit system. | Thomas Mueller | 2012-12-28 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | for a 64 bit system we have no such limitation refs #856 Conflicts: apps/files/templates/admin.php | ||||
| * | | Revert "fixed max possible upload size for files app in admin screen" | Thomas Mueller | 2012-12-28 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a. Conflicts: apps/files/admin.php | ||||
* | | | Merge pull request #975 from irgsmirx/patch-1 | Thomas Müller | 2013-01-02 | 1 | -8/+21 |
|\ \ \ | | | | | | | | | Update lib/util.php | ||||
| * | | | Update lib/util.php | irgsmirx | 2012-12-20 | 1 | -8/+21 |
| | | | | | | | | | | | | getUrlContent should take proxy setting into consideration when not using curl, as well | ||||
* | | | | Merge pull request #1062 from owncloud/fix-1048-master | Jörn Friedrich Dreyer | 2013-01-02 | 2 | -6/+11 |
|\ \ \ \ | |_|_|/ |/| | | | add smtp port configuration option | ||||
| * | | | add smtp port configuration option | Thomas Mueller | 2013-01-02 | 2 | -6/+11 |
|/ / / | |||||
* | | | Merge pull request #945 from owncloud/fix_app_management_in_ie8 | Jörn Friedrich Dreyer | 2013-01-02 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | since @tanghus and @DeepDiver1975 gave me their :+1: I'll merge this now: Fix app management in ie8 | ||||
| * | | | combine ie8 fix with debug check | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -10/+4 |
| | | | | |||||
| * | | | omit type attribute in script tag to use fallback (text/javascript) | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix broken console.log in ie8 | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+7 |
| | | | | |||||
* | | | | phpdoc fixes for public api | Robin Appelman | 2013-01-02 | 3 | -71/+71 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-02 | 24 | -37/+1778 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-01 | 24 | -375/+466 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-31 | 66 | -728/+1155 |
| | | | |||||
* | | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashes | Lukas Reschke | 2012-12-30 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Replace %2F with / in breadcrumbs | ||||
| * | | | Replace %2F with / in breadcrumbs | Michael Gapczynski | 2012-12-28 | 1 | -2/+3 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-30 | 144 | -1189/+1704 |
| | | | | |||||
* | | | | Merge pull request #902 from owncloud/storage-wording | Thomas Müller | 2012-12-28 | 3 | -18/+43 |
|\ \ \ \ | |/ / / |/| | | | Storage wording | ||||
| * | | | Change old variable name $default_quota to $defaultQuota | Michael Gapczynski | 2012-12-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | moving logic from template to the 'controller' | Thomas Müller | 2012-12-21 | 2 | -13/+22 |
| | | | | | | | | | | | | | | | | THX @VicDeo | ||||
| * | | | remove unused code | Thomas Müller | 2012-12-20 | 1 | -5/+0 |
| | | | | |||||
| * | | | enable translations for quota sizes 'none' and 'default' | Thomas Müller | 2012-12-20 | 2 | -7/+28 |
| | | | | |||||
| * | | | dim Default Storage label color a bit | Jan-Christoph Borchardt | 2012-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | change storage space 'none' to 'Unlimited' and capitalize Default | Jan-Christoph Borchardt | 2012-12-14 | 1 | -3/+3 |
| | | | | |||||
| * | | | change technical expression 'Quota' to simpler 'Storage' | Jan-Christoph Borchardt | 2012-12-14 | 1 | -3/+3 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-29 | 22 | -72/+117 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-28 | 48 | -420/+614 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-27 | 28 | -123/+174 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-26 | 22 | -111/+165 |
| | | |