803 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
brantje	cdc506e2cb	Add $translate as dep	2016-12-21 14:51:01 +01:00
brantje	fcbf31bd46	Merge branch 'master' into translations	2016-12-21 14:43:14 +01:00
brantje	fc3c019895	Don't publish an activity if there is no user ... Signed-off-by: brantje <brantje@gmail.com>	2016-12-21 14:41:43 +01:00
brantje	af672f61fd	Fix public share page	2016-12-21 14:41:11 +01:00
brantje	b27306d030	Make route public	2016-12-21 14:32:02 +01:00
brantje	bc2e1d08ac	Change translation key	2016-12-21 14:18:25 +01:00
brantje	8193b6d9f1	Code style changes	2016-12-21 14:16:47 +01:00
brantje	b1aebc4a14	Add translations to javascript files	2016-12-21 14:06:29 +01:00
brantje	5e119ff7ed	Format code	2016-12-20 00:47:32 +01:00
brantje	6df14d6cba	Merge branch 'master' into translations	2016-12-20 00:39:43 +01:00
brantje	a6406e53f6	Add test	2016-12-20 00:39:00 +01:00
brantje	7d378e681b	Merge branch 'passwordAuditFix'	2016-12-20 00:21:39 +01:00
brantje	756c7a2e49	Add ng-translate to karma	2016-12-20 00:12:29 +01:00
brantje	3f2702ed8a	Add sanitize strategy for translations	2016-12-20 00:03:36 +01:00
brantje	0bd169cbf5	Ignore failed passwords	2016-12-19 23:58:24 +01:00
brantje	ceed0130c3	Add angular-translate	2016-12-19 23:51:37 +01:00
brantje	be14586db5	Apply translations to html templates	2016-12-19 23:51:15 +01:00
brantje	4aa6314915	Create translation controller	2016-12-19 18:52:32 +01:00
brantje	89cc87ba70	Merge branch 'unusedCode'	2016-12-19 18:51:40 +01:00
brantje	63e089f363	Remove some unused code	2016-12-19 18:43:15 +01:00
brantje	684677e853	Update scrutinizer ignore directory\s	2016-12-19 18:27:52 +01:00
brantje	c2784f294c	Merge branch 'fixGetDb'	2016-12-19 18:26:44 +01:00
brantje	892965e869	Fix for NC12 $container->getDb()	2016-12-19 18:04:00 +01:00
brantje	c573f2d3de	Add stable11 to test matrix.	2016-12-19 16:01:53 +01:00
brantje	6dd2fa84d3	Change default branch, NC changed db class	2016-12-19 15:50:14 +01:00
brantje	bc37c48562	Increase max-version	2016-12-19 15:37:04 +01:00
brantje	a14e38c2e0	Share links are valid for one month	2016-12-19 14:57:34 +01:00
brantje	9f145e3131	Check if description is not empty	2016-12-19 14:42:51 +01:00
Nextcloud bot	c8749bfc97	[tx-robot] updated from transifex	2016-12-05 01:51:17 +00:00
Nextcloud bot	b03ef3b3e5	[tx-robot] updated from transifex	2016-11-29 01:51:17 +00:00
Nextcloud bot	6d822fbea5	[tx-robot] updated from transifex	2016-11-26 01:51:18 +00:00
Nextcloud bot	ea9a43d936	[tx-robot] updated from transifex	2016-11-14 01:51:17 +00:00
Nextcloud bot	7a3f4b21bc	[tx-robot] updated from transifex	2016-11-13 01:51:17 +00:00
Nextcloud bot	b52d07699a	[tx-robot] updated from transifex	2016-11-09 01:51:21 +00:00
Nextcloud bot	e398e5ff4c	[tx-robot] updated from transifex	2016-11-05 01:51:17 +00:00
Nextcloud bot	f257b9528f	[tx-robot] updated from transifex	2016-11-03 01:51:17 +00:00
Nextcloud bot	0434016367	[tx-robot] updated from transifex	2016-11-02 01:51:17 +00:00
Nextcloud bot	2608fac3ed	[tx-robot] updated from transifex	2016-10-31 01:51:18 +00:00
Nextcloud bot	16a229acc4	[tx-robot] updated from transifex	2016-10-30 00:51:17 +00:00
Nextcloud bot	69b0ff6924	[tx-robot] updated from transifex	2016-10-28 00:51:17 +00:00
Nextcloud bot	f7cb03a5e2	[tx-robot] updated from transifex	2016-10-27 00:51:18 +00:00
Nextcloud bot	9cba598a1e	[tx-robot] updated from transifex	2016-10-26 00:51:17 +00:00
Nextcloud bot	64e0368ac3	[tx-robot] updated from transifex	2016-10-25 09:53:42 +00:00
brantje	e7151c1b53	Merge branch 'DockerRunShAtStartUp'	2016-10-24 22:59:33 +02:00
brantje	61755253ea	Use different mount points for ssl	2016-10-24 22:52:40 +02:00
brantje	65202e2cad	Merge branch 'smallFixes'	2016-10-24 20:17:48 +02:00
brantje	8fab6a8725	Custom field types ... Custom fields can have files. Order custom fields. It's now possible to reorganise the custom fields by drag and drop. Signed-off-by: brantje <brantje@gmail.com>	2016-10-24 19:56:04 +02:00
brantje	74f4486b63	Merge branch 'karmaTests'	2016-10-23 13:22:48 +02:00
brantje	c0de19650a	Add test for bookmarkletCtrl ... Signed-off-by: brantje <brantje@gmail.com> Add test templates for other controllers	2016-10-23 13:10:52 +02:00
brantje	3e88ff19c4	Merge branch 'phpDoc'	2016-10-23 13:08:40 +02:00