wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13298 commits 157 branches 562 tags 714 MiB
Commit graph

60 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Björn Schießle
75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Jan-Christoph Borchardt
38bfae57fe sticky footer 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt
14edfa52ea input field adjustments for new full-color background on log in 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
107ace42b8 rip out unneeded #login div, replace with existing body-login 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
aacca494c5 introduce shortname themable string and split from title, use for image alt text 2013-07-11 16:38:07 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Björn Schießle
d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +02:00
Björn Schießle
23cc69b816 construct the foother in defaults.php so that we use always the same footer 
Conflicts:

	settings/templates/admin.php
 2013-07-01 10:46:00 +02:00
Jan-Christoph Borchardt
aaefa157fd hide the logo claim in case the theme is not loaded 2013-06-17 20:35:08 +02:00
Björn Schießle
15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle
2141c41d0d add logo-claim 2013-06-12 17:20:09 +02:00
Björn Schießle
b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
Björn Schießle
918906f042 make footer aware of ownCloud editions 2013-06-12 14:49:30 +02:00
Björn Schießle
7c108edc36 mage page title aware of ownCloud edition 2013-06-12 14:33:24 +02:00
Lukas Reschke
739f799912 Add requesttoken to guest view 
Should fix #3321
 2013-05-13 14:23:56 +02:00
Jörn Friedrich Dreyer
9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Bernhard Posselt
b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +01:00
Bart Visscher
1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +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
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
Lukas Reschke
846971ec11 Fix merge conflict 2013-01-23 11:33:25 +01:00
Lukas Reschke
c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Lukas Reschke
5fff57339f Move config to core/js/config.php 2013-01-21 00:10:47 +01:00
Michael Gapczynski
d39655e126 Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
Jan-Christoph Borchardt
0fa59f8937 use vector logo also on log in page, d'oh (also now retina-ready) 2012-12-06 16:29:56 +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
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
Lukas Reschke
ec613b589b Fix not defined JS variables 2012-10-25 17:51:59 +02:00
Björn Schießle
f493e97f5d always generate access token, also for forms shown to anonymous users (e.g. public shares) 2012-10-05 10:32:38 +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
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
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
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
Bart Visscher
20499e336b Remove duplicate line 2012-05-11 22:13:05 +02:00
Georg Ehrke
c536e930f4 add appswebroot to the guest template 2012-05-02 16:41:23 +02:00
Georg Ehrke
ebcaa46482 fix loading of css files that are core related 2012-04-26 15:19:27 +02:00
Jan-Christoph Borchardt
70d0103a67 updated logos and icons 2012-04-16 11:34:16 +02:00
Jan-Christoph Borchardt
71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Jan-Christoph Borchardt
8d14c489eb changed short description and styled unobtrusively 2011-09-28 17:14:37 +02:00