Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | update 3rdparty submodule | Thomas Müller | 2013-08-17 | 1 | -0/+0 | |
| * | | | | | | | 3rdparty submodule update: getid3 removed | Thomas Müller | 2013-08-17 | 1 | -0/+0 | |
| * | | | | | | | update 3rdparty - openid moved | Thomas Müller | 2013-08-17 | 1 | -0/+0 | |
| * | | | | | | | moving Dropbox and smb4php 3rdparty code over to the apps | Thomas Müller | 2013-08-17 | 15 | -2/+1506 | |
| * | | | | | | | update 3rdparty submodule | Thomas Müller | 2013-08-17 | 1 | -0/+0 | |
* | | | | | | | | Merge pull request #3891 from owncloud/fix_loadAppScriptFile | Bart Visscher | 2013-08-28 | 1 | -5/+8 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Check if the app is enabled and the app path is found before trying to load t... | Bart Visscher | 2013-06-28 | 1 | -5/+8 | |
* | | | | | | | | Merge pull request #4610 from owncloud/password-toggle-login | Morris Jobke | 2013-08-28 | 3 | -7/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | fix shadow style of username input box | Jan-Christoph Borchardt | 2013-08-28 | 1 | -3/+3 | |
| * | | | | | | | remove show password toggle from log in page, ref #4577 #4580 | Jan-Christoph Borchardt | 2013-08-28 | 2 | -4/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4601 from owncloud/fixing-4341-master | Morris Jobke | 2013-08-28 | 3 | -27/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | backport of #4357 to master | Thomas Müller | 2013-08-27 | 3 | -27/+33 | |
* | | | | | | | | Merge pull request #4434 from owncloud/fix_octemplate_escaping | Thomas Tanghus | 2013-08-28 | 2 | -5/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Cache Object.keys(this.vars) | Thomas Tanghus | 2013-08-28 | 1 | -3/+4 | |
| * | | | | | | | | Fix octemplate string escaping. | Thomas Tanghus | 2013-08-14 | 2 | -5/+5 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 88 | -230/+301 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement | Morris Jobke | 2013-08-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix "select all" checkbox displacement when checked | Pellaeon Lin | 2013-08-26 | 1 | -1/+1 | |
* | | | | | | | | | LDAP: case insensitive replace for more robustness | Arthur Schiwon | 2013-08-27 | 1 | -1/+1 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 275 | -2289/+4008 | |
* | | | | | | | | | Merge pull request #3208 from owncloud/api_capabilities_quota | Morris Jobke | 2013-08-27 | 2 | -6/+49 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add documentation | Morris Jobke | 2013-08-27 | 1 | -0/+13 | |
| * | | | | | | | | | Code style | Tom Needham | 2013-08-27 | 1 | -2/+2 | |
| * | | | | | | | | | Add quota to core api | Tom Needham | 2013-08-27 | 2 | -6/+36 | |
* | | | | | | | | | | Merge pull request #4596 from owncloud/fix_isEmpty_trash | Björn Schießle | 2013-08-27 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | the trash bin can also contain empty files. Don't use the trash bin size as i... | Bjoern Schiessle | 2013-08-27 | 1 | -4/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4348 from owncloud/fixing-4343-master | Jörn Friedrich Dreyer | 2013-08-27 | 2 | -27/+165 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | lacy initialization of fileView - in case basic auth is used FileSystem is no... | Thomas Müller | 2013-08-26 | 1 | -4/+16 | |
| * | | | | | | | | | Merge branch 'master' into fixing-4343-master | Thomas Müller | 2013-08-22 | 1613 | -29093/+28175 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | adding unit tests for quota checks | Thomas Müller | 2013-08-08 | 2 | -33/+98 | |
| * | | | | | | | | | adding unit tests to determine length | Thomas Müller | 2013-08-08 | 2 | -1/+48 | |
| * | | | | | | | | | fixes #4343 | Thomas Müller | 2013-08-08 | 1 | -2/+16 | |
* | | | | | | | | | | Merge pull request #4507 from owncloud/existingusersfromgroup | blizzz | 2013-08-27 | 2 | -19/+29 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | consolidate validity check for users in group class | Arthur Schiwon | 2013-08-26 | 2 | -28/+29 | |
| * | | | | | | | | | | no assoc index here, makes tests pass again | Arthur Schiwon | 2013-08-19 | 1 | -1/+1 | |
| * | | | | | | | | | | return only existing users in group | Arthur Schiwon | 2013-08-19 | 1 | -3/+12 | |
* | | | | | | | | | | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 21 | -3253/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | revert debugging code which accidentially entered this pull request | Thomas Müller | 2013-08-27 | 1 | -4/+0 | |
| * | | | | | | | | | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 22 | -3253/+4 | |
* | | | | | | | | | | | Merge pull request #4585 from owncloud/fixing-4385-master | Morris Jobke | 2013-08-27 | 5 | -10/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | storage information is path specific | Thomas Müller | 2013-08-27 | 4 | -5/+8 | |
| * | | | | | | | | | | | webdav quota now displays the same values as the web interface does | Thomas Müller | 2013-08-27 | 2 | -6/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #4584 from owncloud/fixing-4575-master | Morris Jobke | 2013-08-27 | 1 | -12/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | adding translations to update events | Thomas Müller | 2013-08-27 | 1 | -12/+13 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core in... | Morris Jobke | 2013-08-26 | 1 | -3/+20 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | final fix for xsendfile zip generation race condition | Valerio Ponte | 2013-08-08 | 1 | -3/+20 | |
* | | | | | | | | | | Merge pull request #4292 from owncloud/add_appconfig_unittest | Bart Visscher | 2013-08-26 | 1 | -0/+132 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use setUpBeforeClass() and tearDownAfterClass() | kondou | 2013-08-06 | 1 | -3/+9 | |
| * | | | | | | | | | | Revert "Add null and emptystring tests to check NOT NULL" | kondou | 2013-08-02 | 1 | -14/+0 | |
| * | | | | | | | | | | Add null and emptystring tests to check NOT NULL | kondou | 2013-08-02 | 1 | -0/+14 |