Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixing namespace | Thomas Mueller | 2013-02-04 | 1 | -2/+2 |
* | Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-... | Thomas Müller | 2013-02-04 | 1 | -0/+11 |
|\ | |||||
| * | in case file based session handling in enabled - we need to make sure the con... | Thomas Mueller | 2013-02-04 | 1 | -0/+11 |
* | | Merge pull request #1445 from owncloud/CSP_font | Thomas Müller | 2013-02-04 | 2 | -2/+2 |
|\ \ | |||||
| * | | Also allow local files | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
| * | | Allow the loading of local font files embedded via data: | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
| * | | Allow loading of external fonts | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
* | | | Merge pull request #1427 from TheSFReader/master | Thomas Müller | 2013-02-04 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-03 | 5 | -4/+89 |
| |\| | | |||||
| * | | | translate the mimtype/mimepart to readable in the searchByMime function | TheSFReader | 2013-02-03 | 1 | -1/+7 |
* | | | | Merge pull request #1436 from owncloud/cache_check_path | Thomas Müller | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Cache: fix copy-paste errors | Robin Appelman | 2013-02-04 | 1 | -2/+2 |
| * | | | | Cache: check for invalid paths in getFileInfo/getDirectoryContent | Robin Appelman | 2013-02-03 | 1 | -0/+6 |
* | | | | | Merge pull request #1423 from owncloud/getowner | Thomas Müller | 2013-02-04 | 2 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Add getOwner to Filesystem and View classes | Michael Gapczynski | 2013-02-02 | 2 | -0/+20 |
* | | | | | | Merge pull request #1434 from owncloud/trashbin_CSRF | Björn Schießle | 2013-02-04 | 1 | -3/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | OCP\JSON instead of OCP\User | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
| * | | | | | | [files_trashbin] Add CSRF token | Lukas Reschke | 2013-02-03 | 1 | -3/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #1229 from owncloud/from_live_to_on | Thomas Müller | 2013-02-03 | 8 | -40/+39 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into from_live_to_on | Thomas Mueller | 2013-01-31 | 589 | -9506/+17539 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | use on instead of live in users.js | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -1/+1 |
| * | | | | | | | attach to filelist which is present on .ready() | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -13/+13 |
| * | | | | | | | attach on to filelist instead of individual td elements for file link behaviour | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -1/+1 |
| * | | | | | | | replace live() with on() in core js | Jörn Friedrich Dreyer | 2013-01-30 | 8 | -38/+38 |
* | | | | | | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master | Thomas Müller | 2013-02-03 | 3 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500 | Thomas Mueller | 2013-01-31 | 1 | -0/+4 |
| * | | | | | | | | Merge branch 'master' into fixing-js-errors-public-link-master | Thomas Mueller | 2013-01-31 | 686 | -18789/+28813 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500 | Thomas Mueller | 2013-01-28 | 1 | -5/+7 |
| * | | | | | | | | include keyboardshortcuts.js | Thomas Mueller | 2013-01-28 | 1 | -0/+1 |
| * | | | | | | | | fixing href for folders | Thomas Mueller | 2013-01-28 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #1435 from owncloud/make_BlacklistConfigurable | Michael Gapczynski | 2013-02-03 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make fileblacklist configurable | Lukas Reschke | 2013-02-03 | 2 | -1/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* / | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-04 | 55 | -440/+600 |
|/ / / / / / / / | |||||
* | | | | | | | | fix CSS to coding guideline | Jan-Christoph Borchardt | 2013-02-03 | 1 | -0/+13 |
* | | | | | | | | Password Toggle Support for Login | raghunayyar | 2013-02-03 | 5 | -4/+76 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1416 from herbrechtsmeier/set_include_path_early | Thomas Müller | 2013-02-03 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | initPaths: set include path before any owncloud function is called | herbrechtsmeier | 2013-02-02 | 1 | -6/+7 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1422 from TheSFReader/master | Thomas Müller | 2013-02-03 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove a warning by making sure the renamed file is a dir before trying and o... | TheSFReader | 2013-02-02 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-02 | 384 | -2276/+2477 |
| |\| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-01 | 373 | -7004/+14837 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correct it | TheSFReader | 2013-02-01 | 1 | -1/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 148 | -4161/+5013 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #1419 from owncloud/etag_fix | Thomas Müller | 2013-02-02 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Dav: update etag in filecache when doing a PROPSET | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
| * | | | | | | Dav: don't overwrite etag from filecache with old etag from properties table | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1415 from owncloud/ldap_fix_settings | Lukas Reschke | 2013-02-01 | 2 | -20/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove ugly whitespace | Arthur Schiwon | 2013-02-01 | 1 | -1/+1 |
| * | | | | | | LDAP: settings Advanced tab has grown too long by far. Structure it using acc... | Arthur Schiwon | 2013-02-01 | 2 | -20/+32 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 382 | -2256/+2445 |
|/ / / / / |