Commit Graph

246 Commits

Author SHA1 Message Date
Bart Visscher 20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Bart Visscher 149d079fd4 Move loading of js_config to templatelayout
Also check for installed flag because this isn't available before setup
2013-02-07 08:09:53 +01:00
Jan-Christoph Borchardt 8ea6398e48 collapse user menu when inside one of the settings sections 2013-02-06 16:03:01 +01:00
Jan-Christoph Borchardt 45865b45c4 use translate string for Log out, remove title 2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt 6d560be564 fix svg fallback replacement for settings icons 2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt 228a181d48 use new user function to display real name if available, username still fallback 2013-01-30 18:35:53 +01:00
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle d19de49606 prevent xss 2013-01-29 22:32:59 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Müller 3b547895ec Merge pull request #1306 from owncloud/smart-app-banner
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
Georg Ehrke bc9ab0726e add smart app banner to promote ios app 2013-01-25 16:05:16 +01:00
Björn Schießle 2fee1208ef add display name to title instead if login-ID 2013-01-24 15:49:23 +01:00
Lukas Reschke 5fff57339f Move config to core/js/config.php 2013-01-21 00:10:47 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jan-Christoph Borchardt b81a7aa078 fix up content and content-wrapper merge ... 2013-01-18 19:58:50 +07:00
Jan-Christoph Borchardt de41813792 new app icon style for new design 2013-01-17 11:54:31 +07:00
Bernhard Posselt b7f507b925 dont resize content div with javascript but use css box-sizing to do it 2013-01-16 19:38:19 +01:00
Thomas Mueller c2b3c7ed3e fixing text-align on navigation menu - closing div was missing - THX Lukas 2013-01-11 15:19:53 +01:00
Thomas Mueller 508b6a9fc7 displaying notification now centered
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.
2013-01-11 11:52:07 +01:00
Jan-Christoph Borchardt 586cc9a83b merge master into navigation 2012-12-18 15:41:58 +01:00
Thomas Tanghus b51b9539d0 Very simple js console switcher. 2012-11-15 19:43:10 +01:00
Lukas Reschke 7a7f12a0c1 Create only one CSRF token per session
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.
2012-10-31 18:37:59 +01:00
Jan-Christoph Borchardt cf2a504d42 Merge branch 'master' into navigation 2012-10-28 14:10:10 +01:00
Lukas Reschke 5245e2b6be ->l expects two parameters 2012-10-28 10:33:18 +01:00
Lukas Reschke 2d5edead77 Revert "Fix a typo"
This reverts commit a306e4b8a0.
2012-10-28 10:21:06 +01:00
Lukas Reschke a306e4b8a0 Fix a typo 2012-10-28 10:19:31 +01:00
Jan-Christoph Borchardt fc280b2887 first move of settings to top right 2012-10-27 18:58:16 +02:00
Jan-Christoph Borchardt b595ea6efc first icon update. Next step: make sprited hover state (like for home already) 2012-10-27 17:44:24 +02:00
Jan-Christoph Borchardt 3eea7aac13 first base on navigation rework, less obtrusive, icons need to be updated, settings moved 2012-10-26 23:38:36 +02:00
scambra 41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Christian Reiner 71454b1bca Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations) 2012-09-28 18:57:20 +02:00
Christian Reiner 743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Frank Karlitschek df528cfe95 show the current username. This confused some people 2012-09-12 12:23:21 +02:00
Bart Visscher edcd297476 Move handling of core remotes to OC_TemplateLayout 2012-09-07 16:42:46 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 6324daecc0 Don't wait for document ready for setting requesttoken 2012-08-30 23:10:24 +02:00
Thomas Tanghus cc445e4e47 Small changes to allow updating main menu dynamically. 2012-08-05 01:42:17 +02:00
Robin Appelman b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Georg Ehrke a113ee9e9f add x-webkit-speech to searchbox 2012-06-24 00:42:16 +02:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Bjoern Schiessle 34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Florian Hülsmann c3cd3f3571 CSS class headerAction -> header-action 2012-06-18 23:22:52 +02:00
Florian Hülsmann 4a50c15a8e corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE 2012-06-18 13:36:49 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Thomas Tanghus f0b87bc421 Make requesttoken global. 2012-06-14 18:13:01 +02:00
Thomas Tanghus 89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Bart Visscher 4260dce826 Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
Brice Maron 5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Bart Visscher ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Michael Gapczynski 198b73ddd1 Sanitize search queries, thanks to Lukas Reschke 2012-05-13 15:57:46 -04:00
Thomas Tanghus 27da29525a Made the global settings icon accessable via keyboard.
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
Frank Karlitschek 051cb7d96b show the username in the title. good idea. 2012-04-30 13:08:32 +02:00
Georg Ehrke a85d49833b fix position of Semicolon 2012-04-24 21:52:44 +02:00
Georg Ehrke 684007bbae fix pathes in contacts 2012-04-24 21:33:34 +02:00
Jan-Christoph Borchardt 5868199e85 fixed settings hover, now whole row sensitive and fading not jerky 2012-04-15 13:34:30 +02:00
Frank Karlitschek 56bc2c4591 add a title attribute to the logout button 2012-04-12 20:34:56 +02:00
Marvin Thomas Rabe b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Bart Visscher a25bda8e41 Add application name to title 2012-02-12 21:56:01 +01:00
Bart Visscher 82c7598861 Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Jan-Christoph Borchardt 897bc55d46 Revert "Style searchbox like other textboxes"
The search box style is a design decision, search boxes are always styled differently from other inputs.
This reverts commit 9d48ca75ff.
2011-08-27 20:02:11 +02:00
Michael Gapczynski 9d48ca75ff Style searchbox like other textboxes 2011-08-27 13:42:03 -04:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt 0db5c734bc some header fixes 2011-08-19 22:53:07 +02:00
Jan-Christoph Borchardt 7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Jan-Christoph Borchardt 9be059aced removed subnavigation code 2011-08-13 05:31:56 +02:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Jan-Christoph Borchardt a8cb411a92 restyle logout 2011-08-11 00:47:21 +02:00
Jan-Christoph Borchardt 05f3910718 moved search box directly to template 2011-08-10 22:56:55 +02:00
Jan-Christoph Borchardt fbf86c6683 made sliding settings more awesome 2011-08-10 17:31:01 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jan-Christoph Borchardt 44f3dfe771 added semantic meaning with header, nav and footer 2011-08-09 10:30:37 +02:00
Jan-Christoph Borchardt 5ed1030dbf fixed icons 2011-08-08 23:39:16 +02:00
Jan-Christoph Borchardt 16bb34cd94 settings are now AWESOME 2011-08-08 23:32:09 +02:00
Robin Appelman d1d47eb5eb do proper styling for settings pages 2011-08-08 22:38:42 +02:00
Robin Appelman e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Jan-Christoph Borchardt 4de7009014 removed gratuitous main div 2011-08-08 19:50:42 +02:00
Jan-Christoph Borchardt a84b00cefc fixing old CSS and HTML, navigation before content 2011-08-03 05:19:17 +02:00
Jan-Christoph Borchardt 04b745d67a compacted sidebar 2011-08-02 02:03:14 +02:00
Robin Appelman ef22498c6f some fixes for persistent playlists 2011-08-01 01:59:57 +02:00
Jan-Christoph Borchardt 8426babab9 updated navigation subentry styling 2011-07-30 10:56:28 +02:00
Robin Appelman d12d08e2f3 some more changes for navigation subentries 2011-07-29 19:43:06 +02:00
Michael Gapczynski 997e1f9743 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-07-29 12:26:30 -04:00
Michael Gapczynski 9f867abe75 Display subnavigation entries in user layout template 2011-07-29 12:25:57 -04:00
Robin Appelman 2781fdeed8 automatically replace svg images with png for browsers that dont support svg 2011-07-29 17:51:38 +02:00
Jan-Christoph Borchardt c5bc345604 rewrote header in pure CSS, smaller, less obtrusive 2011-07-28 02:30:09 +02:00
Robin Appelman 9950f06c59 Merge branch 'master' into interface 2011-07-22 00:28:17 +02:00
Robin Appelman 828a26c69e dont load some javascript files multiply times 2011-07-22 00:24:25 +02:00
Robin Appelman be6b5c8e77 some work on the updated interface 2011-07-21 22:01:55 +02:00
Robin Appelman 4d11e920be provide an option to add custom elements to the header of templates 2011-06-24 18:02:19 +02:00
Jakob Sack 91c37bbb76 moved core stuff to /core 2011-06-20 20:29:30 +02:00