Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 1 | -967/+0 |
| | | | | | Conflicts: lib/private/vcategories.php | ||||
* | Add Navigation class to server container | Bart Visscher | 2013-09-20 | 1 | -19/+12 |
| | |||||
* | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 1 | -6/+8 |
| | |||||
* | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 1 | -8/+9 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| * \ | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 1 | -9/+1 |
| |\ \ | |||||
| * | | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -5/+5 |
| | | | | |||||
| * | | | Improve app-management | kondou | 2013-08-06 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017 | ||||
* | | | | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: lib/util.php | ||||
| * | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Clean up \OC\Util | kondou | 2013-08-15 | 1 | -4/+4 |
|/ / | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing | ||||
* / | show 'More apps' link to app administration directly in app navigation | Jan-Christoph Borchardt | 2013-08-07 | 1 | -9/+1 |
|/ | |||||
* | Fixed review issues | Bart Visscher | 2013-07-22 | 1 | -1/+2 |
| | |||||
* | Change exit calls to throwing an exception | Bart Visscher | 2013-07-21 | 1 | -2/+1 |
| | | | | This way the error won't be fatal in a unit test | ||||
* | Fix some typos | kondou | 2013-07-16 | 1 | -4/+4 |
| | |||||
* | introduce pre-disable-app hook and use it for the encryption app to reset ↵ | Björn Schießle | 2013-06-27 | 1 | -0/+1 |
| | | | | migration status if the app was disabled | ||||
* | make main menu aware of the different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -1/+2 |
| | |||||
* | use to_char to allow comparing string to CLOB cloumns in oracle | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+2 |
| | |||||
* | use to_char only for oracle, whitespace | Jörn Friedrich Dreyer | 2013-05-22 | 1 | -2/+7 |
| | |||||
* | add debug output | Jörn Friedrich Dreyer | 2013-05-22 | 1 | -1/+4 |
| | |||||
* | return true once one owncloud version number is bigger at any position | Bernhard Posselt | 2013-02-25 | 1 | -0/+2 |
| | |||||
* | created unittests and factored out version test into seperate method | Bernhard Posselt | 2013-02-25 | 1 | -4/+32 |
| | |||||
* | spaces to tabs | Bernhard Posselt | 2013-02-25 | 1 | -4/+4 |
| | |||||
* | version checks for apps now use all three version numbers and fixed bug that ↵ | Bernhard Posselt | 2013-02-25 | 1 | -2/+4 |
| | | | | would not do the version check correctly for the second version | ||||
* | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 1 | -15/+64 |
| | |||||
* | Add braces around single line if statements | Bart Visscher | 2013-02-14 | 1 | -3/+6 |
| | |||||
* | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -19/+19 |
| | |||||
* | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 1 | -3/+3 |
| | |||||
* | I'm an evil bastard and I commit this 3 letter text fix without a pull request. | Frank Karlitschek | 2013-02-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1577 from owncloud/typo_catagory | Lukas Reschke | 2013-02-10 | 1 | -3/+3 |
|\ | | | | | Typo | ||||
| * | Typo | Lukas Reschke | 2013-02-09 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #1546 from owncloud/fix-loading-hooks | Thomas Müller | 2013-02-09 | 1 | -0/+17 |
|\ \ | | | | | | | Fix loading hooks when going though the routing system | ||||
| * | | Better way of getting the navigation entries for an app | Bart Visscher | 2013-02-08 | 1 | -0/+17 |
| |/ | |||||
* / | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 1 | -0/+9 |
|/ | |||||
* | Merge pull request #1357 from owncloud/alternative-loging-master | Thomas Müller | 2013-02-06 | 1 | -0/+9 |
|\ | | | | | add support for apps to register alternative login methods | ||||
| * | add support for apps to register alternative login methods | Thomas Mueller | 2013-01-29 | 1 | -0/+9 |
| | | | | | | | | below the standard login a list of icons/button will be displayed | ||||
* | | add multiple domains reverse proxy support | Stefan Herbrechtsmeier | 2013-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions. | ||||
* | | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 1 | -8/+32 |
|\ \ | | | | | | | Improved appsmanagement | ||||
| * | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -10/+11 |
| | | | |||||
| * | | merge master | Frank Karlitschek | 2013-01-30 | 1 | -20/+90 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| * | | mark recommended apps. server part not yet fully implemented | Frank Karlitschek | 2013-01-30 | 1 | -0/+7 |
| | | | |||||
| * | | apps updater is now working | root | 2013-01-30 | 1 | -3/+1 |
| | | | |||||
| * | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 1 | -1/+15 |
| | | | |||||
* | | | merge master into filesystem | Robin Appelman | 2013-01-26 | 1 | -16/+82 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move to OC_App | Lukas Reschke | 2013-01-21 | 1 | -0/+66 |
| | | | |||||
| * | | Indentation | Lukas Reschke | 2013-01-21 | 1 | -16/+16 |
| | | | |||||
* | | | merge master into filesytem | Robin Appelman | 2013-01-20 | 1 | -1/+1 |
|\| | | |||||
| * | | fix error message, add "appid" to the output to know which app caused the ↵ | Björn Schießle | 2013-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | error if OC_App::getStorage() fails. Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222 | ||||
* | | | merge master into filesystem | Robin Appelman | 2013-01-16 | 1 | -1/+1 |
|\| | | |||||
| * | | Whitespace cleanup | Bart Visscher | 2013-01-16 | 1 | -1/+1 |
| | | |