Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | feedback to the user while request is being processed | Thomas Mueller | 2012-12-12 | 1 | -2/+9 |
| | |||||
* | moving sharing email code to core | Thomas Mueller | 2012-12-10 | 1 | -0/+23 |
| | |||||
* | restoring feature to send sharing link via email | Thomas Mueller | 2012-12-10 | 1 | -2/+10 |
| | |||||
* | fix svg -> png replacement for android, cleanup and remove obsolete css | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -1/+1 |
| | |||||
* | merge changes discussed in dcneiner pull number 4 'fix for autocomplete ↵ | Jörn Friedrich Dreyer | 2012-12-04 | 1 | -5/+16 |
| | | | | issue' including firefox password overlay | ||||
* | replace minified infieldlabel with dcneiners version | Jörn Friedrich Dreyer | 2012-12-04 | 2 | -12/+153 |
| | |||||
* | Sharing: Fix false positived v. 2 | Thomas Tanghus | 2012-11-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #380 from butonic/feature_share_link_with_token | Jörn Friedrich Dreyer | 2012-11-26 | 1 | -11/+17 |
|\ | | | | | Feature share link with token | ||||
| * | readd fallback code for pre token links | Jörn Friedrich Dreyer | 2012-11-23 | 1 | -4/+18 |
| | | |||||
| * | implement share via link token | Jörn Friedrich Dreyer | 2012-11-20 | 1 | -13/+5 |
| | | |||||
* | | remove debug output | Arthur Schiwon | 2012-11-26 | 1 | -3/+0 |
| | | |||||
* | | coding style | Arthur Schiwon | 2012-11-26 | 1 | -1/+2 |
| | | |||||
* | | check whether to join url with ? or & | Arthur Schiwon | 2012-11-26 | 1 | -2/+13 |
| | | |||||
* | | all but the first parameter are introduced by & | Arthur Schiwon | 2012-11-26 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #420 from libasys/bugfix-share | Thomas Müller | 2012-11-17 | 1 | -1/+3 |
|\ | | | | | If you using the sharing by link the array monthNames don't exist and ca... | ||||
| * | If you using the sharing by link the array monthNames don't exist and causes ↵ | libasys | 2012-11-14 | 1 | -1/+3 |
| | | | | | | | | errors in all browsers! so we check if the type of the variable isn't undefined! | ||||
* | | Merge pull request #454 from Raydiation/master | Thomas Müller | 2012-11-15 | 1 | -2/+7 |
|\ \ | | | | | | | Routing fixes | ||||
| * | | removed unneeded callback checks in routes_request that could potentially fail | Bernhard Posselt | 2012-11-15 | 1 | -4/+0 |
| | | | |||||
| * | | fixed: this.routes_request is a deferred/promise | Bernhard Posselt | 2012-11-15 | 1 | -5/+1 |
| | | | |||||
| * | | instead of warning via popup, write to console.warn | Bernhard Posselt | 2012-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | Prevent ajax race conditions when using routes by offering a callback that ↵ | Bernhard Posselt | 2012-11-15 | 1 | -2/+15 |
| | | | | | | | | | | | | is run after the the routes have finished loading | ||||
* | | | Very simple js console switcher. | Thomas Tanghus | 2012-11-15 | 1 | -0/+16 |
|/ / | |||||
* | | Revert "Prevent ajax race conditions when using routes by offering a ↵ | Bernhard Posselt | 2012-11-14 | 1 | -15/+2 |
| | | | | | | | | | | | | callback that is run after the the routes have finished loading" This reverts commit 9b8375cf2c328cfcb66dae8283cfcacdaeb242c2. | ||||
* | | Prevent ajax race conditions when using routes by offering a callback that ↵ | Bernhard Posselt | 2012-11-14 | 1 | -2/+15 |
|/ | | | | is run after the the routes have finished loading | ||||
* | fix translation issues with previous commit | Alessandro Cosentino | 2012-11-13 | 1 | -3/+3 |
| | |||||
* | uncomment hours entries in relative date functions | Alessandro Cosentino | 2012-11-13 | 1 | -6/+7 |
| | |||||
* | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-07 | 1 | -1/+25 |
|\ | |||||
| * | Moved relative_modified_date from file/js to core/js | Alessandro Cosentino | 2012-11-06 | 1 | -0/+24 |
| | | |||||
| * | fix human filesize column header | Jörn Friedrich Dreyer | 2012-11-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 2 | -56/+1 |
|\| | | | | | | | | | Conflicts: lib/vcategories.php | ||||
| * | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession | Lukas Reschke | 2012-11-04 | 2 | -56/+1 |
| |\ | | | | | | | Just one CSRF token per session | ||||
| | * | Change the requesttoken back to OC.EventSource.requesttoken | Lukas Reschke | 2012-10-31 | 1 | -1/+1 |
| | | | |||||
| | * | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 1 | -55/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the CSRF token expired every hour. We had a script in place which should refresh the token but this don't worked in every case. (Laptop sleeping etc.) With this commit, the token will only get once created for every session so that the "Token expired" warning shouldn't appear. | ||||
* | | | VCategories: Use correct variable. | Thomas Tanghus | 2012-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-31 | 1 | -17/+21 |
|\| | | |||||
| * | | Merge pull request #112 from libasys/Fix-strange-Isue-IE8 | Thomas Tanghus | 2012-10-31 | 1 | -17/+21 |
| |\ \ | | |/ | |/| | Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8. | ||||
| | * | UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of ↵ | libasys | 2012-10-31 | 1 | -4/+4 |
| | | | | | | | | | | | | form a select ecample | ||||
| | * | Fix for problems using for() function instead of $.each for arrays with IE8 | libasys | 2012-10-26 | 1 | -15/+19 |
| | | | |||||
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-30 | 5 | -172/+130 |
|\| | | | | | | | | | | | | | | | | | Fix conflicts: core/ajax/vcategories/add.php core/ajax/vcategories/delete.php | ||||
| * | | Change search to use routing | Bart Visscher | 2012-10-29 | 1 | -1/+1 |
| | | | |||||
| * | | Try to fix shared status icons again | Michael Gapczynski | 2012-10-28 | 1 | -10/+5 |
| | | | |||||
| * | | Fix shared status icons | Michael Gapczynski | 2012-10-28 | 1 | -7/+33 |
| | | | |||||
| * | | added some visual feedback is password was set | Björn Schießle | 2012-10-28 | 1 | -0/+1 |
| | | | |||||
| * | | set password if user leaves password field (issue #57) | Björn Schießle | 2012-10-28 | 1 | -9/+7 |
| | | | |||||
| * | | Fix download url generation | Bart Visscher | 2012-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 2 | -3/+81 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| | * \ | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 2 | -13/+46 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| | * | | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 1 | -0/+73 |
| | | | | | |||||
| | * | | | Make the core ajax calls use the router | Bart Visscher | 2012-10-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make the settings ajax calls use the router | Bart Visscher | 2012-10-02 | 1 | -1/+6 |
| | | | | |