| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into updater-CSP | Thomas Mueller | 2013-01-28 | 16 | -135/+277 |
| |\ | | | | | | | | | Conflicts: core/templates/update.php | ||||
| | * | Merge pull request #1321 from owncloud/csp-fixes | Thomas Müller | 2013-01-28 | 1 | -3/+7 |
| | |\ | | | | | | | Files: CSP fixes | ||||
| | | * | Fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -3/+7 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-28 | 1 | -0/+20 |
| | | | | |||||
| | * | | Merge pull request #1326 from owncloud/event-source-token | Lukas Reschke | 2013-01-26 | 2 | -2/+1 |
| | |\ \ | | | | | | | | | Use global oc_requesttoken for Event Source | ||||
| | | * | | Use global oc_requesttoken for Event Source | Michael Gapczynski | 2013-01-26 | 2 | -2/+1 |
| | | |/ | |||||
| | * / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 6 | -79/+148 |
| | |/ | |||||
| | * | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 3 | -11/+50 |
| | |\ | | | | | | | Fixing 998 master | ||||
| | | * | update used space percent after each ajax call and display the notification | Thomas Mueller | 2013-01-19 | 1 | -2/+5 |
| | | | | |||||
| | | * | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 67 | -361/+322 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| | | * | | pin notification to the top | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | fixing text-align on navigation menu - closing div was missing - THX Lukas | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | The notification div has been moved to the user templates. Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline. | ||||
| | | * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 21 | -124/+143 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | | * | | | bring back L250 as spotted by @tanghus - THX | Thomas Mueller | 2013-01-08 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 3 | -1/+100 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php | ||||
| | | * | | | | js optimisations and style fixes | Thomas Mueller | 2013-01-06 | 1 | -15/+16 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 5 | -7/+134 |
| | | |\ \ \ \ | |||||
| | | * | | | | | javascript notification functions have been moved to js.js for common use | Thomas Mueller | 2013-01-04 | 1 | -0/+30 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #1306 from owncloud/smart-app-banner | Thomas Müller | 2013-01-26 | 2 | -0/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | add smart app banner to promote ios app | ||||
| | | * | | | | | | add smart app banner to promote ios app | Georg Ehrke | 2013-01-25 | 2 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-26 | 2 | -39/+48 |
| | | | | | | | | | |||||
| * | | | | | | | | Move update inline JS | Lukas Reschke | 2013-01-25 | 2 | -27/+25 |
| |/ / / / / / / | |||||
| * | | | | | | | Use black background images | Lukas Reschke | 2013-01-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-25 | 2 | -1/+28 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add js linkToRemote and linkToRemoteBase | Thomas Tanghus | 2013-01-25 | 1 | -0/+21 |
| | |/ / / / / / | |||||
| | * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 1 | -1/+7 |
| | | | | | | | | |||||
| * | | | | | | | This breaks the installation | Lukas Reschke | 2013-01-25 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @bartv2 This JS part is breaking the installation (POST parameters are not transferred), could you please take a look? THX. JS console says: uncaught exception: cannot call methods on button prior to initialization; attempted to call method 'disable' | ||||
| * | | | | | | | update to jquery-ui 1.10.0 | Thomas Mueller | 2013-01-23 | 17 | -1123/+16024 |
| | | | | | | | | |||||
| * | | | | | | | Fix merge conflict | Lukas Reschke | 2013-01-23 | 1 | -12/+0 |
| | | | | | | | | |||||
| * | | | | | | | Fix merge conflict | Lukas Reschke | 2013-01-23 | 1 | -8/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge master... | Lukas Reschke | 2013-01-23 | 6 | -3/+55 |
| |\| | | | | | | |||||
| | * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-23 | 3 | -2/+34 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #1113 from owncloud/fix-issue-1085 | Michael Gapczynski | 2013-01-22 | 3 | -3/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix rendering of database connection error page | ||||
| | | * \ \ \ \ \ | Merge branch 'master' into fix-issue-1085 | Michael Gapczynski | 2013-01-07 | 2 | -2/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Move template parameters around so database error page is properly rendered | Michael Gapczynski | 2013-01-07 | 3 | -3/+1 |
| | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-22 | 4 | -4/+8 |
| |\| | | | | | | | |||||
| | * | | | | | | | Fix scrolling of leftcontent | Robin Appelman | 2013-01-21 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-20 | 3 | -3/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Move timezone check to external JS | Lukas Reschke | 2013-01-21 | 2 | -6/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Move requesttoken to oc-requesttoken.js | Lukas Reschke | 2013-01-21 | 2 | -7/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Move config to core/js/config.php | Lukas Reschke | 2013-01-21 | 4 | -34/+45 |
| | | | | | | | | | |||||
| * | | | | | | | | Add a route to the JS config | Lukas Reschke | 2013-01-20 | 1 | -0/+3 |
| |/ / / / / / / | |||||
| * | | | | | / | Sanitize the exception | Lukas Reschke | 2013-01-19 | 1 | -1/+1 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-18 | 2 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | dont show horizontal scrollbar | Bernhard Posselt | 2013-01-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | dont resize content div with javascript but use css box-sizing to do it | Bernhard Posselt | 2013-01-16 | 3 | -10/+8 |
| | | | | | | | |||||
| * | | | | | | Spaces to tabs | Bart Visscher | 2013-01-16 | 1 | -43/+43 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-16 | 2 | -1/+15 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master | Bart Visscher | 2013-01-15 | 1 | -4/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixing unused and undefined in master | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |