Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #716 from eMerzh/remove_sqlite2 | Thomas Müller | 2012-12-05 | 1 | -1/+1 |
|\ | |||||
| * | Simplify has sqlite test | Brice Maron | 2012-12-04 | 1 | -1/+1 |
| * | Remove support of sqlite2 at installation | Brice Maron | 2012-12-04 | 1 | -1/+1 |
* | | Merge pull request #647 from owncloud/fix_app_settings_navigation | Thomas Müller | 2012-12-05 | 2 | -1/+2 |
|\ \ | |||||
| * | | Move loading of all the apps to setting the active navigation entry. | Bart Visscher | 2012-11-30 | 2 | -1/+2 |
* | | | Merge pull request #700 from eMerzh/fix_error_display | Thomas Müller | 2012-12-05 | 1 | -14/+10 |
|\ \ \ | |||||
| * | | | Fix a dirty function preventing showing errors | Brice Maron | 2012-12-03 | 1 | -14/+10 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-05 | 32 | -209/+301 |
* | | | | Enabling unit testing for apptemplate_advanced | Thomas Müller | 2012-12-04 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #707 from owncloud/fix_infield_autofill | Jan-Christoph Borchardt | 2012-12-04 | 3 | -13/+165 |
|\ \ \ | |||||
| * | | | minified version no longer available | Thomas Mueller | 2012-12-04 | 1 | -1/+1 |
| * | | | merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue... | Jörn Friedrich Dreyer | 2012-12-04 | 1 | -5/+16 |
| * | | | replace minified infieldlabel with dcneiners version | Jörn Friedrich Dreyer | 2012-12-04 | 2 | -12/+153 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-04 | 32 | -55/+70 |
|/ / | |||||
* | | LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes d... | Arthur Schiwon | 2012-12-03 | 1 | -4/+11 |
* | | Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_master | Björn Schießle | 2012-12-03 | 1 | -6/+6 |
|\ \ | |||||
| * \ | rebase on latest master | Björn Schießle | 2012-12-02 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | fix regression in file versioning for shared files | Björn Schießle | 2012-11-30 | 1 | -6/+6 |
| * | | | fix typo in variable name | Björn Schießle | 2012-12-02 | 1 | -1/+1 |
| * | | | fix regression in file versioning for shared files | Björn Schießle | 2012-12-02 | 1 | -6/+6 |
* | | | | Merge pull request #682 from VicDeo/master | Thomas Müller | 2012-12-03 | 2 | -33/+28 |
|\ \ \ \ | |||||
| * | | | | Check if we have an array with data. Fix #487 | Victor Dubiniuk | 2012-12-02 | 1 | -1/+1 |
| * | | | | Clean KB entries processing code | Victor Dubiniuk | 2012-12-02 | 1 | -32/+27 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-03 | 92 | -215/+254 |
|/ / / | |||||
* | | | Merge pull request #654 from butonic/checkstyle_fixes | Thomas Müller | 2012-12-02 | 30 | -370/+603 |
|\ \ \ | |||||
| * | | | fix checkstyle for files_external app, add whitespace for readability | Jörn Friedrich Dreyer | 2012-11-30 | 22 | -306/+527 |
| * | | | fix checkstyle for files_encryption app, add whitespace for readability | Jörn Friedrich Dreyer | 2012-11-30 | 8 | -64/+76 |
* | | | | Merge pull request #672 from irosenb/patch-1 | icewind1991 | 2012-12-01 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update lib/image.php | Isaac Rosenberg | 2012-12-01 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-02 | 56 | -483/+653 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-01 | 144 | -2399/+2119 |
* | | | | Merge pull request #603 from owncloud/store_plain_groupname | Bart Visscher | 2012-11-30 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Group name does't need to be sanitized before storing it in the database | Bart Visscher | 2012-11-27 | 2 | -2/+2 |
* | | | | | Merge pull request #644 from butonic/checkstyle_fixes | Bart Visscher | 2012-11-30 | 10 | -73/+152 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | fix checkstyle for files app | Jörn Friedrich Dreyer | 2012-11-29 | 11 | -74/+153 |
* | | | | | Merge pull request #605 from owncloud/fix_false_positive_share_2 | Bart Visscher | 2012-11-30 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Sharing: Fix false positived v. 2 | Thomas Tanghus | 2012-11-27 | 1 | -1/+1 |
* | | | | | Merge pull request #619 from samtuke/versions_cache | Bart Visscher | 2012-11-30 | 2 | -5/+31 |
|\ \ \ \ \ | |||||
| * | | | | | OC_FSV->copy now only caches files which are copied from data/user/files | Sam Tuke | 2012-11-28 | 2 | -5/+31 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-30 | 81 | -394/+651 |
* | | | | | | Merge pull request #635 from owncloud/ob_end | Thomas Müller | 2012-11-29 | 6 | -8/+17 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | use new obEnd function instead of ob_end_clean | Robin Appelman | 2012-11-29 | 5 | -5/+5 |
| * | | | | | add function to safely end output buffering | Robin Appelman | 2012-11-29 | 1 | -3/+12 |
|/ / / / / | |||||
* | | | | | Merge pull request #620 from owncloud/fix_600 | Georg Ehrke | 2012-11-29 | 2 | -7/+8 |
|\ \ \ \ \ | |||||
| * | | | | | use attr instead of data | Georg Ehrke | 2012-11-29 | 1 | -7/+2 |
| * | | | | | Revert "fix group and subadmin managing for 'ajax-loaded' users" | Georg Ehrke | 2012-11-29 | 1 | -2/+7 |
| * | | | | | add a client side check | Georg Ehrke | 2012-11-28 | 1 | -0/+3 |
| * | | | | | fix group and subadmin managing for 'ajax-loaded' users | Georg Ehrke | 2012-11-28 | 1 | -7/+2 |
| * | | | | | make some checks server-side | Georg Ehrke | 2012-11-28 | 2 | -3/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #617 from samtuke/fix_docblocks | blizzz | 2012-11-29 | 1 | -21/+15 |
|\ \ \ \ \ |