Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | LDAP: prepare settings for internal username attribute and clearing user mapp... | Arthur Schiwon | 2013-05-07 | 2 | -0/+13 |
* | LDAP: Coypright info | Arthur Schiwon | 2013-05-07 | 1 | -0/+2 |
* | Merge pull request #3025 from owncloud/move-file | Michael Gapczynski | 2013-05-07 | 2 | -14/+18 |
|\ | |||||
| * | Cache: only look for child entires when doing a move operation when moving a ... | Robin Appelman | 2013-04-19 | 2 | -15/+19 |
* | | Merge pull request #2813 from owncloud/improve-lib-check | Bart Visscher | 2013-05-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | remove hard php-intl requirement | Morris Jobke | 2013-05-07 | 1 | -5/+0 |
| * | | added correct check for gd and check for php-intl | Bernhard Posselt | 2013-04-09 | 1 | -1/+6 |
* | | | Merge pull request #3246 from owncloud/newfile-mimetype | Morris Jobke | 2013-05-07 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | Files: set the proper mimetype when creating a new text file | Robin Appelman | 2013-05-06 | 2 | -3/+3 |
* | | | | allow to set quota to zero, issue #2696 | Björn Schießle | 2013-05-07 | 1 | -5/+1 |
* | | | | Merge pull request #3245 from owncloud/use-$view | Lukas Reschke | 2013-05-06 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use $dir instead of $fullpath | Lukas Reschke | 2013-05-06 | 1 | -2/+1 |
| * | | | Use the internal ownCloud view | Lukas Reschke | 2013-05-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | LDAP: do not reset UUID attribute setting when guid is detected | Arthur Schiwon | 2013-05-06 | 1 | -1/+3 |
* | | | Merge pull request #3120 from owncloud/ocs_properties | Bart Visscher | 2013-05-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Make class properties protected instead of private to allow subclassing | Tom Needham | 2013-04-23 | 1 | -1/+1 |
* | | | | Merge pull request #3177 from owncloud/outerHTML_compatibility | Thomas Tanghus | 2013-05-04 | 2 | -2/+16 |
|\ \ \ \ | |||||
| * | | | | Add compatibility function for outerHTML | Thomas Tanghus | 2013-04-29 | 2 | -2/+16 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 28 | -130/+147 |
* | | | | | Merge pull request #3230 from owncloud/fix_ldap_cachekey | Bart Visscher | 2013-05-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | LDAP: cachekey in set method needs to match with that one from get | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3229 from owncloud/fix_3210 | Bart Visscher | 2013-05-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | LDAP: remove restriction from group names to be in line with core behaviour a... | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
* | | | | | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 4 | -7/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | One more mount point fix | Michael Gapczynski | 2013-05-02 | 1 | -1/+4 |
| * | | | | | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 3 | -6/+27 |
* | | | | | | | Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages | Bart Visscher | 2013-05-03 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Sort priorized languages as defined in the array | kondou | 2013-05-01 | 1 | -3/+4 |
* | | | | | | | | Merge pull request #2972 from AndreasErgenzinger/master | Bart Visscher | 2013-05-03 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | additional safety checks | AndreasErgenzinger | 2013-04-17 | 1 | -1/+3 |
| * | | | | | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -9/+10 |
| * | | | | | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -0/+9 |
* | | | | | | | | | Merge pull request #2491 from riso/xsendfile_fix_zip | Bart Visscher | 2013-05-03 | 2 | -20/+22 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | fixed xsendfile zip generation race condition | Valerio Ponte | 2013-03-20 | 2 | -20/+22 |
* | | | | | | | | | Fix retrieval of users with multiple backends | Arthur Schiwon | 2013-05-03 | 2 | -5/+16 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-03 | 19 | -43/+56 |
* | | | | | | | | | Merge pull request #3216 from owncloud/fix-api-3rdparty | Tom Needham | 2013-05-02 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | respect format output | Bernhard Posselt | 2013-05-02 | 1 | -2/+3 |
| * | | | | | | | | | logout before output to not run into header already sent problems | Bernhard Posselt | 2013-05-02 | 1 | -1/+2 |
| * | | | | | | | | | fix bug that would only return error responses for 3rdparty apps | Bernhard Posselt | 2013-05-02 | 1 | -1/+5 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3183 from miicha/patch-1 | Thomas Müller | 2013-05-02 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fixing mimetype for "new" ms office formats | miicha | 2013-04-30 | 1 | -3/+3 |
* | | | | | | | | | | Merge pull request #3212 from owncloud/stop-links | Morris Jobke | 2013-05-02 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Don't display shared links if disabled | Michael Gapczynski | 2013-05-01 | 1 | -0/+7 |
* | | | | | | | | | | | Merge pull request #3220 from owncloud/gitignore-themes | Frank Karlitschek | 2013-05-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | don't ignore themes README | Jan-Christoph Borchardt | 2013-05-02 | 1 | -1/+2 |
| * | | | | | | | | | | ignore themes | Jan-Christoph Borchardt | 2013-05-02 | 1 | -0/+3 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3211 from owncloud/fix-2816 | Frank Karlitschek | 2013-05-02 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix #2816 renaming shared files | Michael Gapczynski | 2013-05-01 | 1 | -5/+3 |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-02 | 55 | -127/+4921 |